Commit: 68702f02a7efd0206dfc5aa3f4829135969924f9 - CCastle2 (hg)

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

Commit MetaInfo

• Revision: 68702f02a7efd0206dfc5aa3f4829135969924f9 (tree)
• Zeit: 2022-02-26 07:39:53
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

AST2XML:: Added Grammar-ast/class/xml; needed to refactor/rewrite the peg.Grammar inerface; to store the order. Adappted some tests

Ändern Zusammenfassung

• modified: castle/ast/ast2xml.py
• modified: castle/ast/peg.py
• modified: castle/readers/parser/visitor.py
• modified: pytst/readers/parser/d2_ast/__init__.py
• add: pytst/ast/XML_serialization/test_6_grammar.py

Diff

diff -r 969863cb6c95 -r 68702f02a7ef castle/ast/ast2xml.py
--- a/castle/ast/ast2xml.py	Fri Feb 25 17:04:14 2022 +0100
+++ b/castle/ast/ast2xml.py	Fri Feb 25 23:39:53 2022 +0100
@@ -111,21 +111,7 @@
         self._ast2xml(ast.name, setting)
         self._ast2xml(ast.value, setting)
 
-
-
-#############
-
-
-##        logger.debug(f"Setting2xml:: ast[{len(ast)}]")
-##        ET.SubElement(parent, 'Setting', name=ast.name, value=ast.value)
+    def Grammar2xml(self, ast, parent) ->None:
+        g = ET.SubElement(parent, 'Grammar', no_parse_rules=str(len(ast.parse_rules)), no_settings=str(len(ast.settings)))
+        self._ast2xml(ast._all_rules, g)
 
-##    def Settings2xml(self, ast, parent) ->None: ...
-#    def Grammar2xml(self, ast, parent) ->None: ...
-
-
-
-
-
-#    def NotPredicate2xml(self, ast, parent) ->None: ...
-
-

diff -r 969863cb6c95 -r 68702f02a7ef castle/ast/peg.py
--- a/castle/ast/peg.py	Fri Feb 25 17:04:14 2022 +0100
+++ b/castle/ast/peg.py	Fri Feb 25 23:39:53 2022 +0100
@@ -2,6 +2,7 @@
 
 from ._base import AST_BASE, ID, IDError
 
+import typing
 
 class PEG (AST_BASE):                                                   # abstract
     """Base class of all PEG classes"""
@@ -103,13 +104,13 @@
 
 class Grammar(NonTerminal):
     def __init__(self, *,
-                 rules: ParseRules=None,
-                 settings: Settings=None,
+                 all_rules: typing.Sequence[Rule],
                  **kwargs):
-        logger.debug(f'{self._typeName(self)}:: rules={rules}; settings={settings}, kwargs={kwargs}')
         super().__init__(**kwargs)
-        self.rules = rules
-        self.settings = settings
+        self._all_rules = Rules(children=all_rules) # store `all_rules` in once, to be able to remember the order
+        self.parse_rules  = ParseRules( children=[r for r in self._all_rules if isinstance(r, Rule)] )
+        self.settings = Settings( children=[r for r in self._all_rules if isinstance(r, Setting)] )
+        assert len(all_rules) == len(self.parse_rules) + len(self.settings)
 
 
 class Group(Expression): pass                                           # abstract --  Note: Do not Group for  '(' ...')';  that's a Sequence!!

diff -r 969863cb6c95 -r 68702f02a7ef castle/readers/parser/visitor.py
--- a/castle/readers/parser/visitor.py	Fri Feb 25 17:04:14 2022 +0100
+++ b/castle/readers/parser/visitor.py	Fri Feb 25 23:39:53 2022 +0100
@@ -117,13 +117,7 @@
 
 
     def visit_peg_grammar(self, node, children):
