提交: 5b918e28475e9dac3e412ae971767e2bcd9a1ceb - CCastle2 (hg)

Castle: The best Real-Time/Embedded/HighTech language EVER. Attempt 2

Commit MetaInfo

• 修订版: 5b918e28475e9dac3e412ae971767e2bcd9a1ceb (tree)
• 时间: 2022-04-23 06:25:53
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

REFACTORED: Now we have a sub-package 'grammar' (in castle.reader.parser). It holds the (peg)grammar&vistitor to parser that chunk of of Castlee

更改概述

• modified: demos/ThinOnion/demo1.py
• modified: pytst/readers/parser/d1_parse_tree/__init__.py
• modified: pytst/readers/parser/d1_parse_tree/test_1_regexp.py
• modified: pytst/readers/parser/d1_parse_tree/test_2_str.py
• modified: pytst/readers/parser/d1_parse_tree/test_3_expr.py
• modified: pytst/readers/parser/d1_parse_tree/test_4_rule.py
• modified: pytst/readers/parser/d1_parse_tree/test_5_settings.py
• modified: pytst/readers/parser/d1_parse_tree/test_6_comments.py
• modified: pytst/readers/parser/d1_parse_tree/test_9_file.py
• modified: pytst/readers/parser/d2_ast/__init__.py
• modified: pytst/readers/parser/d2_ast/test_1_term.py
• modified: pytst/readers/parser/d2_ast/test_2_ID.py
• modified: pytst/readers/parser/d2_ast/test_3_Seq.py
• modified: pytst/readers/parser/d2_ast/test_3_rule.py
• modified: pytst/readers/parser/d2_ast/test_3_settings.py
• modified: pytst/readers/parser/d2_ast/test_4_quantity.py
• modified: pytst/readers/parser/d2_ast/test_5_group.py
• modified: pytst/readers/parser/d2_ast/test_6_predicate.py
• modified: pytst/readers/parser/d2_ast/test_7_rules.py
• modified: pytst/readers/parser/d2_ast/test_8_grammar.py
• modified: pytst/readers/parser/d2_ast/test_9_file.py
• modified: pytst/readers/parser/general/test_file.py
• add: castle/readers/parser/grammar/__init__.py
• add: castle/readers/parser/grammar/language.py
• add: castle/readers/parser/grammar/visitor.py
• delete: castle/readers/parser/grammar.py
• delete: castle/readers/parser/visitor.py

差异

diff -r 59d7c5703ac0 -r 5b918e28475e castle/readers/parser/grammar.py
--- a/castle/readers/parser/grammar.py	Fri Apr 22 21:44:04 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-from arpeggio import Optional, ZeroOrMore, OneOrMore, EOF
-from arpeggio import RegExMatch as _
-from arpeggio import ParserPython
-
-
-def peg_grammar(): 	return rules, EOF
-def rules(): 		return OneOrMore([parse_rule, setting])
-def parse_rule():	return rule_name, '<-', expression, ";"
-
-def expression():	return sequence, op_alternative
-def sequence():		return OneOrMore(single_expr)
-def single_expr():	return [ rule_crossref, term, group, predicate ], op_quantity
-
-def op_alternative():   return Optional( '|' , expression )
-def op_quantity(): 	return Optional([ '?' , '*' , '+' , '#' ])
-
-def term():		return [ str_term, regex_term ]
-def group():		return '(', expression, ')'
-def predicate():	return ['&','!'], single_expr
-
-def str_term():		return [  (S3,   str_no_s3,  S3),
-                                  (D3,   str_no_d3,   D3),
-                                  (S1,   str_no_s1,   S1),
-                                  (D1,   str_no_d1,   D1)  ]
-def regex_term():	return [  (RE,   re_no_slash, RE),
-                                  (REs3, str_no_s3,   S3),
-                                  (REd3, str_no_d3,   D3),
-                                  (REs1, str_no_s1,   S1),
-                                  (REd1, str_no_d1,   D1)  ]
-
-def rule_name():	return ID
-def rule_crossref():	return ID
-def ID():        	return _(r"[a-zA-Z_]([a-zA-Z_]|[0-9])*")
-
-def re_no_slash():	return _(r"((\\/)|[^\/])*")
-def str_no_s1():	return _(r"((\\')|[^'\n])*")                    # Does NOT match multiline -- note 'multiline=False' is not the same
-def str_no_d1():	return _(r'((\\")|[^"\n])*')                    # idem
-def str_no_s3():	return _(r"([^']|('[^'])|(''[^']))*")           # ALLOW multiline
-def str_no_d3():	return _(r'''([^"]|("[^"])|(""[^"]))*''')       # idem
-
-def setting():		return setting_name, '=', value, ';'
-def setting_name():	return ID
-def value():            return [ str_term, regex_term, number, setting_xref ]
-def number():		return [ complex_lit, float_lit, int_lit ]
-def setting_xref():	return ID
-def complex_lit():	return _(r"[+-]?([0-9](\.[0-9]*)?)[+-][iIjJ]([0-9](\.[0-9]*)?)")
-def float_lit():	return _(r"[+-]?[0-9]\.[0-9]+")
-def int_lit():		return _(r"[+-]?[1-9][0-9]*")
-
-
-S1 = "'"
-D1 = '"'
-S3 = "'''"
-D3 = '"""'
-RE   = '/'
-REs1 = _(r"[rR]'")
-REd1 = _(r'[rR]"')
-REs3 = _(r"[rR]'''")
-REd3 = _(r'[rR]"""')
-
-def comment():		return ["#", '//'], _(".*\n")
-
-

