Merge pull request #822 from vsbogd/cleanup-bindings-code

Cleanup unification related code after old interpreter is removed

c/src/atom.rs

@@ -1256,7 +1256,7 @@ pub extern "C" fn bindings_add_var_binding(bindings: *mut bindings_t, var: atom_
         _ => panic!("var argument must be variable atom")
     };
     let atom = atom.into_inner();
-    match bindings.clone().add_var_binding_v2(var, atom) {
+    match bindings.clone().add_var_binding(var, atom) {
         Ok(new_bindings) => {
             *bindings = new_bindings;
             true
@@ -1309,7 +1309,7 @@ pub extern "C" fn bindings_merge(_self: bindings_t, other: *const bindings_t) ->
     let other = unsafe{ &*other }.borrow();
     let owned_self = _self.into_inner();
 
-    let new_set = owned_self.merge_v2(other);
+    let new_set = owned_self.merge(other);
     new_set.into()
 }
 

lib/examples/custom_match.rs

@@ -36,14 +36,15 @@ impl Grounded for TestDict {
 impl CustomMatch for TestDict {
     fn match_(&self, other: &Atom) -> MatchResultIter {
         if let Some(other) = other.as_gnd::<TestDict>() {
-            other.0.iter().map(|(ko, vo)| {
+            Box::new(other.0.iter().map(|(ko, vo)| {
                 self.0.iter().map(|(k, v)| {
                     match_atoms(&Atom::expr(vec![k.clone(), v.clone()]), &Atom::expr(vec![ko.clone(), vo.clone()]))
                 }).fold(Box::new(std::iter::empty()) as MatchResultIter, |acc, i| {
                     Box::new(acc.chain(i))
-                })
-            }).fold(Box::new(std::iter::once(Bindings::new())),
-            |acc, i| { matcher::match_result_product(acc, i) })
+                }).collect::<BindingsSet>()
+            }).fold(BindingsSet::single(),
+            |acc, i| { acc.merge(&i) })
+            .into_iter())
         } else {
             Box::new(std::iter::empty())
         }