Commit: f8bd16e1d4e3920655376abe924c89460dbac0a1 - CCastle2 (hg)

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

Commit MetaInfo

• Revisión: f8bd16e1d4e3920655376abe924c89460dbac0a1 (tree)
• Tiempo: 2022-02-15 02:27:24
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

SETTINGS: ASIS, promoting 'Settings' up-to grammar; but introduced BUG in visit_rules ... Need to fix some test

Cambiar Resumen

• modified: castle/ast/peg.py
• modified: castle/readers/parser/visitor.py
• modified: pytst/readers/parser/d2_ast/__init__.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_5_group.py
• modified: pytst/readers/parser/d2_ast/test_7_rules.py
• modified: pytst/readers/parser/d2_ast/test_8_grammar.py

Diferencia incremental

diff -r b15dd4fa21b1 -r f8bd16e1d4e3 castle/ast/peg.py
--- a/castle/ast/peg.py	Sun Feb 13 22:05:55 2022 +0100
+++ b/castle/ast/peg.py	Mon Feb 14 18:27:24 2022 +0100
@@ -108,7 +108,7 @@
                  rules: Rules=None,
                  settings: Settings=None,
                  **kwargs):
-        logger.debug(f'{self._typeName(self)}:: kwargs={kwargs}')
+        logger.debug(f'{self._typeName(self)}:: rules={rules}; settings={settings}, kwargs={kwargs}')
         super().__init__(**kwargs)
         self.rules = rules
         self.settings = settings

diff -r b15dd4fa21b1 -r f8bd16e1d4e3 castle/readers/parser/visitor.py
--- a/castle/readers/parser/visitor.py	Sun Feb 13 22:05:55 2022 +0100
+++ b/castle/readers/parser/visitor.py	Mon Feb 14 18:27:24 2022 +0100
@@ -24,7 +24,7 @@
 #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
-#NO_VISITOR_NEEDED: visit_setting_xref
+
 
 
 class PegVisitor(arpeggio.PTNodeVisitor):
@@ -113,14 +113,16 @@
 
     def visit_rules(self, node, children):
         logger.debug('visit_rules::' + self._logstr_node_children(node, children))
-        return peg.Rules(children=children[:], parse_tree=node)
+        parse_rules = peg.Rules(children=[r for r in children if isinstance(r, peg.Rule)] )
+        settings = peg.Settings(children=[r for r in children if isinstance(r, peg.Setting)] )
+        assert len(children) == len(parse_rules) + len(settings), f'Number of parse_rules ({len(parse_rules)}) and settings ({len(settings)}), does not match total: {len(children)}'
+        return (parse_rules, settings) # XXX not an AST! XXX
 
 
     def visit_peg_grammar(self, node, children): # No support for settings XXX
-        rules=children[0]
-        assert len(children) == 1
-        logger.debug(f'visit_peg_grammar:: >>{node}<< #children={len(children)} ; rules={rules}:{type(rules)}')
-        return peg.Grammar(rules=rules, parse_tree=node)
+        logger.debug('visit_peg_grammar::' + self._logstr_node_children(node, children))
+        parse_rules, settings = children[0] #unpack the tuple of above
+        return peg.Grammar(rules=parse_rules, settings=settings, parse_tree=node)
 
 
     def visit_setting_name(self, node, children):
@@ -129,6 +131,9 @@
     def visit_number(self, node, children):
         return peg.Number(value=str(node), parse_tree=node)
 
+    def visit_setting_xref(self, node, children):
+        return peg.ID(name=str(node), parse_tree=node)
+
     def visit_setting(self, node, children):
         logger.debug('visit_setting::' + self._logstr_node_children(node, children))
         return peg.Setting(name=children[0], value=children[1] , parse_tree=node)

diff -r b15dd4fa21b1 -r f8bd16e1d4e3 pytst/readers/parser/d2_ast/__init__.py
--- a/pytst/readers/parser/d2_ast/__init__.py	Sun Feb 13 22:05:55 2022 +0100
+++ b/pytst/readers/parser/d2_ast/__init__.py	Mon Feb 14 18:27:24 2022 +0100
@@ -43,12 +43,14 @@
             assert_ID(ast[i], name)
 
 
-def assert_Rule(ast, rune_name=None):
+def assert_ParseRule(ast, rule_name=None):
     assert isinstance(ast, peg.Rule), 	"It should be an Rule"
-    if rune_name:
-        assert_ID(ast.name, rune_name)
-precondition_Rule = assert_Rule
+    if rule_name:  assert_ID(ast.name, rule_name)
 
+def assert_Rule(ast, rule_name=None):
+    assert isinstance(ast, (peg.Rule, peg.Setting))
+    if isinstance(ast, peg.Rule): assert_ParseRule(ast, rule_name)
+    if isinstance(ast, peg.Setting): assert_Setting(ast, rule_name)
 
 def precondition_Expressions(expr, *, type=peg.Sequence, length=None):
     assert isinstance(expr, type), "PreCondition failed"