diff -r 59d7c5703ac0 -r 5b918e28475e castle/readers/parser/grammar/__init__.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/castle/readers/parser/grammar/__init__.py	Fri Apr 22 23:25:53 2022 +0200
@@ -0,0 +1,6 @@
+from .language import peg_grammar
+from .language import comment
+
+from .visitor import PegVisitor
+from .visitor import QuantityError, PredicateError
+

diff -r 59d7c5703ac0 -r 5b918e28475e castle/readers/parser/grammar/language.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/castle/readers/parser/grammar/language.py	Fri Apr 22 23:25:53 2022 +0200
@@ -0,0 +1,61 @@
+from arpeggio import Optional, ZeroOrMore, OneOrMore, EOF
+from arpeggio import RegExMatch as _
+from arpeggio import ParserPython
+
+
+def peg_grammar(): 	return rules, EOF
+def rules(): 		return OneOrMore([parse_rule, setting])
+def parse_rule():	return rule_name, '<-', expression, ";"
+
+def expression():	return sequence, op_alternative
+def sequence():		return OneOrMore(single_expr)
+def single_expr():	return [ rule_crossref, term, group, predicate ], op_quantity
+
+def op_alternative():   return Optional( '|' , expression )
+def op_quantity(): 	return Optional([ '?' , '*' , '+' , '#' ])
+
+def term():		return [ str_term, regex_term ]
+def group():		return '(', expression, ')'
+def predicate():	return ['&','!'], single_expr
+
+def str_term():		return [  (S3,   str_no_s3,  S3),
+                                  (D3,   str_no_d3,   D3),
+                                  (S1,   str_no_s1,   S1),
+                                  (D1,   str_no_d1,   D1)  ]
+def regex_term():	return [  (RE,   re_no_slash, RE),
+                                  (REs3, str_no_s3,   S3),
+                                  (REd3, str_no_d3,   D3),
+                                  (REs1, str_no_s1,   S1),
+                                  (REd1, str_no_d1,   D1)  ]
+
+def rule_name():	return ID
+def rule_crossref():	return ID
+def ID():        	return _(r"[a-zA-Z_]([a-zA-Z_]|[0-9])*")
+
+def re_no_slash():	return _(r"((\\/)|[^\/])*")
+def str_no_s1():	return _(r"((\\')|[^'\n])*")                    # Does NOT match multiline -- note 'multiline=False' is not the same
+def str_no_d1():	return _(r'((\\")|[^"\n])*')                    # idem
+def str_no_s3():	return _(r"([^']|('[^'])|(''[^']))*")           # ALLOW multiline
+def str_no_d3():	return _(r'''([^"]|("[^"])|(""[^"]))*''')       # idem
+
+def setting():		return setting_name, '=', value, ';'
+def setting_name():	return ID
+def value():            return [ str_term, regex_term, number, setting_xref ]
+def number():		return [ complex_lit, float_lit, int_lit ]
+def setting_xref():	return ID
+def complex_lit():	return _(r"[+-]?([0-9](\.[0-9]*)?)[+-][iIjJ]([0-9](\.[0-9]*)?)")
+def float_lit():	return _(r"[+-]?[0-9]\.[0-9]+")
+def int_lit():		return _(r"[+-]?[1-9][0-9]*")
+
+
+S1 = "'"
+D1 = '"'
+S3 = "'''"
+D3 = '"""'
+RE   = '/'
+REs1 = _(r"[rR]'")
+REd1 = _(r'[rR]"')
+REs3 = _(r"[rR]'''")
+REd3 = _(r'[rR]"""')
+
+def comment():		return ["#", '//'], _(".*\n")

