Fixed parsing of BNF concepts mixed with isaset concepts

tests/core/test_ExecutionContext.py

@@ -121,3 +121,20 @@ def test_i_can_search():
         stop=lambda ec: ec.obj == "skip",
         start_with_self=True,
         get_obj=lambda ec: ec.obj)) == ["obj_abbb"]
+
+
+def test_variables_are_passed_to_children_but_not_to_parents():
+    a = ExecutionContext("foo", Event("event_1"), "fake_sheerka", BuiltinConcepts.NOP, None)
+    assert not hasattr(a, "var")
+
+    b = a.push(BuiltinConcepts.NOP, None, var="foo")
+    assert b.var == "foo"
+    assert not hasattr(a, "var")
+
+    c = b.push(BuiltinConcepts.NOP, None)
+    assert c.var == "foo"
+
+    c.var = "bar"
+    assert c.var == "bar"
+    assert b.var != "bar"
+    assert not hasattr(a, "var")

tests/core/test_SheerkaEvaluateConcept.py

@@ -1,6 +1,6 @@
 import pytest
 from core.builtin_concepts import BuiltinConcepts, ReturnValueConcept, ParserResultConcept
-from core.concept import Concept, DoNotResolve, ConceptParts, Property, InfiniteRecursionResolved, CB
+from core.concept import Concept, DoNotResolve, ConceptParts, Property, InfiniteRecursionResolved, CB, NotInit
 from parsers.PythonParser import PythonNode
 
 from tests.TestUsingMemoryBasedSheerka import TestUsingMemoryBasedSheerka
@@ -65,7 +65,7 @@ class TestSheerkaEvaluateConcept(TestUsingMemoryBasedSheerka):
         assert len(evaluated.values) == 0 if expr is None else 1
 
     @pytest.mark.parametrize("expr, expected", [
-        (None, None),
+        (None, NotInit),
         ("", ""),
         ("1", 1),
         ("1+1", 2),