@@ -62,10 +64,20 @@
     rules = ast.rules
     assert isinstance(rules, peg.Rules)
     if no_of_rules:
-        assert len(rules) == no_of_rules, "We expect the same number as Rules as lines"
+        assert len(rules) == no_of_rules, f"The number of (parse_)rules ({len(rules)}) does not match the spec: {no_of_rules}"
 
     settings = ast.settings
-    assert isinstance(settings, (type(None), peg.Settings))
+    if settings:
+        assert isinstance(settings, peg.Settings)
     if no_of_settings:
-        assert isinstance(settings, peg.Settings)
-        len(settings) == no_of_settings
+        assert len(settings) == no_of_settings, f"The number of settings ({len(settings)}) does not match the spec: {no_of_settings}"
+
+
+def assert_Setting(ast, pegType=None, name=None, value=None):
+    assert isinstance(ast, peg.Setting)
+    assert isinstance(ast.name, peg.ID)
+    assert isinstance(ast.value, (peg.StrTerm, peg.RegExpTerm, peg.Number, peg.ID)), f'Unexpected Type for ast.value: {type(ast.value)}'
+
+    if pegType: assert isinstance(ast.value, pegType)
+    if name:    assert ast.name.name == name
+    if value:   assert ast.value.value == value

diff -r b15dd4fa21b1 -r f8bd16e1d4e3 pytst/readers/parser/d2_ast/test_3_rule.py
--- a/pytst/readers/parser/d2_ast/test_3_rule.py	Sun Feb 13 22:05:55 2022 +0100
+++ b/pytst/readers/parser/d2_ast/test_3_rule.py	Mon Feb 14 18:27:24 2022 +0100
@@ -4,7 +4,7 @@
 from castle.readers.parser import grammar
 from castle.ast import peg
 
-from . import parse, assert_ID, assert_Seq, assert_Rule
+from . import parse, assert_ID, assert_Seq, assert_ParseRule
 
 
 def test_trivial_rule_with_2IDS():
@@ -13,7 +13,7 @@
     txt="trivial <- cross ;"
     ast = parse(txt, grammar.parse_rule)
 
-    assert_Rule(ast, rune_name=txt.split()[0])                # The name of a rule is a ID with the left-side ID as name
+    assert_ParseRule(ast, rule_name=txt.split()[0])                # The name of a rule is a ID with the left-side ID as name
 
     expr = ast.expr
     assert_Seq(expr, length=1)
@@ -24,7 +24,7 @@
     txt = """aRule <- 'aStr' aCross /regexp/ ;"""
     ast = parse(txt, grammar.parse_rule)
 
-    assert_Rule(ast, rune_name=txt.split()[0])
+    assert_ParseRule(ast, rule_name=txt.split()[0])
 
     expr = ast.expr;
     assert_Seq(expr, length=3)

diff -r b15dd4fa21b1 -r f8bd16e1d4e3 pytst/readers/parser/d2_ast/test_3_settings.py
--- a/pytst/readers/parser/d2_ast/test_3_settings.py	Sun Feb 13 22:05:55 2022 +0100
+++ b/pytst/readers/parser/d2_ast/test_3_settings.py	Mon Feb 14 18:27:24 2022 +0100
@@ -3,34 +3,32 @@
 from castle.readers.parser import grammar
 from castle.ast import peg
 
-from . import parse
-
-def validate_setting(ast, pegType=None, name=None, value=None):
-    assert isinstance(ast, peg.Setting)
-    assert isinstance(ast.name, peg.ID)
-    assert isinstance(ast.value, (peg.StrTerm, peg.RegExpTerm, peg.Number))
-
-    if pegType: assert isinstance(ast.value, pegType)
-    if name:    assert ast.name.name == name
-    if value:   assert ast.value.value == value
+from . import parse, assert_Setting
 
 
 def test_setting_a_value42():
     txt="aNumber = 42;"
     ast = parse(txt, grammar.setting)
-    validate_setting(ast, pegType=peg.Number, name='aNumber', value='42')
+    assert_Setting(ast, pegType=peg.Number, name='aNumber', value='42')
 
 def test_setting_str1():
     txt="String = '42';"
     ast = parse(txt, grammar.setting)
-    validate_setting(ast, pegType=peg.StrTerm, name='String', value='42')
+    assert_Setting(ast, pegType=peg.StrTerm, name='String', value='42')
 
 def test_setting_str2():
     txt='''String = "42";'''
     ast = parse(txt, grammar.setting)
-    validate_setting(ast, pegType=peg.StrTerm, name='String', value='42')
+    assert_Setting(ast, pegType=peg.StrTerm, name='String', value='42')
 
 def test_setting_re():
     txt="RegExp = /abc/;"
     ast = parse(txt, grammar.setting)
-    validate_setting(ast, pegType=peg.RegExpTerm, name='RegExp', value='abc')
+    assert_Setting(ast, pegType=peg.RegExpTerm, name='RegExp', value='abc')
+
+def test_setting_setting_xref():
+    txt="aSetting = anOtherSetting;"
+    ast = parse(txt, grammar.setting)
+    assert_Setting(ast, pegType=peg.ID, name='aSetting')
+    assert ast.value.name == 'anOtherSetting'
+

