Fixed #30 : Add variable support in BNF concept definition

Fixed #31 : Add regex support in BNF Concept
Fixed #33 : Do not memorize object during restore

tests/parsers/parsers_utils.py

@@ -1,6 +1,7 @@
 import ast
 from dataclasses import dataclass
 
+from core.builtin_concepts import ReturnValueConcept
 from core.builtin_helpers import CreateObjectIdentifiers
 from core.concept import CC, Concept, ConceptParts, DoNotResolve, CIO, CMV
 from core.tokenizer import Tokenizer, TokenKind, Token
@@ -256,13 +257,17 @@ def get_node(
     if sub_expr == "')'":
         return ")"
 
+    if isinstance(sub_expr, ReturnValueConcept):
+        return sub_expr
+
     if isinstance(sub_expr, (scnode, utnode, DoNotResolve)):
         return sub_expr
 
     if isinstance(sub_expr, CIO):
         sub_expr.set_concept(concepts_map[sub_expr.concept_name])
-        if sub_expr.source:
-            node = get_node(concepts_map, expression_as_tokens, sub_expr.source, sya=sya)
+        source = sub_expr.source or sub_expr.concept_name
+        if source:
+            node = get_node(concepts_map, expression_as_tokens, source, sya=sya)
             sub_expr.start = node.start
             sub_expr.end = node.end
         return sub_expr
@@ -366,7 +371,7 @@ def get_node(
             return CN(concept_found, start, start + length - 1, source=sub_expr)
     else:
         # else an UnrecognizedTokensNode
-        return utnode(start, start + length - 1, sub_expr)
+        return UTN(sub_expr, start, start + length - 1)
 
 
 def init_body(item, concept, value):
@@ -482,3 +487,29 @@ def get_rete_conditions(*conditions_as_string):
 
         res.append(Condition(identifier, attribute, value))
     return AndConditions(res)
+
+
+def get_test_obj(test_obj, real_obj, to_compare_delegate=None):
+    """
+    From a production object (Concept, ConceptNode, ....)
+    Create a test object (CNC, CC ...) that can be used to validate the unit tests
+    :param test_obj:
+    :param real_obj:
+    :param to_compare_delegate:
+    :return:
+    """
+    if isinstance(test_obj, list):
+        if len(test_obj) != len(real_obj):
+            raise Exception(f"Not the same size ! {test_obj=}, {real_obj=}")
+        return [get_test_obj(t, r) for t, r in zip(test_obj, real_obj)]
+
+    if isinstance(test_obj, dict):
+        if len(test_obj) != len(real_obj):
+            raise Exception(f"Not the same size ! {test_obj=}, {real_obj=}")
+
+        return {k: get_test_obj(v, real_obj[k]) for k, v in test_obj.items()}
+
+    if not hasattr(test_obj, "to_compare"):
+        return real_obj
+
+    return test_obj.to_compare(real_obj, get_test_obj)