Implemented FunctionParser

src/core/sheerka/ExecutionContext.py

@@ -1,7 +1,7 @@
 import logging
 import time
 
-from core.builtin_concepts import BuiltinConcepts
+from core.builtin_concepts import BuiltinConcepts, ParserResultConcept
 from core.concept import Concept
 from core.sheerka.services.SheerkaExecute import NO_MATCH
 from core.sheerka.services.SheerkaShortTermMemory import SheerkaShortTermMemory
@@ -309,6 +309,15 @@ class ExecutionContext:
     def in_private_context(self, concept_key):
         return concept_key in self.private_hints
 
+    def add_to_private_hints (self, concept_key):
+        self.private_hints.add(concept_key)
+
+    def add_to_protected_hints(self, concept_key):
+        self.protected_hints.add(concept_key)
+
+    def add_to_global_hints(self, concept_key):
+        self.global_hints.add(concept_key)
+
     @staticmethod
     def _is_return_value(obj):
         return isinstance(obj, Concept) and obj.key == str(BuiltinConcepts.RETURN_VALUE)
@@ -358,7 +367,11 @@ class ExecutionContext:
             ret_val = self.values["return_values"]
             if not isinstance(ret_val, Concept) or not ret_val.key == str(BuiltinConcepts.RETURN_VALUE):
                 return None
-            return ret_val.status
+            if ret_val.status:
+                return True
+            if isinstance(ret_val.body, ParserResultConcept):
+                return "Almost"
+            return False
 
     def as_bag(self):
         """

src/core/sheerka/Sheerka.py

@@ -558,6 +558,12 @@ class Sheerka(Concept):
         return self._get_unknown(metadata)
 
     def resolve(self, concept):
+        """
+        Try to find a concept by its name, id, or c:: definition
+        A new instance (using new_from_template()) is returned when it's possible
+        :param concept:
+        :return:
+        """
 
         def new_instances(concepts):
             if hasattr(concepts, "__iter__"):
@@ -567,6 +573,9 @@ class Sheerka(Concept):
         if concept is None:
             return None
 
+        # ##############
+        # PREPROCESS
+        # ##############
         # if the entry is a concept token, use its values.
         if isinstance(concept, Token):
             if concept.type != TokenKind.CONCEPT:
@@ -578,6 +587,9 @@ class Sheerka(Concept):
             (tmp := core.utils.unstr_concept(concept)) != (None, None):
             concept = tmp
 
+        # ##############
+        # PROCESS
+        # ##############
         # if the entry is a tuple
         # concept[0] is the name
         # concept[1] is the id
@@ -599,7 +611,7 @@ class Sheerka(Concept):
         if isinstance(concept, str):
             if self.is_known(found := self.get_by_name(concept)):
                 instances = new_instances(found)
-                core.builtin_helpers.set_is_evaluated(instances)
+                core.builtin_helpers.set_is_evaluated(instances, check_nb_variables=True)
                 return instances
 
         return None

src/core/sheerka/services/SheerkaAdmin.py

@@ -5,7 +5,7 @@ from core.sheerka.services.sheerka_service import BaseService
 
 CONCEPTS_FILE = "_concepts_lite.txt"
 CONCEPTS_FILE_ALL_CONCEPTS = "_concepts.txt"
-CONCEPTS_FILE_TO_USE = CONCEPTS_FILE_ALL_CONCEPTS
+CONCEPTS_FILE_TO_USE = CONCEPTS_FILE
 
 class SheerkaAdmin(BaseService):
     NAME = "Admin"
@@ -47,6 +47,9 @@ class SheerkaAdmin(BaseService):
         if concept_file == "full":
             concept_file = CONCEPTS_FILE_ALL_CONCEPTS
 
+        elif not concept_file.startswith("_concepts"):
+            concept_file = f"_concepts_{concept_file}.txt"
+
         try:
             start = time.time_ns()
             nb_lines = 0

src/core/sheerka/services/SheerkaExecute.py

@@ -2,7 +2,7 @@ import core.utils
 from cache.Cache import Cache
 from core.builtin_concepts import BuiltinConcepts, ReturnValueConcept
 from core.sheerka.services.sheerka_service import BaseService
-from core.tokenizer import Tokenizer, TokenKind, Keywords, Token
+from core.tokenizer import Tokenizer, TokenKind, Token
 
 NO_MATCH = "** No Match **"
 
@@ -88,6 +88,20 @@ class ParserInput:
 
         return self.pos < self.end
 
+    def seek(self, pos):
+        """
+        Move the token offset to position pos
+        :param pos:
+        :return: True is pos is a valid position False otherwise
+        """
+        if pos < 0 or pos >= self.end:
+            self.token = None
+            return False
+
+        self.pos = pos
+        self.token = self.tokens[self.pos]
+        return True
+
     def is_empty(self):
         if self.text.strip() == "":
             return True
@@ -116,7 +130,6 @@ class ParserInput:
             tokens = [tokens]
 
         switcher = {
-            TokenKind.KEYWORD: lambda t: Keywords(t.value).value,
             TokenKind.CONCEPT: lambda t: core.utils.str_concept(t.value),
         }
 

src/core/sheerka/services/SheerkaModifyConcept.py

@@ -31,6 +31,7 @@ class SheerkaModifyConcept(BaseService):
 
         if old_version == concept:
             # the concept is not modified
+            # This is an important sanity check. Do no remove because you don't understand it
             return self.sheerka.ret(
                 self.NAME, False,
                 self.sheerka.new(

src/core/sheerka/services/SheerkaVariableManager.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass
 from typing import List
 
 from cache.Cache import Cache
+from core.builtin_concepts import BuiltinConcepts
 from core.sheerka.services.sheerka_service import ServiceObj, BaseService
 
 
@@ -48,6 +49,7 @@ class SheerkaVariableManager(BaseService):
 
         variable = Variable(context.event.get_digest(), who, key, value, None)
         self.sheerka.cache_manager.put(self.VARIABLES_ENTRY, variable.get_key(), variable)
+        return self.sheerka.ret(self.NAME, True, self.sheerka.new(BuiltinConcepts.SUCCESS))
 
     def load(self, who, key):
         variable = self.sheerka.cache_manager.get(self.VARIABLES_ENTRY, who + "|" + key)