diff -r b15dd4fa21b1 -r f8bd16e1d4e3 pytst/readers/parser/d2_ast/test_5_group.py
--- a/pytst/readers/parser/d2_ast/test_5_group.py	Sun Feb 13 22:05:55 2022 +0100
+++ b/pytst/readers/parser/d2_ast/test_5_group.py	Mon Feb 14 18:27:24 2022 +0100
@@ -4,7 +4,7 @@
 from castle.readers.parser import grammar
 from castle.ast import peg
 
-from . import parse, assert_ID, precondition_Rule, assert_Seq
+from . import parse, assert_ID, assert_ParseRule, assert_Seq
 
 
 def assert_Group(grp, length=1, groupType=peg.Sequence, ids=None):
@@ -18,7 +18,7 @@
     txt = "R <- ( A B ) ;"
 
     ast = parse(txt, grammar.parse_rule)
-    precondition_Rule(ast, 'R')
+    assert_ParseRule(ast, 'R')
 
     grp = ast.expr
     assert_Group(grp, ids=('A', 'B'))
@@ -28,7 +28,7 @@
     txt = "R <- ( (  A B ) ) ;"
 
     ast = parse(txt, grammar.parse_rule)
-    precondition_Rule(ast, 'R')
+    assert_ParseRule(ast, 'R')
 
     grp = ast.expr
     assert_Group(grp)
@@ -41,7 +41,7 @@
     txt = "R <- ( A B )# ;"
 
     ast = parse(txt, grammar.parse_rule)
-    precondition_Rule(ast, 'R')
+    assert_ParseRule(ast, 'R')
 
     grp = ast.expr
     assert_Group(grp, groupType=peg.UnorderedGroup)

diff -r b15dd4fa21b1 -r f8bd16e1d4e3 pytst/readers/parser/d2_ast/test_7_rules.py
--- a/pytst/readers/parser/d2_ast/test_7_rules.py	Sun Feb 13 22:05:55 2022 +0100
+++ b/pytst/readers/parser/d2_ast/test_7_rules.py	Mon Feb 14 18:27:24 2022 +0100
@@ -4,11 +4,31 @@
 from castle.readers.parser import grammar
 from castle.ast import peg
 
-from . import parse, assert_Rule
+from . import parse, assert_Rule, assert_ParseRule, assert_Setting
 
-def test_some_rules():
+def test_some_parse_rules():
     txt="""R1 <- A;
            R2 <- B;"""
+    ast = parse(txt, grammar.rules)
+
+    assert isinstance(ast, peg.Rules)
+    assert len(ast) == 2, "We expect the same number as Rules as lines"
+    for p in ast:
+        assert_ParseRule(p)
+
+def test_some_setting_rules():
+    txt="""S1 = A;
+           S2 = 42;"""
+    ast = parse(txt, grammar.rules, visitor_debug=False)
+
+    assert isinstance(ast, peg.Rules)
+    assert len(ast) == 2, "We expect the same number as Rules as lines"
+    for s in ast:
+        assert_Setting(s)
+
+def test_mixed_rules():
+    txt="""M1 <- A;
+           M2 =  B;"""
     ast = parse(txt, grammar.rules, visitor_debug=False)
 
     assert isinstance(ast, peg.Rules)
@@ -17,3 +37,4 @@
         assert_Rule(r)
 
 
+

diff -r b15dd4fa21b1 -r f8bd16e1d4e3 pytst/readers/parser/d2_ast/test_8_grammar.py
--- a/pytst/readers/parser/d2_ast/test_8_grammar.py	Sun Feb 13 22:05:55 2022 +0100
+++ b/pytst/readers/parser/d2_ast/test_8_grammar.py	Mon Feb 14 18:27:24 2022 +0100
@@ -26,6 +26,7 @@
     ast = parse(txt, grammar.peg_grammar, with_comments=True)
     assert_PEG(ast, no_of_rules=2)
 
+
 def test_with_start_comment():
     txt="""// COMMENT
            R1 <- A;
@@ -33,4 +34,24 @@
     ast = parse(txt, grammar.peg_grammar, with_comments=True)
     assert_PEG(ast, no_of_rules=2)
 
+def test_grammar_with_mixed_rules():
+    txt="""M1 <- A;
+           M2 =  B;"""
+    ast = parse(txt, grammar.peg_grammar)
 
+    assert isinstance(ast, peg.Grammar)
+    assert_PEG(ast, no_of_rules=1, no_of_settings=1)
+
+def test_grammar_with_many_rules():
+    txt="""R1 <- a;
+           R2 <- bb;
+           S1 =  1;
+           R3 <- ccc;
+           R4 <- dddd;
+           S2 =  2;
+           R5 <- eeeee;
+           S3 =  3;"""
+    ast = parse(txt, grammar.peg_grammar)
+
+    assert isinstance(ast, peg.Grammar)
+    assert_PEG(ast, no_of_rules=5, no_of_settings=3)