Added concept 'isa' other_concept functionality

core/builtin_concepts.py

@@ -45,6 +45,7 @@ class BuiltinConcepts(Enum):
     ENUMERATION = "enum"  # represents a list or a set
     LIST = "list"  # represents a list
     CANNOT_RESOLVE_VALUE_ERROR = "value cannot be resolved"  # don't know how to find concept value
+    CONCEPT_ALREADY_IN_SET = "concept already in set"
 
     NODE = "node"
     GENERIC_NODE = "generic node"
@@ -68,6 +69,7 @@ BuiltinErrors = [str(e) for e in {
     BuiltinConcepts.CONCEPT_ALREADY_DEFINED,
     BuiltinConcepts.CONCEPT_EVAL_ERROR,
     BuiltinConcepts.CANNOT_RESOLVE_VALUE_ERROR,
+    BuiltinConcepts.CONCEPT_ALREADY_IN_SET,
 }]
 
 """
@@ -320,3 +322,24 @@ class ListConcept(Concept):
 
     def __contains__(self, item):
         return item in self.body
+
+
+class ConceptAlreadyInSet(Concept):
+    def __init__(self, concept=None, concept_set=None):
+        super().__init__(BuiltinConcepts.CONCEPT_ALREADY_IN_SET,
+                         True,
+                         False,
+                         BuiltinConcepts.CONCEPT_ALREADY_IN_SET,
+                         concept)
+        self.set_prop("concept_set", concept_set)
+
+    def __repr__(self):
+        return f"ConceptAlreadyInSet(concept={self.concept}, concept_set={self.concept_set})"
+
+    @property
+    def concept(self):
+        return self.body
+
+    @property
+    def concept_set(self):
+        return self.props["concept_set"].value

core/sheerka.py

@@ -15,6 +15,7 @@ CONCEPT_EVALUATION_STEPS = [
     BuiltinConcepts.BEFORE_EVALUATION,
     BuiltinConcepts.EVALUATION,
     BuiltinConcepts.AFTER_EVALUATION]
+
 CONCEPT_LEXER_PARSER_CLASS = "parsers.ConceptLexerParser.ConceptLexerParser"
 DEBUG_TAB_SIZE = 4
 
@@ -353,14 +354,17 @@ class Sheerka(Concept):
         obj.metadata.id = self.sdp.get_next_key(self.BUILTIN_CONCEPTS_KEYS if is_builtin else self.USER_CONCEPTS_KEYS)
         self.log.debug(f"Setting id '{obj.metadata.id}' to concept '{obj.metadata.name}'.")
 
-    def create_new_concept(self, context, concept: Concept):
+    def create_new_concept(self, context, concept: Concept, logger=None):
         """
         Adds a new concept to the system
         :param context:
         :param concept:  DefConceptNode
+        :param logger
         :return: digest of the new concept
         """
 
+        logger = logger or self.log
+
         concept.init_key()
         concepts_definitions = None
         init_ret_value = None
@@ -393,6 +397,7 @@ class Sheerka(Concept):
             if concepts_definitions is not None:
                 self.sdp.set(context.event_digest, self.CONCEPTS_DEFINITIONS_ENTRY, concepts_definitions, use_ref=True)
         except SheerkaDataProviderDuplicateKeyError as error:
+            context.log_error(logger, "Failed to create a new concept.", who=self.create_new_concept.__name__)
             return self.ret(self.create_new_concept.__name__, False, ErrorConcept(error), error.args[0])
 
         # Updates the caches
@@ -404,6 +409,35 @@ class Sheerka(Concept):
         ret = self.ret(self.create_new_concept.__name__, True, self.new(BuiltinConcepts.NEW_CONCEPT, body=concept))
         return ret
 
+    def add_concept_to_set(self, context, concept, concept_set, logger=None):
+        """
+        Add an entry in sdp to tell that concept isa concept_set
+        :param context:
+        :param concept:
+        :param concept_set:
+        :param logger:
+        :return:
+        """
+        logger = logger or self.log
+
+        context.log(logger, f"Adding concept {concept} to set {concept_set}", who=self.add_concept_to_set.__name__)
+
+        assert concept.id
+        assert concept_set.id
+
+        try:
+            ret = self.sdp.add_unique(context.event_digest, "All_" + str(concept_set.id), concept.id)
+            if ret == (None, None): # concept already in set
+                return self.ret(
+                    self.add_concept_to_set.__name__,
+                    False,
+                    self.new(BuiltinConcepts.CONCEPT_ALREADY_IN_SET, body=concept, concept_set=concept_set))
+            else:
+                return self.ret(self.add_concept_to_set.__name__, True, self.new(BuiltinConcepts.SUCCESS))
+        except Exception as error:
+            context.log_error(logger, "Failed to add to set.", who=self.add_concept_to_set.__name__)
+            return self.ret(self.create_new_concept.__name__, False, ErrorConcept(error), error.args[0])
+
     def initialize_concept_asts(self, context, concept: Concept, logger=None):
         """
         Updates the codes of the newly created concept

core/tokenizer.py

@@ -86,6 +86,7 @@ class Keywords(Enum):
     WHERE = "where"
     PRE = "pre"
     POST = "post"
+    ISA = "isa"
 
 
 class Tokenizer: