Working on #48 : Working

src/core/builtin_helpers.py

@@ -790,7 +790,7 @@ def is_a_question(context, concept):
         return False
 
     node = res.body.body
-    from parsers.expressions import IsAQuestionVisitor
+    from parsers.BaseExpressionParser import IsAQuestionVisitor
     return IsAQuestionVisitor().is_a_question(node)
 
 

src/core/sheerka/Sheerka.py

@@ -278,7 +278,9 @@ class Sheerka(Concept):
         """
         core.utils.import_module_and_sub_module("parsers")
         base_class = core.utils.get_class("parsers.BaseParser.BaseParser")
-        modules_to_skip = ["parsers.BaseNodeParser", "parsers.BaseCustomGrammarParser"]
+        modules_to_skip = ["parsers.BaseNodeParser",
+                           "parsers.BaseCustomGrammarParser",
+                           "parsers.BaseExpressionParser"]
 
         temp_result = {}
         for parser in core.utils.get_sub_classes("parsers", base_class):

src/core/sheerka/services/SheerkaEvaluateConcept.py

@@ -13,7 +13,7 @@ from core.tokenizer import Tokenizer
 from core.utils import unstr_concept
 from parsers.BaseNodeParser import ConceptNode
 from parsers.LogicalOperatorParser import LogicalOperatorParser
-from parsers.expressions import TrueifyVisitor
+from parsers.BaseExpressionParser import TrueifyVisitor
 
 CONCEPT_EVALUATION_STEPS = [
     BuiltinConcepts.BEFORE_EVALUATION,

src/core/sheerka/services/SheerkaRuleManager.py

@@ -20,7 +20,7 @@ from evaluators.PythonEvaluator import PythonEvaluator, Expando
 from parsers.BaseNodeParser import SourceCodeWithConceptNode, ConceptNode, SourceCodeNode
 from parsers.LogicalOperatorParser import LogicalOperatorParser
 from parsers.PythonParser import PythonNode
-from parsers.expressions import AndNode
+from parsers.BaseExpressionParser import AndNode
 from sheerkarete.conditions import AndConditions
 
 CONCEPTS_ONLY_PARSERS = ["ExactConcept", "Bnf", "Sya", "Sequence"]