First implementation of questions management

tests/parsers/test_DefaultParser.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 
 import pytest
 from core.builtin_concepts import ParserResultConcept, BuiltinConcepts, ReturnValueConcept
-from core.concept import DEFINITION_TYPE_BNF, DEFINITION_TYPE_DEF
+from core.concept import DEFINITION_TYPE_BNF, DEFINITION_TYPE_DEF, Concept, CV
 from core.sheerka.services.SheerkaExecute import ParserInput
 from core.tokenizer import Keywords, Tokenizer, LexerError
 from parsers.BnfNodeParser import OrderedChoice, ConceptExpression, StrMatch
@@ -87,9 +87,9 @@ class PN:
 class TestDefaultParser(TestUsingMemoryBasedSheerka):
 
     def init_parser(self, *concepts):
-        sheerka, concept, *updated = self.init_concepts(*concepts, singleton=True)
+        sheerka, context, *updated = self.init_concepts(*concepts, singleton=True)
         parser = DefaultParser()
-        return sheerka, concept, parser, *updated
+        return sheerka, context, parser, *updated
 
     @pytest.mark.parametrize("text, expected", [
         ("def concept hello", get_def_concept(name="hello")),
@@ -313,6 +313,38 @@ def concept add one to a as
         assert isinstance(res.value, ParserResultConcept)
         assert node == expected
 
+    def test_i_can_parse_when_ambiguity_in_where_pre_clause(self):
+        sheerka, context, parser, *concepts = self.init_parser(
+            Concept("x is a y", pre="in_context(BuiltinConcepts.EVAL_QUESTION_REQUESTED)"),
+            Concept("x is a y")
+        )
+
+        text = "def concept foo x y where x is a y"
+        res = parser.parse(context, ParserInput(text))
+        expected_body = self.pretval(CV(concepts[0], pre=True), source="x is a y", who="parsers.Default",
+                                     parser="parsers.ExactConcept")
+        expected = get_def_concept("foo x y", where=expected_body)
+        node = res.value.value
+
+        assert res.status
+        assert res.who == parser.name
+        assert res.value.source == text
+        assert isinstance(res.value, ParserResultConcept)
+        assert node == expected
+
+        text = "def concept foo x y pre x is a y"
+        res = parser.parse(context, ParserInput(text))
+        expected_body = self.pretval(CV(concepts[0], pre=True), source="x is a y", who="parsers.Default",
+                                     parser="parsers.ExactConcept")
+        expected = get_def_concept("foo x y", pre=expected_body)
+        node = res.value.value
+
+        assert res.status
+        assert res.who == parser.name
+        assert res.value.source == text
+        assert isinstance(res.value, ParserResultConcept)
+        assert node == expected
+
     def test_i_can_detect_not_for_me(self):
         text = "hello world"
         sheerka, context, parser = self.init_parser()