Fixed some bugs

tests/parsers/test_UnrecognizedNodeParser.py

@@ -2,7 +2,7 @@ from core.builtin_concepts import ParserResultConcept, BuiltinConcepts
 from core.concept import Concept, CC
 from core.tokenizer import Tokenizer, TokenKind
 from parsers.BaseNodeParser import ConceptNode, UnrecognizedTokensNode, scnode, cnode, \
-    utnode, SyaAssociativity, CN, CNC, UTN
+    utnode, SyaAssociativity, CN, CNC, UTN, SourceCodeWithConceptNode, SCWC, SourceCodeNode
 from parsers.UnrecognizedNodeParser import UnrecognizedNodeParser
 
 from tests.TestUsingMemoryBasedSheerka import TestUsingMemoryBasedSheerka
@@ -24,11 +24,20 @@ def get_input_nodes_from(my_concepts_map, full_expr, *args):
             concept = n.concept if hasattr(n, "concept") and n.concept else \
                 Concept().update_from(my_concepts_map[n.concept_key])
             tokens = full_expr_as_tokens[n.start: n.end + 1]
-            if hasattr(node, "compiled"):
+            if hasattr(n, "compiled"):
                 for k, v in n.compiled.items():
                     concept.compiled[k] = _get_real_node(v)
             return ConceptNode(concept, n.start, n.end, tokens)
 
+        if isinstance(n, SCWC):
+            n.first = _get_real_node(n.first)
+            n.last = _get_real_node(n.first)
+            n.content = tuple(_get_real_node(nn) for nn in n.content)
+            return SourceCodeWithConceptNode(n.first, n.last, list(n.content))
+
+        if isinstance(n, (UnrecognizedTokensNode, ConceptNode, SourceCodeNode, SourceCodeWithConceptNode)):
+            return n
+
         raise NotImplementedError()
 
     res = []
@@ -307,6 +316,41 @@ class TestUnrecognizedNodeParser(TestUsingMemoryBasedSheerka):
             exclude_body=True)
         assert actual_nodes == expected_array
 
+    def test_i_can_parse_unrecognized_source_code_with_concept_node(self):
+        sheerka, context, parser = self.init_parser()
+
+        expression = "desc(a plus b)"
+        source_code_concepts = SCWC("desc(", ")", CNC("plus", a=UTN("a"), b=UTN("b")))
+        nodes = get_input_nodes_from(concepts_map, expression, source_code_concepts)
+        parser_input = ParserResultConcept("parsers.xxx", source=expression, value=nodes)
+
+        res = parser.parse(context, parser_input)
+        parser_result = res.body
+        actual_nodes = res.body.body
+
+        assert not res.status # status is False to let PythonWithConceptParser validate the code
+        assert sheerka.isinstance(parser_result, BuiltinConcepts.PARSER_RESULT)
+        assert len(actual_nodes) == 1
+        assert actual_nodes[0].nodes[0].concept.metadata.is_evaluated  # 'a plus b' is recognized as concept definition
+
+    def test_i_can_parse_unrecognized_source_code_with_concept_node_when_var_in_short_term_memory(self):
+        sheerka, context, parser = self.init_parser()
+
+        expression = "desc(a plus b)"
+        source_code_concepts = SCWC("desc(", ")", CNC("plus", a=UTN("a"), b=UTN("b")))
+        nodes = get_input_nodes_from(concepts_map, expression, source_code_concepts)
+        parser_input = ParserResultConcept("parsers.xxx", source=expression, value=nodes)
+
+        context.add_to_short_term_memory("a", 1)
+        res = parser.parse(context, parser_input)
+        parser_result = res.body
+        actual_nodes = res.body.body
+
+        assert not res.status  # status is False to let PythonWithConceptParser validate the code
+        assert sheerka.isinstance(parser_result, BuiltinConcepts.PARSER_RESULT)
+        assert len(actual_nodes) == 1
+        assert not actual_nodes[0].nodes[0].concept.metadata.is_evaluated  # 'a plus b' need to be evaluated
+
     def test_i_can_parse_sequences(self):
         sheerka, context, parser = self.init_parser()