Fix marge and patch to correctly set/unset repeats

Author: Divy1211

src/types/diff/struct_mergeable.rs

@@ -1,7 +1,7 @@
 use pyo3::{Bound, PyResult, Python};
 use pyo3::prelude::PyDictMethods;
 use pyo3::types::PyDict;
-
+use crate::retrievers::retriever::RetState;
 use crate::types::base_struct::BaseStruct;
 use crate::types::diff::diff::{Diff, Diffable, IDiff};
 use crate::types::diff::merge::{Conflict, Mergeable};
@@ -24,13 +24,35 @@ impl Mergeable<ParseableType> for StructMergeable<'_, '_> {
         _off: isize
     ) -> isize {
         let mut inner = self.1.inner_mut();
-        let data = &mut inner.data;
+        let (data, repeats, _) = inner.split();
         match change {
             Diff::None => _off,
             Diff::Inserted(_val) | Diff::Deleted(_val) => {
                 unreachable!("BFP Internal Error: merge called on structs of different versions")
             }
             Diff::Changed(val) => {
+                let retriever = &self.0.retrievers()[idx];
+                match retriever.state(repeats) {
+                    RetState::Value | RetState::NoneValue if val.is_none() => {
+                        repeats[idx] = Some(-1);
+                    }
+                    RetState::Value | RetState::NoneValue => {
+                        repeats[idx] = None;
+                    }
+                    RetState::List | RetState::NoneList if val.is_none() => {
+                        repeats[idx] = Some(-2);
+                    }
+                    RetState::List | RetState::NoneList => {
+                        let repeat = retriever.repeat(repeats);
+                        let len = val.try_len()
+                            .expect("non-null value coming from another struct must be of the correct type") as isize;
+                        if repeat == -2 {
+                            repeats[idx] = Some(len);
+                        } else if repeats[idx].is_none() && repeat != len {
+                            unreachable!("BFP Internal Error: Non-null value coming from another struct must be of the correct type")
+                        }
+                    }
+                };
                 data[idx] = Some(val);
                 _off
             }

src/types/parseable_type.rs

@@ -49,6 +49,10 @@ pub enum ParseableType {
 }
 
 impl ParseableType {
+    pub fn is_none(&self) -> bool {
+        matches!(self, ParseableType::None)
+    }
+    
     pub fn is_ls_of(&self, bfp_type: &BfpType) -> bool {
         match self {
             ParseableType::Array(val) => {
@@ -310,8 +314,8 @@ impl Diffable<ParseableType> for ParseableType {
     fn diff(&self, other: &ParseableType) -> Diff<ParseableType> {
         match (self, other) {
             (ParseableType::None, ParseableType::None) => Diff::None,
-            (ParseableType::None, _)                   => Diff::Inserted(other.clone()),
-            (_, ParseableType::None)                   => Diff::Deleted(other.clone()),
+            (ParseableType::None, _)                   => Diff::Changed(other.clone()),
+            (_, ParseableType::None)                   => Diff::Changed(other.clone()),
 
             (ParseableType::UInt8(v1),     ParseableType::UInt8(v2))   => if v1 == v2 { Diff::None } else { Diff::Changed(other.clone()) },
             (ParseableType::UInt16(v1),    ParseableType::UInt16(v2))  => if v1 == v2 { Diff::None } else { Diff::Changed(other.clone()) },

stubs/bfp_rs/combinators/if_builder.pyi

@@ -110,7 +110,7 @@ class IfBuilder:
         """
 
 
-def if_(target: Retriever | int | Get) -> IfBuilder:
+def if_(*target: Retriever) -> IfBuilder:
     """
     Select this value for a comparison
 
@@ -123,7 +123,7 @@ def if_(target: Retriever | int | Get) -> IfBuilder:
     """
 
 
-def if_not(target: Retriever | int | Get) -> IfBuilder:
+def if_not(*target: Retriever) -> IfBuilder:
     """
     Select this value for a comparison with the result inverted
 
@@ -160,7 +160,7 @@ def if_not_key(key: str) -> IfBuilder:
     """
 
 
-def if_len(target: Retriever | int | Get) -> IfBuilder:
+def if_len(*target: Retriever) -> IfBuilder:
     """
     Select this value and use its length for a comparison