diff -r 59d7c5703ac0 -r 5b918e28475e castle/readers/parser/grammar/visitor.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/castle/readers/parser/grammar/visitor.py	Fri Apr 22 23:25:53 2022 +0200
@@ -0,0 +1,133 @@
+import arpeggio
+
+from castle.ast import grammar
+
+import logging;logger = logging.getLogger(__name__)
+from typing import Union
+
+class QuantityError(ValueError): pass
+class PredicateError(ValueError): pass
+
+
+#NO_VISITOR_NEEDED: visit_str_no_s1
+#NO_VISITOR_NEEDED: visit_str_no_d1
+#NO_VISITOR_NEEDED: visit_str_no_s3
+#NO_VISITOR_NEEDED: visit_str_no_d3
+#NO_VISITOR_NEEDED: visit_comment
+#NO_VISITOR_NEEDED: visit_ID
+#NO_VISITOR_NEEDED: visit_term
+#NO_VISITOR_NEEDED: visit_re_no_slash
+#NO_VISITOR_NEEDED: visit_group
+#NO_VISITOR_NEEDED: visit_op_quantity		-- handled in visit_single_expr
+#NO_VISITOR_NEEDED: visit_op_alternative	-- handled in visit_expression
+#NO_VISITOR_NEEDED: visit_complex_lit		-- handled in visit_number
+#NO_VISITOR_NEEDED: visit_float_lit		-- handled in visit_number
+#NO_VISITOR_NEEDED: visit_int_lit		-- handled in visit_number
+#NO_VISITOR_NEEDED: visit_value
+
+
+
+class PegVisitor(arpeggio.PTNodeVisitor):
+    def _logstr_node_children(self, node, children):
+        return f'>>{node}<< children[{len(children)}] >>' + ", ".join(f'{c}:{type(c).__name__}' for c in children) + '<<'
+
+    def visit_str_term(self, node, children):
+        return grammar.StrTerm(value=node[1], parse_tree=node)
+
+    def visit_regex_term(self, node, children):
+        return grammar.RegExpTerm(value=node[1], parse_tree=node)
+
+    def visit_rule_name(self, node, children):
+        return grammar.ID(name=str(node), parse_tree=node)
+
+    def visit_rule_crossref(self, node, children):
+        return grammar.ID(name=str(node), parse_tree=node)
+
+    def visit_parse_rule(self, node, children):                               #  Name '<-' expression ';'
+        return grammar.Rule(name=children[0],expr=children[1], parse_tree=node)
+
+
+    def visit_single_expr(self, node, children):                        #  [ rule_crossref, term, group, predicate ],  op_quantity
+        token_2_class = {'?': grammar.Optional,
+                         '*': grammar.ZeroOrMore,
+                         '+': grammar.OneOrMore,
+                         '#': grammar.UnorderedGroup}
+
+        if len(children) == 1: #  No Optional part
+            logger.debug(f'visit_single_expr==1:: {getattr(children[0], "name", children[0])}:{type(children[0])}')
+            return children[0]
+
+        elif len(children) == 2: #  Optional part
+            logger.debug(f'visit_single_expr==2::Got: {children[0]}, {children[1]}')
+            expr = children[0]
+            token = str(children[1])
+            quantum_cls = token_2_class.get(token)
+            if quantum_cls:
+                ast=quantum_cls(expr=expr, parse_tree=node)
+                logger.debug(f'visit_single_expr==2::Pass: {quantum_cls}(expr={expr})')
+                return ast
+            else:
+                raise QuantityError(f"token '{token}' not recognised")
+        else: # #children not in (1,2)
+            raise  NotImplementedError("visit_single_expr, len>2")      # -- Is this possible?
+
+
+    # expression <- sequence, op_alternative; op_alternative <- ('|' expression)?
+    def visit_expression(self, node, children) -> Union[grammar.Sequence,  grammar.OrderedChoice]:
+        logger.debug('visit_expression::' + self._logstr_node_children(node, children))
+        if len(children) == 1: #Only sequence
+            return children[0]
+        elif len(children) == 2: # So, having 1 or more alternatives in children[1]
+            # In all cased a (single) OrderedChoice with a list of alternatives should be returned.
+            if isinstance(children[1], grammar.OrderedChoice):
+                alternatives = [children[0]] + [alt for alt in children[1]]
+            else:
+                alternatives = children
+            return grammar.OrderedChoice(children = alternatives, parse_tree=node)
+        else:
+            raise NotImplementedError("visit_expression, len>2")
+
+
+    # OneOrMore(single_expr)
+    def visit_sequence(self, node, children) -> grammar.Sequence:
+        logger.debug(f'visit_sequence::{self._logstr_node_children(node, children)}')
+        return grammar.Sequence(children=children, parse_tree=node)
+
+
+    def visit_predicate(self, node, children):
+        token_2_predicate = {'&': grammar.AndPredicate,
+                             '!': grammar.NotPredicate}
+        logger.debug(f'visit_predicate:: >>{node}<< #children={len(children)}')
+
+        if len(children) == 2:
+            token = children[0]
+            cls = token_2_predicate.get(token)
+            if cls:
+                ast = cls(expr=children[1], parse_tree=node)
+                return ast
+            else:
+                raise PredicateError(f"token '{token}' not recognised")
+        else:
+            raise  NotImplementedError("visit_predicate, len!=2")      # -- Is this possible?
+
+
+    def visit_rules(self, node, children):                              # Mix of `ParseRule`(s)`Setting`(s) ; will be sorted out n `Grammar`
+        logger.debug('visit_rules::' + self._logstr_node_children(node, children))
+        return grammar.Rules(children=children[:], parse_tree=node)
+
+
+    def visit_peg_grammar(self, node, children):
+        return grammar.Grammar(all_rules=children[0], parse_tree=node)
+
+    def visit_setting_name(self, node, children):
+        return grammar.ID(name=str(node), parse_tree=node)
+
+    def visit_number(self, node, children):
+        return grammar.Number(value=str(node), parse_tree=node)
+
+    def visit_setting_xref(self, node, children):
+        return grammar.ID(name=str(node), parse_tree=node)
+
+    def visit_setting(self, node, children):
+        logger.debug('visit_setting::' + self._logstr_node_children(node, children))
+        return grammar.Setting(name=children[0], value=children[1] , parse_tree=node)

