提交: 7754889a9628321d0a8510ec0d8733f4a76363d3 - CCastle2 (hg)

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

Commit MetaInfo

• 修订版: 7754889a9628321d0a8510ec0d8733f4a76363d3 (tree)
• 时间: 2022-01-31 01:29:13
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

(empty log message)

更改概述

• modified: castle/ast/_base.py
• modified: castle/ast/serialization.py
• modified: pytst/ast/XML_serialization/test_1_simple.py
• add: Makefile

差异

diff -r bea38726c5d2 -r 7754889a9628 Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile	Sun Jan 30 17:29:13 2022 +0100
@@ -0,0 +1,31 @@
+default: all
+
+all: demo test missing
+
+missing: missing_visitor missing_serialization
+
+PYTEST_OPTONS=-rxXsfE
+pytest test:
+	pytest ${PYTEST_OPTONS}  pytst/
+pytest-s test-s:
+	pytest ${PYTEST_OPTONS} -s pytst
+test-ds test-sd test-d:
+	pytest ${PYTEST_OPTONS} --log-cli-level=DEBUG -s pytst/
+demo:
+	pytest -s demos
+	@echo run other demos by hand
+
+
+missing_visitor: castle/readers/parser/grammar.py
+	@for R in $(shell grep '^ *def ' $<  | awk '{print $$2}' | sed 's/()://') ; do	\
+	        if !  grep -q -E "^ *((def)|(# *NO_VISITOR_NEEDED:)) *visit_$$R" castle/readers/parser/visitor.py > /dev/null ; then\
+			echo "Warning: $${R} has no visitor (nor is marked as to need none)" ;\
+		fi ;\
+	done
+QAZ := ${shell grep '^ *class ' castle/ast/peg.py | sed 's/class //g' | sed 's/[:( ].*$$//g' }
+missing_serialization:
+	@for R in ${QAZ} ; do \
+	        if !  grep -q -E "^ *((def)|(# *NO_VISITOR_NEEDED:)) $${R}2xml" castle/ast/serialization.py > /dev/null ; then\
+			echo "Warning: $${R} has no xml-serializer (nor is marked as to need none)" ;\
+		fi ;\
+	done

diff -r bea38726c5d2 -r 7754889a9628 castle/ast/_base.py
--- a/castle/ast/_base.py	Sun Jan 30 16:27:51 2022 +0100
+++ b/castle/ast/_base.py	Sun Jan 30 17:29:13 2022 +0100
@@ -11,7 +11,7 @@
         self._parse_tree = parse_tree
 
     def __str__(self): # mostly for debugging
-        return str(type(self).__name__) + "\n\t" + "\n\t".join(f'{n}\t{str(v)}:{type(v).__name__}' for n,v in self.__dict__.items() if n[0]!='_')
+        return '\n__DEBUG__ ' + str(type(self).__name__) + "\n\t" + "\n\t".join(f'{n}\t{str(v)}:{type(v).__name__}' for n,v in self.__dict__.items() if n[0]!='_')
 
     def serialize(self, strategy="XML") -> str:
         return Serialize(strategy).serialize(self)

diff -r bea38726c5d2 -r 7754889a9628 castle/ast/serialization.py
--- a/castle/ast/serialization.py	Sun Jan 30 16:27:51 2022 +0100
+++ b/castle/ast/serialization.py	Sun Jan 30 17:29:13 2022 +0100
@@ -69,13 +69,14 @@
             self._ast2xml(elm, parent=seq)
 
     def Rule2xml(self, ast, parent) ->None:
-        rule = ET.SubElement(parent, 'Rule', name=ast.name.name)
+        logger.debug(f"Rule2xml:: ast:Rule.name={ast.name}")
+        rule = ET.SubElement(parent, 'Rule', name=ast.name)
         self._ast2xml(ast.expr, parent=rule)
 
     def Rules2xml(self, ast, parent) ->None:
         logger.debug(f"Rules2xml:: ast[{len(ast)}]")
         for child in ast:
-            logger.debug(f'Rules2xml child={child}:{type(child)}')
+            logger.debug(f'Rules2xml type(child)={type(child)}')
             self._ast2xml(child, parent=parent)
 
 #############

diff -r bea38726c5d2 -r 7754889a9628 pytst/ast/XML_serialization/test_1_simple.py
--- a/pytst/ast/XML_serialization/test_1_simple.py	Sun Jan 30 16:27:51 2022 +0100
+++ b/pytst/ast/XML_serialization/test_1_simple.py	Sun Jan 30 17:29:13 2022 +0100
@@ -4,12 +4,6 @@
 
 from castle.ast import  peg, serialization
 
-class RuleName:
-    def __init__(self, rule_name="Rule_Name"):
-        self.rule_name=rule_name
-        self.rule= peg.ID(name=rule_name)
-    def assert_xml_Element(self, txt):
-        assert_xml_Element(txt, tag='Rule', name=self.rule_name)
 
 class Sequence:
     def __init__(self):
@@ -78,11 +72,11 @@
 
 
 def test_Rule_1ID(xml_serialize):
-    rule_name, xref = "RuleName", "cross_ref"
-    name = peg.ID(name=rule_name)
+    rule_name = "RuleName"
+    xref = "cross_ref"
     expr = peg.Sequence(value=[peg.ID(name=xref)])
 
-    txt = xml_serialize(peg.Rule(name=name, expr=expr))
+    txt = xml_serialize(peg.Rule(name=rule_name, expr=expr))
     logger.debug(f'XML:: {txt}')
 
     assert_xml_Element(txt, tag='Rule', name=rule_name)
@@ -90,17 +84,16 @@
 
 
 def test_Rule_Sequence(xml_serialize):
-    rn = RuleName()
+    rule_name = "Rule_Sequence"
     seq = Sequence()
 
-    txt = xml_serialize(peg.Rule(name=rn.rule, expr=seq.seq))
+    txt = xml_serialize(peg.Rule(name=rule_name, expr=seq.seq))
     logger.debug(f'XML:: {txt}')
 
-    assert_xml_Element(txt, tag='Rule', name=rn.rule_name)
-    rn.assert_xml_Element(txt)
+    assert_xml_Element(txt, tag='Rule', name=rule_name)
     seq.assert_xml_Element(txt)
 
[e-mail](reason="Will rewrite peg.Rules first --")
[e-mail](reason="Not yet done")
 def test_Rules(xml_serialize):
     r1 = peg.Rule(name='rule_1', expr=peg.Sequence(value=[peg.ID(name='id1')]))
     r2 = peg.Rule(name='rule_2', expr=peg.Sequence(value=[peg.StrTerm(value='str2')]))