Fixed BnfNodeParser to allow expressions like 'number hundred' when number is a group

src/core/sheerka/Sheerka.py

@@ -36,6 +36,7 @@ class Sheerka(Concept):
     CONCEPTS_SYA_DEFINITION_ENTRY = "Concepts_Sya_Definitions"
     RESOLVED_CONCEPTS_SYA_DEFINITION_ENTRY = "Resolved_Concepts_Sya_Definitions"
     CONCEPTS_GRAMMARS_ENTRY = "Concepts_Grammars"
+    CHICKEN_AND_EGG_CONCEPTS_ENTRY = "Chicken_And_Egg_Concepts"
 
     CONCEPTS_KEYS_ENTRY = "Concepts_Keys"
     BUILTIN_CONCEPTS_KEYS = "Builtins_Concepts"  # sequential key for builtin concepts
@@ -105,6 +106,10 @@ class Sheerka(Concept):
 
     @property
     def concepts_grammars(self):
+        return self.cache_manager.caches[self.CHICKEN_AND_EGG_CONCEPTS_ENTRY].cache
+
+    @property
+    def chicken_and_eggs(self):
         return self.cache_manager.caches[self.CONCEPTS_GRAMMARS_ENTRY].cache
 
     def bind_service_method(self, bound_method, as_name=None):
@@ -227,6 +232,9 @@ class Sheerka(Concept):
         cache = Cache()
         self.cache_manager.register_cache(self.CONCEPTS_GRAMMARS_ENTRY, cache, persist=False)
 
+        cache = Cache()
+        self.cache_manager.register_cache(self.CHICKEN_AND_EGG_CONCEPTS_ENTRY, cache, persist=False)
+
     def initialize_services(self):
         """
         Introspect to find services and bind them

src/core/sheerka/services/SheerkaEvaluateConcept.py

@@ -26,7 +26,7 @@ class SheerkaEvaluateConcept(BaseService):
 
         parent = context.get_parent()
         while parent is not None:
-            if parent.who == context.who and parent.obj == concept:
+            if parent.who == context.who and parent.obj == concept and parent.obj.compiled == concept.compiled:
                 return True
 
             parent = parent.get_parent()
@@ -147,6 +147,11 @@ class SheerkaEvaluateConcept(BaseService):
 
     def resolve(self, context, to_resolve, current_prop, current_concept, force_evaluation):
 
+        def get_path(context_, prop_name):
+            prefix = context_.path if hasattr(context_, "path") else "<N/A>"
+            value = prop_name.name if isinstance(current_prop, ConceptParts) else prop_name
+            return prefix + "." + value
+
         if isinstance(to_resolve, DoNotResolve):
             return to_resolve.value
 
@@ -161,12 +166,14 @@ class SheerkaEvaluateConcept(BaseService):
                 sub_context.add_values(return_values=ret_val)
                 return ret_val.body
 
-        desc = f"Evaluating {current_prop} (concept={current_concept})"
+        path = get_path(context, current_prop)
+        desc = f"Evaluating {path} (concept={current_concept})"
         context.log(desc, self.NAME)
         with context.push(BuiltinConcepts.EVALUATING_CONCEPT,
                           current_prop,
                           desc=desc,
-                          obj=current_concept) as sub_context:
+                          obj=current_concept,
+                          path=path) as sub_context:
 
             if force_evaluation:
                 sub_context.local_hints.add(BuiltinConcepts.EVAL_BODY_REQUESTED)

src/core/sheerka/services/SheerkaSetsManager.py

@@ -76,6 +76,7 @@ class SheerkaSetsManager(BaseService):
                 self.sheerka.new(BuiltinConcepts.CONCEPT_ALREADY_IN_SET, body=concept, concept_set=concept_set))
 
         self.sets.put(concept_set.id, concept.id)
+        self.concepts_in_set.delete(concept_set.id)
         return self.sheerka.ret(self.NAME, True, self.sheerka.new(BuiltinConcepts.SUCCESS))
 
     def add_concepts_to_set(self, context, concepts, concept_set):
@@ -95,6 +96,7 @@ class SheerkaSetsManager(BaseService):
                                     concept_set=concept_set)
         else:
             body = self.sheerka.new(BuiltinConcepts.SUCCESS)
+            self.concepts_in_set.delete(concept_set.id)
 
         return self.sheerka.ret(self.NAME, len(already_in_set) != len(concepts), body)
 

src/core/utils.py

@@ -205,9 +205,9 @@ def make_unique(lst, get_id=None):
                     yield x
         else:
             for x in seq:
-                x = get_id(x)
-                if x not in seen:
-                    seen.add(x)
+                _id = get_id(x)
+                if _id not in seen:
+                    seen.add(_id)
                     yield x
 
     return list(_make_unique(lst, get_id))