diff -r 59d7c5703ac0 -r 5b918e28475e castle/readers/parser/visitor.py
--- a/castle/readers/parser/visitor.py	Fri Apr 22 21:44:04 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-import arpeggio
-
-from castle.ast import grammar
-
-import logging;logger = logging.getLogger(__name__)
-from typing import Union
-
-class QuantityError(ValueError): pass
-class PredicateError(ValueError): pass
-
-
-#NO_VISITOR_NEEDED: visit_str_no_s1
-#NO_VISITOR_NEEDED: visit_str_no_d1
-#NO_VISITOR_NEEDED: visit_str_no_s3
-#NO_VISITOR_NEEDED: visit_str_no_d3
-#NO_VISITOR_NEEDED: visit_comment
-#NO_VISITOR_NEEDED: visit_ID
-#NO_VISITOR_NEEDED: visit_term
-#NO_VISITOR_NEEDED: visit_re_no_slash
-#NO_VISITOR_NEEDED: visit_group
-#NO_VISITOR_NEEDED: visit_op_quantity		-- handled in visit_single_expr
-#NO_VISITOR_NEEDED: visit_op_alternative	-- handled in visit_expression
-#NO_VISITOR_NEEDED: visit_complex_lit		-- handled in visit_number
-#NO_VISITOR_NEEDED: visit_float_lit		-- handled in visit_number
-#NO_VISITOR_NEEDED: visit_int_lit		-- handled in visit_number
-#NO_VISITOR_NEEDED: visit_value
-
-
-
-class PegVisitor(arpeggio.PTNodeVisitor):
-    def _logstr_node_children(self, node, children):
-        return f'>>{node}<< children[{len(children)}] >>' + ", ".join(f'{c}:{type(c).__name__}' for c in children) + '<<'
-
-    def visit_str_term(self, node, children):
-        return grammar.StrTerm(value=node[1], parse_tree=node)
-
-    def visit_regex_term(self, node, children):
-        return grammar.RegExpTerm(value=node[1], parse_tree=node)
-
-    def visit_rule_name(self, node, children):
-        return grammar.ID(name=str(node), parse_tree=node)
-
-    def visit_rule_crossref(self, node, children):
-        return grammar.ID(name=str(node), parse_tree=node)
-
-    def visit_parse_rule(self, node, children):                               #  Name '<-' expression ';'
-        return grammar.Rule(name=children[0],expr=children[1], parse_tree=node)
-
-
-    def visit_single_expr(self, node, children):                        #  [ rule_crossref, term, group, predicate ],  op_quantity
-        token_2_class = {'?': grammar.Optional,
-                         '*': grammar.ZeroOrMore,
-                         '+': grammar.OneOrMore,
-                         '#': grammar.UnorderedGroup}
-
-        if len(children) == 1: #  No Optional part
-            logger.debug(f'visit_single_expr==1:: {getattr(children[0], "name", children[0])}:{type(children[0])}')
-            return children[0]
-
-        elif len(children) == 2: #  Optional part
-            logger.debug(f'visit_single_expr==2::Got: {children[0]}, {children[1]}')
-            expr = children[0]
-            token = str(children[1])
-            quantum_cls = token_2_class.get(token)
-            if quantum_cls:
-                ast=quantum_cls(expr=expr, parse_tree=node)
-                logger.debug(f'visit_single_expr==2::Pass: {quantum_cls}(expr={expr})')
-                return ast
-            else:
-                raise QuantityError(f"token '{token}' not recognised")
-        else: # #children not in (1,2)
-            raise  NotImplementedError("visit_single_expr, len>2")      # -- Is this possible?
-
-
-    # expression <- sequence, op_alternative; op_alternative <- ('|' expression)?
-    def visit_expression(self, node, children) -> Union[grammar.Sequence,  grammar.OrderedChoice]:
-        logger.debug('visit_expression::' + self._logstr_node_children(node, children))
-        if len(children) == 1: #Only sequence
-            return children[0]
-        elif len(children) == 2: # So, having 1 or more alternatives in children[1]
-            # In all cased a (single) OrderedChoice with a list of alternatives should be returned.
-            if isinstance(children[1], grammar.OrderedChoice):
-                alternatives = [children[0]] + [alt for alt in children[1]]
-            else:
-                alternatives = children
-            return grammar.OrderedChoice(children = alternatives, parse_tree=node)
-        else:
-            raise NotImplementedError("visit_expression, len>2")
-
-
-    # OneOrMore(single_expr)
-    def visit_sequence(self, node, children) -> grammar.Sequence:
-        logger.debug(f'visit_sequence::{self._logstr_node_children(node, children)}')
-        return grammar.Sequence(children=children, parse_tree=node)
-
-
-    def visit_predicate(self, node, children):
-        token_2_predicate = {'&': grammar.AndPredicate,
-                             '!': grammar.NotPredicate}
-        logger.debug(f'visit_predicate:: >>{node}<< #children={len(children)}')
-
-        if len(children) == 2:
-            token = children[0]
-            cls = token_2_predicate.get(token)
-            if cls:
-                ast = cls(expr=children[1], parse_tree=node)
-                return ast
-            else:
-                raise PredicateError(f"token '{token}' not recognised")
-        else:
-            raise  NotImplementedError("visit_predicate, len!=2")      # -- Is this possible?
-
-
-    def visit_rules(self, node, children):                              # Mix of `ParseRule`(s)`Setting`(s) ; will be sorted out n `Grammar`
-        logger.debug('visit_rules::' + self._logstr_node_children(node, children))
-        return grammar.Rules(children=children[:], parse_tree=node)
-
-
-    def visit_peg_grammar(self, node, children):
-        return grammar.Grammar(all_rules=children[0], parse_tree=node)
-
-    def visit_setting_name(self, node, children):
-        return grammar.ID(name=str(node), parse_tree=node)
-
-    def visit_number(self, node, children):
-        return grammar.Number(value=str(node), parse_tree=node)
-
-    def visit_setting_xref(self, node, children):
-        return grammar.ID(name=str(node), parse_tree=node)
-
-    def visit_setting(self, node, children):
-        logger.debug('visit_setting::' + self._logstr_node_children(node, children))
-        return grammar.Setting(name=children[0], value=children[1] , parse_tree=node)

