Refactored Concept class for better separation of metadata, compiled and values

2020-01-17 17:27:54 +01:00
parent 3789ef25d1
commit a7b239c167
27 changed files with 614 additions and 349 deletions
@@ -73,16 +73,15 @@ class AddConceptEvaluator(OneReturnValueEvaluator):
        # add props order by appearance when possible
        for token in def_concept_node.name.tokens:
            if token.value in props_found:
-                concept.set_prop(token.value, None)
+                concept.def_prop(token.value, None)

        # add the remaining properties
        for p in props_found:
            if p not in concept.props:
-                concept.set_prop(p, None)
+                concept.def_prop(p, None)

        # finish initialisation
        concept.init_key(def_concept_node.name.tokens)
-        #concept.add_codes(def_concept_node.get_asts())
        if not isinstance(def_concept_node.definition, NotInitializedNode) and \
            sheerka.is_success(def_concept_node.definition):
            concept.bnf = def_concept_node.definition.value.value