Commit: 2698c678f331b930955b06d039dcccce32f48ca3 - CCastle2 (hg)

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

Commit MetaInfo

• Révision: 2698c678f331b930955b06d039dcccce32f48ca3 (tree)
• l'heure: 2022-02-08 23:30:23
• Auteur: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Message de Log

AST-2-XML: UnorderedGroup works. Refactored log and renamed aux-class: StdSequence_withAsserts

Change Summary

• modified: castle/ast/ast2xml.py
• modified: pytst/ast/XML_serialization/test_1_simpleXML.py

Modification

diff -r 5661f00112da -r 2698c678f331 castle/ast/ast2xml.py
--- a/castle/ast/ast2xml.py	Mon Feb 07 22:02:05 2022 +0100
+++ b/castle/ast/ast2xml.py	Tue Feb 08 15:30:23 2022 +0100
@@ -9,7 +9,7 @@
 
 class XML_Serialize(serialization.Serialize):
     def serialize(self, ast) -> str:
-        logger.debug(f"ast={ast._valType(ast)}")
+        logger.debug(f"serialize:: ast={ast._valType(ast)}")
 
         tree = self._ast2xml(ast)
         return ET.tostring(tree, encoding="unicode")
@@ -21,7 +21,7 @@
 
         method_name = f'{type(ast).__name__}2xml'
         visitor = getattr(self, method_name, None)
-        logger.debug(f'visitor={visitor}')
+        logger.debug(f'_ast2xml:: visitor={visitor}')
 
         if visitor:
             visitor(ast=ast, parent=parent) # Grow the tree
@@ -31,7 +31,7 @@
 
 
     def ID2xml(self, ast, parent) ->None:
-        logger.debug(f"ast={ast._valType(ast)} parent={parent} ast.name={ast.name}")
+        logger.debug(f"ID2xml:: ast={ast._valType(ast)} parent={parent} ast.name={ast.name}")
         ET.SubElement(parent, 'ID', name=ast.name)
 
 
@@ -71,12 +71,19 @@
             logger.debug(f'Rules2xml type(child)={type(child)}')
             self._ast2xml(child, parent=parent)
 
+    def UnorderedGroup2xml(self, ast, parent) ->None:
+        g = ET.SubElement(parent, 'UnorderedGroup')
+        self._ast2xml(ast.expr, g)
+
 #############
 
-#    def Setting2xml(self, ast, parent) ->None: ...
-#    def Settings2xml(self, ast, parent) ->None: ...
+##    def Setting2xml(self, ast, parent) ->None:
+##        logger.debug(f"Setting2xml:: ast[{len(ast)}]")
+##        ET.SubElement(parent, 'Setting', name=ast.name, value=ast.value)
+
+##    def Settings2xml(self, ast, parent) ->None: ...
 #    def Grammar2xml(self, ast, parent) ->None: ...
-#    def UnorderedGroup2xml(self, ast, parent) ->None: ...
+
 #    def Quantity2xml(self, ast, parent) ->None: ...
 
 #    def OrderedChoice2xml(self, ast, parent) ->None: ...

diff -r 5661f00112da -r 2698c678f331 pytst/ast/XML_serialization/test_1_simpleXML.py
--- a/pytst/ast/XML_serialization/test_1_simpleXML.py	Mon Feb 07 22:02:05 2022 +0100
+++ b/pytst/ast/XML_serialization/test_1_simpleXML.py	Tue Feb 08 15:30:23 2022 +0100
@@ -5,7 +5,7 @@
 from castle.ast import  peg, serialization
 
 
-class Sequence:
+class StdSequence_withAsserts:
     def __init__(self):
         self.n1, self.v2, self.v3 = 'ID_1', 'str_2', 'regexp_3'
         e1 = peg.ID(name=self.n1)
@@ -22,6 +22,12 @@
 def assert_xml_Element(txt, tag,
                        version="0.0",
                        **attribs,):
+    """Partially verify an xml-string; focusing on 'tag' -- a real tag, or a (limited) XPATH-expression.
+
+    This `tag` (expression) should result in a single hit!. *Use e.g `[0]` as suffix to select one from a list*.
+    Pass ``key=value`` **attribs** to verify the found tag has those attribs and values
+    """
+    
     tree = ET.fromstring(txt)
     if version:
         assert tree.attrib['version'] == version
@@ -65,7 +71,7 @@
 
 
 def test_Sequence_3(xml_serialize):
-    seq = Sequence()
+    seq = StdSequence_withAsserts()
     txt= xml_serialize(seq.seq)
     logger.debug(f'XML:: {txt}')
 
@@ -87,7 +93,7 @@
 
 def test_Rule_Sequence(xml_serialize):
     rule_name = "Rule_Sequence"
-    seq = Sequence()
+    seq = StdSequence_withAsserts()
 
     txt = xml_serialize(peg.Rule(name=peg.ID(name=rule_name), expr=seq.seq))
     logger.debug(f'XML:: {txt}')
@@ -110,3 +116,11 @@
 
     assert  tree.findall('.//Rule[1]')[0].attrib['name'] == 'rule_1'
     assert  tree.findall('.//Rule[2]//StrTerm')[0].attrib['value'] == 'str2'
+
+def test_UnorderedGroup(xml_serialize):
+    seq = StdSequence_withAsserts()
+    txt = xml_serialize(peg.UnorderedGroup(expr=seq.seq))
+    logger.debug(f'XML:: {txt}')
+
+    assert_xml_Element(txt, 'UnorderedGroup')
+    seq.assert_xml_Element(txt)