diff -r 59d7c5703ac0 -r 5b918e28475e demos/ThinOnion/demo1.py
--- a/demos/ThinOnion/demo1.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/demos/ThinOnion/demo1.py	Fri Apr 22 23:25:53 2022 +0200
@@ -1,7 +1,7 @@
 import pytest
 import logging; logger = logging.getLogger(__name__)
 
-from castle.readers.parser import grammar, visitor
+from castle.readers.parser import grammar
 from castle.ast import grammar as AST
 
 import arpeggio
@@ -34,7 +34,7 @@
         parser = arpeggio.ParserPython(grammar.peg_grammar, comment_def = grammar.comment)
         pt = parser.parse(txt)
         logger.info(f"Reader:_do_parse::\t parse_tree: start={pt.position} end={pt.position_end}; len(txt)={len(txt)}")
-        ast = arpeggio.visit_parse_tree(pt, visitor.PegVisitor())
+        ast = arpeggio.visit_parse_tree(pt, grammar.PegVisitor())
         logger.debug(f"Reader:_do_parse::\t ast: start={ast.position} end={ast.position_end} -- not counting comments.")
         return ast
 

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d1_parse_tree/__init__.py
--- a/pytst/readers/parser/d1_parse_tree/__init__.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d1_parse_tree/__init__.py	Fri Apr 22 23:25:53 2022 +0200
@@ -1,7 +1,8 @@
 import logging;logger = logging.getLogger(__name__)
