From: Mark Thom <markjordanthom@gmail.com>
Date: Sat, 14 Mar 2020 20:18:01 +0000 (-0600)
Subject: don't emit overwriting warnings for term_expansion/2 or goal_expansion/2
X-Git-Tag: v0.8.119~41
X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=42a90b2d40c7ef0fbe6d91f9fc79233ba4fd5e52;p=scryer-prolog.git

don't emit overwriting warnings for term_expansion/2 or goal_expansion/2
---

diff --git a/src/prolog/machine/mod.rs b/src/prolog/machine/mod.rs
index 64bc4dd9..8ee64136 100644
--- a/src/prolog/machine/mod.rs
+++ b/src/prolog/machine/mod.rs
@@ -150,7 +150,15 @@ impl SubModuleUser for IndexStore {
     fn insert_dir_entry(&mut self, name: ClauseName, arity: usize, idx: CodeIndex) {
         if let Some(ref code_idx) = self.code_dir.get(&(name.clone(), arity)) {
             if !code_idx.is_undefined() {
-                println!("Warning: overwriting {}/{}", &name, arity);
+                match (name.as_str(), arity) {
+                    ("term_expansion", 2) => {
+                    }
+                    ("goal_expansion", 2) => {
+                    }
+                    _ => {
+                        println!("Warning: overwriting {}/{}", &name, arity);
+                    }
+                }
             }
 
             let (p, module_name) = idx.0.borrow().clone();
diff --git a/src/prolog/machine/term_expansion.rs b/src/prolog/machine/term_expansion.rs
index 969e00c2..94ad5951 100644
--- a/src/prolog/machine/term_expansion.rs
+++ b/src/prolog/machine/term_expansion.rs
@@ -380,7 +380,7 @@ impl MachineState {
 
             self.reset_with_heap_preservation();
 
-            Some(output.result()))
+            Some(output.result())
         }
     }
 }