Implemented SheerkaOntology

tests/non_reg/test_sheerka_non_reg.py

@@ -1,6 +1,7 @@
 import pytest
 from core.builtin_concepts import BuiltinConcepts
-from core.concept import Concept, PROPERTIES_TO_SERIALIZE, simplec, CMV, NotInit, CC
+from core.concept import Concept, PROPERTIES_TO_SERIALIZE, simplec, CMV, CC
+from core.global_symbols import NotInit
 from core.sheerka.services.SheerkaConceptManager import SheerkaConceptManager
 from evaluators.MutipleSameSuccessEvaluator import MultipleSameSuccessEvaluator
 from evaluators.OneSuccessEvaluator import OneSuccessEvaluator
@@ -115,10 +116,10 @@ as:
         assert service.has_id(concept_saved.id)
         assert service.has_name(concept_saved.name)
         assert service.has_hash(concept_saved.get_definition_hash())
-        assert sheerka.cache_manager.copy(sheerka.CONCEPTS_BY_FIRST_KEYWORD_ENTRY) == {'+': ['1001']}
+        assert sheerka.om.copy(sheerka.CONCEPTS_BY_FIRST_KEYWORD_ENTRY) == {'+': ['1001']}
 
         # sdp is up to date
-        assert sheerka.sdp.exists(SheerkaConceptManager.CONCEPTS_BY_KEY_ENTRY, expected.key)
+        assert sheerka.om.current_sdp().exists(SheerkaConceptManager.CONCEPTS_BY_KEY_ENTRY, expected.key)
 
     def test_i_can_evaluate_def_concept_part_when_one_part_is_a_ref_of_another_concept(self):
         """
@@ -182,10 +183,10 @@ as:
         assert sheerka.isinstance(res[0].value, BuiltinConcepts.NOP)
 
     def test_i_can_recognize_concept_with_variable(self):
-        sheerka, context, concept_foo, concept_hello = self.init_concepts(
+        sheerka, context, concept_foo, concept_hello = self.init_test().with_concepts(
             "foo",
             Concept(name="hello a").def_var("a"),
-            create_new=True)
+            create_new=True).unpack()
 
         res = sheerka.evaluate_user_input("hello foo")
         return_value = res[0].value
@@ -787,14 +788,10 @@ as:
             "def concept plus from a plus b as a + b",
             "def concept mult from a mult b as a * b",
             "def concept twenties from bnf 'twenty' (one|two)=unit as 20 + unit",
+            "set_is_greater_than(BuiltinConcepts.PRECEDENCE, mult, plus, 'Sya')"
         ]
 
         sheerka = self.init_scenario(definitions)
-        context = self.get_context(sheerka)
-        sheerka.test_only_force_sya_def(context, [
-            (sheerka.get_by_name("mult").id, 20, SyaAssociativity.Right),
-            (sheerka.get_by_name("plus").id, 10, SyaAssociativity.Right),
-        ])
 
         res = sheerka.evaluate_user_input("eval one plus two mult three")
         assert len(res) == 1
@@ -952,8 +949,8 @@ as:
         sheerka = self.init_scenario(init)
 
         # simulate that sheerka was stopped and restarted
-        sheerka.cache_manager.clear(sheerka.CONCEPTS_GRAMMARS_ENTRY)
-        sheerka.cache_manager.get(SheerkaConceptManager.CONCEPTS_BY_KEY_ENTRY, "twenties").set_compiled({})
+        sheerka.om.clear(sheerka.CONCEPTS_GRAMMARS_ENTRY)
+        sheerka.om.get(SheerkaConceptManager.CONCEPTS_BY_KEY_ENTRY, "twenties").set_compiled({})
 
         res = sheerka.evaluate_user_input("eval twenty one")
         assert res[0].status
@@ -1109,12 +1106,10 @@ as:
         assert len(res) == 1
         assert res[0].status
 
-        sheerka = self.init_scenario(init)
         res = sheerka.evaluate_user_input("desc(bar)")
         assert len(res) == 1
         assert res[0].status
 
-        sheerka = self.init_scenario(init)
         res = sheerka.evaluate_user_input("desc(baz)")
         assert len(res) == 1
         assert res[0].status
@@ -1208,6 +1203,32 @@ as:
         assert res[0].status
         assert res[0].body == 2
 
+    def test_i_can_parse_when_multiple_ontology_layers(self):
+        init = [
+            "def concept one as 1",
+            "def concept two as 2",
+            "def concept a plus b as a + b",  # sya node
+            "def concept twenties from bnf 'twenty' (one | two)=unit as 20 + unit",  # bnf node
+        ]
+        sheerka = self.init_scenario(init)
+
+        sheerka.push_ontology(self.get_context(sheerka), "new ontology")
+
+        res = sheerka.evaluate_user_input("eval one")
+        assert len(res) == 1
+        assert res[0].status
+        assert res[0].body == 1
+
+        res = sheerka.evaluate_user_input("eval one plus two")
+        assert len(res) == 1
+        assert res[0].status
+        assert res[0].body == 3
+
+        res = sheerka.evaluate_user_input("eval twenty one")
+        assert len(res) == 1
+        assert res[0].status
+        assert res[0].body == 21
+
 
 class TestSheerkaNonRegFile(TestUsingFileBasedSheerka):
     def test_i_can_def_several_concepts(self):
@@ -1231,7 +1252,7 @@ class TestSheerkaNonRegFile(TestUsingFileBasedSheerka):
         assert res[0].status
         assert sheerka.isinstance(res[0].value, BuiltinConcepts.NEW_CONCEPT)
 
-        saved_concept = sheerka.sdp.get(SheerkaConceptManager.CONCEPTS_BY_KEY_ENTRY, "plus")
+        saved_concept = sheerka.om.current_sdp().get(SheerkaConceptManager.CONCEPTS_BY_KEY_ENTRY, "plus")
         assert saved_concept.key == "plus"
         assert saved_concept.get_metadata().definition == "a ('plus' plus)?"
         assert "a" in saved_concept.values()
@@ -1295,3 +1316,15 @@ class TestSheerkaNonRegFile(TestUsingFileBasedSheerka):
 
         assert sheerka.evaluate_user_input("eval twenty one")[0].body == 21
         assert sheerka.evaluate_user_input("eval thirty one")[0].body == 31
+
+    def test_i_can_pop_ontology_after_restart(self):
+        sheerka = self.get_sheerka()
+        sheerka.evaluate_user_input("push_ontology('test')")
+
+        sheerka = self.new_sheerka_instance(False)
+
+        res = sheerka.evaluate_user_input("pop_ontology()")
+
+        assert len(res) == 1
+        assert res[0].status
+        assert sheerka.isinstance(res[0].body, BuiltinConcepts.ONTOLOGY_REMOVED)