-from castle.readers.parser import grammar
+import arpeggio
 
-import arpeggio
+from castle.readers.parser.grammar import language as grammar
+
 
 def parse(txt, grammer_rule):
     logger.debug(f'>>{txt}<<')

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d1_parse_tree/test_1_regexp.py
--- a/pytst/readers/parser/d1_parse_tree/test_1_regexp.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d1_parse_tree/test_1_regexp.py	Fri Apr 22 23:25:53 2022 +0200
@@ -1,7 +1,7 @@
 import pytest
 import logging;logger = logging.getLogger(__name__)
 
-from castle.readers.parser import grammar
+from castle.readers.parser.grammar import language as grammar
 
 import arpeggio
 RE, S = arpeggio.RegExMatch, arpeggio.StrMatch                          # shortcut

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d1_parse_tree/test_2_str.py
--- a/pytst/readers/parser/d1_parse_tree/test_2_str.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d1_parse_tree/test_2_str.py	Fri Apr 22 23:25:53 2022 +0200
@@ -1,7 +1,8 @@
 import pytest
 import logging;logger = logging.getLogger(__name__)
 
-from castle.readers.parser import grammar
+from castle.readers.parser.grammar import language as grammar
+
 
 import arpeggio
 RE, S = arpeggio.RegExMatch, arpeggio.StrMatch                          # shortcut

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d1_parse_tree/test_3_expr.py
--- a/pytst/readers/parser/d1_parse_tree/test_3_expr.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d1_parse_tree/test_3_expr.py	Fri Apr 22 23:25:53 2022 +0200
@@ -1,7 +1,7 @@
 import pytest
 import logging;logger = logging.getLogger(__name__)
 
-from castle.readers.parser import grammar
+from castle.readers.parser.grammar import language as grammar
 
 import arpeggio
 

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d1_parse_tree/test_4_rule.py
--- a/pytst/readers/parser/d1_parse_tree/test_4_rule.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d1_parse_tree/test_4_rule.py	Fri Apr 22 23:25:53 2022 +0200
@@ -1,7 +1,7 @@
 import pytest
 import logging;logger = logging.getLogger(__name__)
 
-from castle.readers.parser import grammar
+from castle.readers.parser.grammar import language as grammar
 
 import arpeggio
 RE, S = arpeggio.RegExMatch, arpeggio.StrMatch                          # shortcut

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d1_parse_tree/test_5_settings.py
--- a/pytst/readers/parser/d1_parse_tree/test_5_settings.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d1_parse_tree/test_5_settings.py	Fri Apr 22 23:25:53 2022 +0200
@@ -1,7 +1,7 @@
 import pytest
 import logging;logger = logging.getLogger(__name__)
 
