Added basic implentation for where

src/core/sheerka/Sheerka.py

@@ -22,6 +22,7 @@ import logging
 #     BuiltinConcepts.AFTER_EVALUATION]
 
 CONCEPT_LEXER_PARSER_CLASS = "parsers.ConceptLexerParser.ConceptLexerParser"
+BNF_PARSER_CLASS = "parsers.BnfParser.BnfParser"
 CONCEPTS_FILE = "_concepts.txt"
 
 
@@ -52,7 +53,7 @@ class Sheerka(Concept):
 
         # cache for concept definitions,
         # Primarily used for unit test that does not have access to sdp
-        self.concepts_definition_cache = {}
+        self.concepts_definitions_cache = {}
 
         #
         # cache for concepts grammars
@@ -187,7 +188,8 @@ class Sheerka(Concept):
 
     def initialize_concepts_definitions(self, execution_context):
         self.init_log.debug("Initializing concepts definitions")
-        definitions = self.sdp.get_safe(self.CONCEPTS_DEFINITIONS_ENTRY, load_origin=False)
+        # definitions = self.sdp.get_safe(self.CONCEPTS_DEFINITIONS_ENTRY, load_origin=False)
+        definitions = self.get_concepts_definitions(execution_context)
 
         if definitions is None:
             self.init_log.debug("No BNF defined")
@@ -389,14 +391,26 @@ class Sheerka(Concept):
 
         return result or self._get_unknown(('id', concept_id))
 
-    def get_concept_definition(self):
-        if self.concepts_definition_cache:
-            return self.concepts_definition_cache
+    def get_concepts_definitions(self, context):
+        if self.concepts_definitions_cache:
+            return self.concepts_definitions_cache
 
-        self.concepts_definition_cache = self.sdp.get_safe(
+        encoded = self.sdp.get_safe(
             self.CONCEPTS_DEFINITIONS_ENTRY,
             load_origin=False) or {}
-        return self.concepts_definition_cache
+
+        self.concepts_definitions_cache = {}
+        bnf_parser = self.parsers[BNF_PARSER_CLASS]()
+        for k, v in encoded.items():
+            key, id_ = core.utils.unstr_concept(k)
+            concept = self.new((key, id_))
+            rule_result = bnf_parser.parse(context, v)
+            if rule_result.status:
+                self.concepts_definitions_cache[concept] = rule_result.value.value
+            else:
+                self.log.error(f"Failed to load bnf rule for concept {key}")
+
+        return self.concepts_definitions_cache
 
     def new(self, concept_key, **kwargs):
         """
@@ -411,7 +425,7 @@ class Sheerka(Concept):
         else:
             concept_id = None
 
-        template = self.get(concept_key, concept_id)
+        template = self.get_by_id(concept_id) if not concept_key else self.get(concept_key, concept_id)
 
         # manage concept not found
         if self.isinstance(template, BuiltinConcepts.UNKNOWN_CONCEPT) and \
@@ -579,7 +593,10 @@ class Sheerka(Concept):
             self.during_restore = True
             with open(CONCEPTS_FILE, "r") as f:
                 for line in f.readlines():
-                    self.log.info(line.strip())
+                    line = line.strip()
+                    if line == "" or line.startswith("#"):
+                        continue
+                    self.log.info(line)
                     self.evaluate_user_input(line)
             self.during_restore = False
         except IOError: