Commit: 937f62a25c9654fa389ade623863ae6d59fd0f04 - CCastle2 (hg)

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

Commit MetaInfo

• Revision: 937f62a25c9654fa389ade623863ae6d59fd0f04 (tree)
• Zeit: 2022-02-16 06:51:05
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

Merged: Sequence is now a list/tuple of children; ._value is gone

Ändern Zusammenfassung

• modified: Makefile
• modified: castle/ast/ast2xml.py
• modified: castle/ast/peg.py
• modified: castle/readers/parser/visitor.py
• modified: pytst/ast/XML_serialization/__init__.py
• modified: pytst/ast/XML_serialization/test_1_simpleXML.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

Diff

diff -r 002223ee76a7 -r 937f62a25c96 Makefile
--- a/Makefile	Mon Feb 14 22:38:45 2022 +0100
+++ b/Makefile	Tue Feb 15 22:51:05 2022 +0100
@@ -16,10 +16,10 @@
 
 python-demo:
 	@echo Running all 'dem*.py' python-files
-	for d in `find demos -type f -iname \*.py `; do echo "=== $$d ==="; python $$d; echo "=========="; done
+	export PYTHONPATH=`pwd`; for d in `find demos -type f -iname \*.py `; do echo "=== $$d ==="; python $$d; echo "=========="; done
 
 pytest-demo:
-	pytest -s demos
+	PYTHONPATH=`pwd` pytest -s demos
 
 
 missing_visitor: castle/readers/parser/grammar.py

diff -r 002223ee76a7 -r 937f62a25c96 castle/ast/ast2xml.py
--- a/castle/ast/ast2xml.py	Mon Feb 14 22:38:45 2022 +0100
+++ b/castle/ast/ast2xml.py	Tue Feb 15 22:51:05 2022 +0100
@@ -57,9 +57,9 @@
     def RegExpTerm2xml(self, ast, parent):  self._MixIn_value_attribute2xml(ast, parent, 'RegExpTerm')
 
     def Sequence2xml(self, ast, parent) ->None:
-        logger.debug(f"Sequence2xml::ast={ast._valType(ast.value)}")
+        logger.debug(f"Sequence2xml::ast={ast._valType(ast._children)}")
         seq = ET.SubElement(parent, 'Sequence')
-        for elm in ast.value:
+        for elm in ast:
             self._ast2xml(elm, parent=seq)
 
     def Rule2xml(self, ast, parent) ->None:

diff -r 002223ee76a7 -r 937f62a25c96 castle/ast/peg.py
--- a/castle/ast/peg.py	Mon Feb 14 22:38:45 2022 +0100
+++ b/castle/ast/peg.py	Tue Feb 15 22:51:05 2022 +0100
@@ -44,13 +44,13 @@
         logger.debug(f'{self._typeName(self)}.MixIn_children_tuple:: children[{len(children)}]:=' +
                      ('[[' +', '.join(f'{c}:{type(c).__name__}' for c in children) + ']]') if isinstance(children, list) else f's>>{children}<<')
         super().__init__(**kwargs)
-        self._childeren = tuple(children)
+        self._children = tuple(children)
 
     def __len__(self):
-        return len(self._childeren)
+        return len(self._children)
     def __getitem__(self, key):
-        return self._childeren[key]
-    def __iter__(self): return self._childeren.__iter__()
+        return self._children[key]
+    def __iter__(self): return self._children.__iter__()
 
 
 ##
@@ -125,21 +125,20 @@
     """An expression with Quantification; like optional, or repetition. The subclasses defines which Quantification"""
 
 
-class Sequence(MixIn_value_attribute, Expression):
-    """A _list_ of expressions; can be of length=1"""
-    # __init__ (see MixIn) sets self._value; assuming it is a list
-
-    def __len__(self):       	return len(self._value)
-    def __getitem__(self, n):	return self._value[n]
+#class Sequence(MixIn_value_attribute, Expression):
+class Sequence(MixIn_children_tuple, Expression):
+    """A sequence of expressions; can be of length=1"""
+    # __init__ (see MixIn) sets self._children; assuming it is a list
 
     def __str__(self): # mostly for debugging
-        return "Seq{{" + " ; ".join(f"{c}" for c in self._value) + "}}" # XXX ToDo: _value -> children
+        return "Seq{{" + " ; ".join(f"{c}" for c in self) + "}}"
+
 
 class OrderedChoice(MixIn_children_tuple, Expression):                  # A | B | C | ...  the order is relevant
     """OC: A _tuple_ of alternative expressions"""
 
     def __str__(self): # mostly for debugging
-        return "OC{{" + " | ".join(f"{c}" for c in self._childeren) + "}}"
+        return "OC{{" + " | ".join(f"{c}" for c in self._children) + "}}"
 
 class Optional(Quantity):pass
 class ZeroOrMore(Quantity):pass

diff -r 002223ee76a7 -r 937f62a25c96 castle/readers/parser/visitor.py
--- a/castle/readers/parser/visitor.py	Mon Feb 14 22:38:45 2022 +0100
+++ b/castle/readers/parser/visitor.py	Tue Feb 15 22:51:05 2022 +0100
@@ -91,7 +91,7 @@
     # OneOrMore(single_expr)
     def visit_sequence(self, node, children) -> peg.Sequence:
         logger.debug(f'visit_sequence::{self._logstr_node_children(node, children)}')
-        return peg.Sequence(value=children, parse_tree=node)
+        return peg.Sequence(children=children, parse_tree=node)
 
 
     def visit_predicate(self, node, children):

diff -r 002223ee76a7 -r 937f62a25c96 pytst/ast/XML_serialization/__init__.py
--- a/pytst/ast/XML_serialization/__init__.py	Mon Feb 14 22:38:45 2022 +0100
+++ b/pytst/ast/XML_serialization/__init__.py	Tue Feb 15 22:51:05 2022 +0100
@@ -12,7 +12,7 @@
         e1 = peg.ID(name=self.n1)
         e2 = peg.StrTerm(value=self.v2)
         e3 = peg.RegExpTerm(value=self.v3)
-        self.seq = peg.Sequence(value=[e1, e2, e3])
+        self.seq = peg.Sequence(children=[e1, e2, e3])
     def assert_xml_Element(self, txt):
         assert_xml_Element(txt, tag='.//Sequence')
         assert_xml_Element(txt, tag='.//ID', name=self.n1)

diff -r 002223ee76a7 -r 937f62a25c96 pytst/ast/XML_serialization/test_1_simpleXML.py
--- a/pytst/ast/XML_serialization/test_1_simpleXML.py	Mon Feb 14 22:38:45 2022 +0100
+++ b/pytst/ast/XML_serialization/test_1_simpleXML.py	Tue Feb 15 22:51:05 2022 +0100
@@ -30,7 +30,7 @@
 
 def test_Sequence_1(xml_serialize):
     e1 = peg.ID(name='ID_1')
-    txt= xml_serialize(peg.Sequence(value=[e1]))
+    txt= xml_serialize(peg.Sequence(children=[e1]))
     logger.debug(f'XML:: {txt}')
     assert_xml_Element(txt, tag='Sequence')
     assert_xml_Element(txt, tag='.//ID', name='ID_1')
@@ -48,7 +48,7 @@
 def test_Rule_1ID(xml_serialize):
     rule_name = "RuleName"
     xref = "cross_ref"
-    expr = peg.Sequence(value=[peg.ID(name=xref)])
+    expr = peg.Sequence(children=[peg.ID(name=xref)])
 
     txt = xml_serialize(peg.Rule(name=peg.ID(name=rule_name), expr=expr))
     logger.debug(f'XML:: {txt}')
@@ -69,8 +69,8 @@
 
 
 def test_Rules(xml_serialize):
-    r1 = peg.Rule(name=peg.ID(name='rule_1'), expr=peg.Sequence(value=[peg.ID(name='id1')]))
-    r2 = peg.Rule(name=peg.ID(name='rule_2'), expr=peg.Sequence(value=[peg.StrTerm(value='str2')]))
+    r1 = peg.Rule(name=peg.ID(name='rule_1'), expr=peg.Sequence(children=[peg.ID(name='id1')]))
+    r2 = peg.Rule(name=peg.ID(name='rule_2'), expr=peg.Sequence(children=[peg.StrTerm(value='str2')]))
 
     txt = xml_serialize(peg.Rules(children=[r1,r2]))
     logger.debug(f'XML:: {txt}')