-from castle.readers.parser import grammar
+from castle.readers.parser.grammar import language as grammar
 
 import arpeggio
 RE, S = arpeggio.RegExMatch, arpeggio.StrMatch                          # shortcut

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d1_parse_tree/test_6_comments.py
--- a/pytst/readers/parser/d1_parse_tree/test_6_comments.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d1_parse_tree/test_6_comments.py	Fri Apr 22 23:25:53 2022 +0200
@@ -1,7 +1,7 @@
 import pytest
 import logging;logger = logging.getLogger(__name__)
 
-from castle.readers.parser import grammar
+from castle.readers.parser.grammar import language as grammar
 
 import arpeggio
 RE, S = arpeggio.RegExMatch, arpeggio.StrMatch                          # shortcut

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d1_parse_tree/test_9_file.py
--- a/pytst/readers/parser/d1_parse_tree/test_9_file.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d1_parse_tree/test_9_file.py	Fri Apr 22 23:25:53 2022 +0200
@@ -3,7 +3,8 @@
 from pathlib import Path
 import os
 
-from castle.readers.parser import grammar
+from castle.readers.parser.grammar import language as grammar
+
 import arpeggio
 
 def parse_file(filename, dir=Path('..')):

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d2_ast/__init__.py
--- a/pytst/readers/parser/d2_ast/__init__.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d2_ast/__init__.py	Fri Apr 22 23:25:53 2022 +0200
@@ -2,20 +2,19 @@
 
 import arpeggio
 
-from castle.readers.parser import visitor
-from castle.readers.parser import grammar as rules
+from castle.readers.parser import grammar
 from castle.ast import grammar as AST
 
 def parse(txt, rule, *,
           with_comments=False,
           visitor_debug=False):
 
-    parser = arpeggio.ParserPython(rule, comment_def = rules.comment if with_comments else None)
+    parser = arpeggio.ParserPython(rule, comment_def = grammar.comment if with_comments else None)
     pt = parser.parse(txt)
     logger.debug('PARSE_TREE\n'+pt.tree_str())
     assert pt.position_end == len(txt), f"Did not parse all input txt=>>{txt}<<len={len(txt)} ==> parse_tree: >>{pt}<<_end={pt.position_end}"
 
-    ast = arpeggio.visit_parse_tree(pt, visitor.PegVisitor(debug=visitor_debug))
+    ast = arpeggio.visit_parse_tree(pt, grammar.PegVisitor(debug=visitor_debug))
     logger.debug('AST\n' + f'{ast}:{type(ast).__name__}')
 
     if with_comments: #   When the txt starts with comments, the AST does start 'after' that comment -- so skip the start-check

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d2_ast/test_1_term.py
--- a/pytst/readers/parser/d2_ast/test_1_term.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d2_ast/test_1_term.py	Fri Apr 22 23:25:53 2022 +0200
@@ -1,7 +1,7 @@
 import pytest
 import logging; logger = logging.getLogger(__name__)
 
-from castle.readers.parser import grammar as rules
+from castle.readers.parser.grammar import language as rules
 from castle.ast import grammar as AST
 
 from . import parse

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d2_ast/test_2_ID.py
--- a/pytst/readers/parser/d2_ast/test_2_ID.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d2_ast/test_2_ID.py	Fri Apr 22 23:25:53 2022 +0200
@@ -1,6 +1,6 @@
 import pytest
 
-from castle.readers.parser import grammar as rules
+from castle.readers.parser.grammar import language as rules
 from castle.ast import grammar as AST
 
 from . import parse, assert_ID

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d2_ast/test_3_Seq.py
--- a/pytst/readers/parser/d2_ast/test_3_Seq.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d2_ast/test_3_Seq.py	Fri Apr 22 23:25:53 2022 +0200
@@ -4,7 +4,7 @@
 import pytest
 import logging; logger = logging.getLogger(__name__)
 
-from castle.readers.parser import grammar as rules
+from castle.readers.parser.grammar import language as rules
 from castle.ast import grammar as AST
 
 from . import parse, assert_ID, assert_Seq

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d2_ast/test_3_rule.py
--- a/pytst/readers/parser/d2_ast/test_3_rule.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d2_ast/test_3_rule.py	Fri Apr 22 23:25:53 2022 +0200
@@ -1,7 +1,7 @@
 import pytest
 import logging; logger = logging.getLogger(__name__)
 
