提交: 96da5581ccbe5bd47c30d3a31f55fc4be50cb71c - CCastle2 (hg)

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

Commit MetaInfo

• 修訂: 96da5581ccbe5bd47c30d3a31f55fc4be50cb71c (tree)
• 時間: 2022-01-03 07:43:33
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

groups (normal ones) do work

Change Summary

• modified: AST/castle/peg.py
• modified: Arpeggio/visitor.py
• add: Arpeggio/pytst/d2_ast/test_5_group.py

差異

diff -r f0bc39d34f56 -r 96da5581ccbe AST/castle/peg.py
--- a/AST/castle/peg.py	Sun Jan 02 21:43:48 2022 +0100
+++ b/AST/castle/peg.py	Sun Jan 02 23:43:33 2022 +0100
@@ -61,7 +61,7 @@
         self.settings = settings
 
 
-class Group(Expression):pass                                            # abstract
+class Group(Expression):pass                                            # abstract --  Do not use for a '(' ...')' group, that's a Sequence!!
 class UnorderedGroup(Group):pass                                        # It looks like a Quantity, but is a group
 
 

diff -r f0bc39d34f56 -r 96da5581ccbe Arpeggio/pytst/d2_ast/test_5_group.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Arpeggio/pytst/d2_ast/test_5_group.py	Sun Jan 02 23:43:33 2022 +0100
@@ -0,0 +1,38 @@
+import pytest
+import logging;logger = logging.getLogger(__name__)
+
+import grammar
+from castle import peg # has the AST classes
+
+from . import parse, assert_ID
+
+def test_simple_group():
+    txt = "R <- ( A B ) ;"
+
+    ast = parse(txt, grammar.rule)
+    assert_ID(ast.name, 'R')
+
+    grp = ast.expr
+    assert len(grp)==1,			"There should be only one expr; the group"
+    assert isinstance(grp[0], peg.Sequence)
+
+    assert_ID(grp[0][0], 'A')
+    assert_ID(grp[0][1], 'B')
+
+def test_nested_group():
+    txt = "R <- ( (  A B ) ) ;"
+
+    ast = parse(txt, grammar.rule)
+    assert_ID(ast.name, 'R')
+
+    grp = ast.expr
+    assert len(grp)==1, "There should be only one expr; the group"
+    assert isinstance(grp[0], peg.Sequence)
+
+    ngrp = grp[0]
+    assert len(ngrp)==1
+    assert isinstance(ngrp[0], peg.Sequence)
+
+    assert_ID(ngrp[0][0], 'A')
+    assert_ID(ngrp[0][1], 'B')
+

diff -r f0bc39d34f56 -r 96da5581ccbe Arpeggio/visitor.py
--- a/Arpeggio/visitor.py	Sun Jan 02 21:43:48 2022 +0100
+++ b/Arpeggio/visitor.py	Sun Jan 02 23:43:33 2022 +0100
@@ -34,7 +34,7 @@
                 n = children[0].name
             except AttributeError:
                 n = str(children[0])
-            logger.warning(f'visit_single_expr==1:: {n}:{type(children[0])}')
+            logger.debug(f'visit_single_expr==1:: {n}:{type(children[0])}')
             return children[0]
         elif len(children) == 2: #  Optional part
             logger.debug(f'visit_single_expr==2:: {children[0]}, {children[1]}')