-        rules=children[0]
-        logger.debug('visit_peg_grammar::' + self._logstr_node_children(node, children) + f'rules:: {rules}')
-        parse_rules = peg.ParseRules( children=[r for r in rules if isinstance(r, peg.Rule)] )
-        settings    = peg.Settings(   children=[r for r in rules if isinstance(r, peg.Setting)] )
-        assert len(rules) == len(parse_rules) + len(settings), f'Number of parse_rules ({len(parse_rules)}) and settings ({len(settings)}), does not match total: {len(rules)}'
-        return peg.Grammar(rules=parse_rules, settings=settings, parse_tree=node)
-
+        return peg.Grammar(all_rules=children[0], parse_tree=node)
 
     def visit_setting_name(self, node, children):
         return peg.ID(name=str(node), parse_tree=node)

diff -r 969863cb6c95 -r 68702f02a7ef pytst/ast/XML_serialization/test_6_grammar.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pytst/ast/XML_serialization/test_6_grammar.py	Fri Feb 25 23:39:53 2022 +0100
@@ -0,0 +1,39 @@
+import pytest
+import logging; logger = logging.getLogger(__name__)
+
+from castle.ast import peg
+
+from . import xml_serialize #@pytest.fixture
+from . import assert_xml_Element, StdSequence_withAsserts
+
+def test_a_Grammar_with_ParseRules_only(xml_serialize):
+    name1, seq1  = 'aParseRule',  StdSequence_withAsserts()
+    name2, seq2  = 'rule_2',      StdSequence_withAsserts()
+    r1 = peg.Rule(name=peg.ID(name=name1), expr=seq1.seq)
+    r2 = peg.Rule(name=peg.ID(name=name2), expr=seq2.seq)
+
+    g = peg.Grammar(all_rules=(r1,r2))
+    txt = xml_serialize(g)
+    logger.debug(f'XML:: {txt}')
+
+    assert_xml_Element(txt, tag='Grammar', child_count=2)
+    assert_xml_Element(txt, tag='Grammar/Rule[1]', name=name1)
+    assert_xml_Element(txt, tag='Grammar/Rule[2]', name=name2)
+
+def test_a_Grammar_with_MixedRules(xml_serialize):
+    name1, seq1  = 'aParseRule',  StdSequence_withAsserts()
+    name2, val2  = 'setting2',    "1965"
+    name3, seq3  = 'rule_3',      StdSequence_withAsserts()
+    r1 = peg.Rule(name=peg.ID(name=name1), expr=seq1.seq)
+    r2 = peg.Setting(name=peg.ID(name=name2), value=peg.Number(value=val2))
+    r3 = peg.Rule(name=peg.ID(name=name3), expr=seq3.seq)
+
+    g = peg.Grammar(all_rules=(r1,r2,r3))
+    txt = xml_serialize(g)
+    logger.debug(f'XML:: {txt}')
+
+    assert_xml_Element(txt, tag='Grammar', child_count=3)
+    assert_xml_Element(txt, tag='Grammar/Rule[1]', name=name1)
+    assert_xml_Element(txt, tag='Grammar/Setting/ID', name=name2)
+    assert_xml_Element(txt, tag='Grammar/Rule[2]', name=name3)
+

diff -r 969863cb6c95 -r 68702f02a7ef pytst/readers/parser/d2_ast/__init__.py
--- a/pytst/readers/parser/d2_ast/__init__.py	Fri Feb 25 17:04:14 2022 +0100
+++ b/pytst/readers/parser/d2_ast/__init__.py	Fri Feb 25 23:39:53 2022 +0100
@@ -61,7 +61,7 @@
 def assert_PEG(ast, *, no_of_rules=None, no_of_settings=None):
     assert isinstance(ast, peg.Grammar)
 
-    rules = ast.rules
+    rules = ast.parse_rules
     assert isinstance(rules, peg.Rules)
     if no_of_rules:
         assert len(rules) == no_of_rules, f"The number of (parse_)rules ({len(rules)}) does not match the spec: {no_of_rules}"