-from castle.readers.parser import grammar as rules
+from castle.readers.parser.grammar import language as rules
 from castle.ast import grammar as AST
 
 from . import parse, assert_ID, assert_Seq, assert_ParseRule

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d2_ast/test_3_settings.py
--- a/pytst/readers/parser/d2_ast/test_3_settings.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d2_ast/test_3_settings.py	Fri Apr 22 23:25:53 2022 +0200
@@ -1,6 +1,6 @@
 import pytest
 
-from castle.readers.parser import grammar as rules
+from castle.readers.parser.grammar import language as rules
 from castle.ast import grammar as AST
 
 from . import parse, assert_Setting

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d2_ast/test_4_quantity.py
--- a/pytst/readers/parser/d2_ast/test_4_quantity.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d2_ast/test_4_quantity.py	Fri Apr 22 23:25:53 2022 +0200
@@ -3,7 +3,7 @@
 import pytest
 import logging; logger = logging.getLogger(__name__)
 
-from castle.readers.parser import grammar as rules
+from castle.readers.parser.grammar import language as rules
 from castle.ast import grammar as AST
 
 from . import parse, assert_ID

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d2_ast/test_5_group.py
--- a/pytst/readers/parser/d2_ast/test_5_group.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d2_ast/test_5_group.py	Fri Apr 22 23:25:53 2022 +0200
@@ -1,7 +1,7 @@
 import pytest
 import logging; logger = logging.getLogger(__name__)
 
-from castle.readers.parser import grammar as rules
+from castle.readers.parser.grammar import language as rules
 from castle.ast import grammar as AST
 
 from . import parse, assert_ID, assert_ParseRule, assert_Seq

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d2_ast/test_6_predicate.py
--- a/pytst/readers/parser/d2_ast/test_6_predicate.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d2_ast/test_6_predicate.py	Fri Apr 22 23:25:53 2022 +0200
@@ -1,7 +1,7 @@
 import pytest
 import logging; logger = logging.getLogger(__name__)
 
-from castle.readers.parser import grammar as rules
+from castle.readers.parser.grammar import language as rules
 from castle.ast import grammar as AST
 
 from . import parse, assert_ID, precondition_ID, precondition_Expressions

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d2_ast/test_7_rules.py
--- a/pytst/readers/parser/d2_ast/test_7_rules.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d2_ast/test_7_rules.py	Fri Apr 22 23:25:53 2022 +0200
@@ -1,7 +1,7 @@
 import pytest
 import logging; logger = logging.getLogger(__name__)
 
-from castle.readers.parser import grammar as rules
+from castle.readers.parser.grammar import language as rules
 from castle.ast import grammar as AST
 
 from . import parse, assert_Rule, assert_ParseRule, assert_Setting

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d2_ast/test_8_grammar.py
--- a/pytst/readers/parser/d2_ast/test_8_grammar.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d2_ast/test_8_grammar.py	Fri Apr 22 23:25:53 2022 +0200
@@ -1,7 +1,7 @@
 import pytest
 import logging; logger = logging.getLogger(__name__)
 
-from castle.readers.parser import grammar as rules
+from castle.readers.parser.grammar import language as rules
 from castle.ast import grammar as AST
 
 from . import parse, assert_PEG

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/d2_ast/test_9_file.py
--- a/pytst/readers/parser/d2_ast/test_9_file.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/d2_ast/test_9_file.py	Fri Apr 22 23:25:53 2022 +0200
@@ -3,8 +3,7 @@
 from pathlib import Path
 import os
 
-from castle.readers.parser import grammar as rules
-
+from castle.readers.parser.grammar import language as rules
 
 from . import parse, assert_PEG
 

diff -r 59d7c5703ac0 -r 5b918e28475e pytst/readers/parser/general/test_file.py
--- a/pytst/readers/parser/general/test_file.py	Fri Apr 22 21:44:04 2022 +0200
+++ b/pytst/readers/parser/general/test_file.py	Fri Apr 22 23:25:53 2022 +0200
@@ -2,13 +2,13 @@
 import logging; logger = logging.getLogger(__name__)
 
 from castle.readers.parser import FileParser
-from castle.readers.parser import grammar, visitor
+from castle.readers.parser import grammar
 
 
 def test_file():
     reader = FileParser(language_def=grammar.peg_grammar,
                         comment_def=grammar.comment,
-                        visitor=visitor.PegVisitor(),
+                        visitor=grammar.PegVisitor(),
                         read_dirs=('../../../demos/ThinOnion',
                                    '../../.././demos/ThinOnion/grammar',
                                    '../../.././pytst/readers/parser'))