diff -r 002223ee76a7 -r 937f62a25c96 pytst/readers/parser/d2_ast/__init__.py
--- a/pytst/readers/parser/d2_ast/__init__.py	Mon Feb 14 22:38:45 2022 +0100
+++ b/pytst/readers/parser/d2_ast/__init__.py	Tue Feb 15 22:51:05 2022 +0100
@@ -35,7 +35,7 @@
 
 def assert_Seq(ast, length=None, ids=None):
     assert isinstance(ast, peg.Sequence)
-    assert isinstance(ast, peg.Expression),	"A sequence is aslo an Expression()"
+    assert isinstance(ast, peg.Expression),	"A sequence is also an Expression()"
     if length:
         assert len(ast) == length,  		f" ... of specified length=={length}"
     if ids:

diff -r 002223ee76a7 -r 937f62a25c96 pytst/readers/parser/d2_ast/test_1_term.py
--- a/pytst/readers/parser/d2_ast/test_1_term.py	Mon Feb 14 22:38:45 2022 +0100
+++ b/pytst/readers/parser/d2_ast/test_1_term.py	Tue Feb 15 22:51:05 2022 +0100
@@ -55,5 +55,5 @@
     ast = parse(txt, grammar.expression)
     # result is same a above
     assert isinstance(ast, peg.Expression),	"A (str)term is also an Expression"
-    assert len(ast.value) == 1,			"An expression with length==1"
-    assert ast.value[0].value == txt[1:-1], 	"It's correct value should be without quotes"
+    assert len(ast) == 1,			"with a lengt of 1 -- note: use: ``len(sequence)`` not ``len(sequence._children)``!!"
+    assert ast[0].value == txt[1:-1], 	        "It's correct value should be without quotes"

diff -r 002223ee76a7 -r 937f62a25c96 pytst/readers/parser/d2_ast/test_2_ID.py
--- a/pytst/readers/parser/d2_ast/test_2_ID.py	Mon Feb 14 22:38:45 2022 +0100
+++ b/pytst/readers/parser/d2_ast/test_2_ID.py	Tue Feb 15 22:51:05 2022 +0100
@@ -29,5 +29,5 @@
     ast = parse(txt, grammar.expression)
 
     assert isinstance(ast, peg.Expression),	"A crossref is also an Expression"
-    assert len(ast.value) == 1,			"An expression with length==1"
-    assert_ID(ast.value[0], name=txt, err_message= "The name of the (ID of the) Expression-value is still the same")
+    assert len(ast) == 1,			"An expression with length==1"
+    assert_ID(ast[0], name=txt, err_message= "The name of the (ID of the) Expression-value is still the same")

diff -r 002223ee76a7 -r 937f62a25c96 pytst/readers/parser/d2_ast/test_3_Seq.py
--- a/pytst/readers/parser/d2_ast/test_3_Seq.py	Mon Feb 14 22:38:45 2022 +0100
+++ b/pytst/readers/parser/d2_ast/test_3_Seq.py	Tue Feb 15 22:51:05 2022 +0100
@@ -25,16 +25,14 @@
 def test_seq_of_two_as_expression():
     txt = "A B"
     ast = parse(txt, grammar.expression)
+    logger.debug(f'seq2expr:: ast={ast}:{type(ast).__name__}')
+    assert_Seq(ast, length=2, ids=('A', 'B'))
 
-    assert_Seq(ast, 2, ids=('A', 'B'))
-    assert isinstance(ast.value, list),		"It will be an `arpeggio.SemanticActionResult` which is a subclass of list"
 
 def test_seq_of_three_as_expression():
     txt = "A B C"
     ast = parse(txt, grammar.expression)
-
-    assert_Seq(ast, 3, ids=('A', 'B', 'C'))
-    assert isinstance(ast.value, list),		"It will be an `arpeggio.SemanticActionResult` which is a subclass of list"
+    assert_Seq(ast, length=3, ids=('A', 'B', 'C'))
 
 
 def test_seq_of_three_with_quantification():