Merge pull request #835 from vsbogd/fix-evaluate-atom

Fix evaluate atom

Author: Necr0x0Der

lib/src/metta/runner/mod.rs

@@ -124,7 +124,10 @@ pub(crate) struct MettaContents {
     /// An index, to find a loaded module from a ModuleDescriptor
     module_descriptors: Mutex<HashMap<ModuleDescriptor, ModId>>,
     /// A clone of the top module's Space, so we don't need to do any locking to access it,
-    /// to support the metta.space() public function
+    /// to support the metta.space() public function. Actual module space is an instance
+    /// of the [module::ModuleSpace]. This instance contains dependencies of the
+    /// top module. This space is an original space passed to the Metta constructor
+    /// thus it doesn't contain any dependencies.
     top_mod_space: DynSpace,
     /// A clone of the top module's Tokenizer
     top_mod_tokenizer: Shared<Tokenizer>,
@@ -439,9 +442,9 @@ impl Metta {
         let atom = if is_bare_minimal_interpreter(self) {
             atom
         } else {
-            wrap_atom_by_metta_interpreter(self.0.top_mod_space.clone(), atom)
+            wrap_atom_by_metta_interpreter(self.module_space(ModId::TOP), atom)
         };
-        if self.type_check_is_enabled() && !validate_atom(self.0.top_mod_space.borrow().as_space(), &atom) {
+        if self.type_check_is_enabled() && !validate_atom(&self.module_space(ModId::TOP), &atom) {
             Ok(vec![Atom::expr([ERROR_SYMBOL, atom, BAD_TYPE_SYMBOL])])
         } else {
             interpret(self.space(), &atom)

lib/src/space/module.rs

@@ -9,13 +9,13 @@ pub struct ModuleSpace {
 
 impl Display for ModuleSpace {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        Display::fmt(&self.main, f)
+        write!(f, "ModuleSpace({})", &self.main)
     }
 }
 
 impl Debug for ModuleSpace {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        Debug::fmt(&self.main, f)
+        write!(f, "ModuleSpace({:?})", &self.main)
     }
 }
 
@@ -25,6 +25,7 @@ impl ModuleSpace {
     }
 
     pub fn query(&self, query: &Atom) -> BindingsSet {
+        log::debug!("ModuleSpace::query: {}", query);
         let mut results = self.main.query(query);
         for dep in &self.deps {
             if let Some(space) = dep.borrow().as_any() {
@@ -41,6 +42,7 @@ impl ModuleSpace {
     }
 
     fn query_no_deps(&self, query: &Atom) -> BindingsSet {
+        log::debug!("ModuleSpace::query_no_deps: {}", query);
         self.main.query(query)
     }
 

python/tests/test_metta.py

@@ -98,3 +98,15 @@ def test_match_with_rust_grounded_atom(self):
 
         self.assertEqual([[]], result)
 
+    def test_metta_evaluate_atom_using_stdlib(self):
+        program = '''
+            (= (f) (let ($x $y) (A B) $x))
+        '''
+        runner = MeTTa(env_builder=Environment.test_env())
+        runner.run(program)
+
+        result = runner.run('!(f)')
+        self.assertEqual([[S('A')]], result)
+
+        result = runner.evaluate_atom(E(S('f')))
+        self.assertEqual([S('A')], result)