Minor code enhancements

tests/test_PythonWithConceptsParser.py

@@ -7,10 +7,13 @@ from core.concept import Concept
 from core.sheerka import Sheerka, ExecutionContext
 from core.tokenizer import Token, TokenKind, Tokenizer
 from parsers.ConceptLexerParser import ConceptNode, UnrecognizedTokensNode
+from parsers.MultipleConceptsParser import MultipleConceptsParser
 from parsers.PythonParser import PythonNode, PythonErrorNode
 from parsers.PythonWithConceptsParser import PythonWithConceptsParser
 from sdp.sheerkaDataProvider import Event
 
+multiple_concepts_parser = MultipleConceptsParser()
+
 
 def get_context():
     sheerka = Sheerka(skip_builtins_in_db=True)
@@ -31,7 +34,7 @@ def get_ret_from(*args):
             result.append(UnrecognizedTokensNode(index, index + len(tokens) - 1, tokens))
             index += len(tokens)
 
-    return ReturnValueConcept("who", False, ParserResultConcept(parser="name", value=result))
+    return ReturnValueConcept("who", False, ParserResultConcept(parser=multiple_concepts_parser, value=result))
 
 
 def to_str_ast(expression):

tests/test_sheerka_non_reg.py

@@ -427,6 +427,42 @@ def test_i_can_eval_a_mix_with_bnf_and_python_when_rule_name():
     assert res[0].status
     assert res[0].body == 22
 
+    res = sheerka.evaluate_user_input("twenty one + twenty two")
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].body == 43
+
+    res = sheerka.evaluate_user_input("twenty one + one")
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].body == 22
+
+
+def test_i_can_eval_a_mix_with_bnf_and_python_when_rule_name_2():
+    sheerka = get_sheerka()
+
+    sheerka.evaluate_user_input("def concept one as 1")
+    sheerka.evaluate_user_input("def concept two as 2")
+    sheerka.evaluate_user_input("def concept twenty as 20")
+    sheerka.evaluate_user_input("def concept twenties from bnf twenty (one | two)=unit as twenty + unit")
+
+    assert sheerka.evaluate_user_input("eval twenty one")[0].body == 21
+
+    res = sheerka.evaluate_user_input("twenty one + 1")
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].body == 22
+
+    res = sheerka.evaluate_user_input("twenty one + twenty two")
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].body == 43
+
+    res = sheerka.evaluate_user_input("twenty one + one")
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].body == 22
+
 
 def test_i_can_eval_a_more_complicated_mix_with_bnf_and_python():
     sheerka = get_sheerka()