Commit: 033e1be89b60d1188a6bb7626202094a6470fc36 - CCastle2 (hg)

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

Commit MetaInfo

• Révision: 033e1be89b60d1188a6bb7626202094a6470fc36 (tree)
• l'heure: 2021-12-24 06:52:42
• Auteur: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Message de Log

Trival 'rule' (two IDs) now works

Change Summary

• modified: AST/castle/_base.py
• modified: AST/castle/peg.py
• modified: Arpeggio/pytst/d2_ast/test_2_ID.py
• modified: Arpeggio/visitor.py
• add: Arpeggio/pytst/d2_ast/test_3_rule.py

Modification

diff -r dd3f259f732d -r 033e1be89b60 AST/castle/_base.py
--- a/AST/castle/_base.py	Thu Dec 23 00:21:18 2021 +0100
+++ b/AST/castle/_base.py	Thu Dec 23 22:52:42 2021 +0100
@@ -22,8 +22,9 @@
 
     @staticmethod
     def validate_or_raise(value):
-        if not isinstance(value, (ID, str)):
-            raise IDError("not a str of ID")
+        if isinstance(value, ID): return
+        if not isinstance(value, str):
+            raise IDError("not a str (or an ID)")
         if ID._pattern.fullmatch(value) is None:
             raise IDError("not a valid pattern")
 

diff -r dd3f259f732d -r 033e1be89b60 AST/castle/peg.py
--- a/AST/castle/peg.py	Thu Dec 23 00:21:18 2021 +0100
+++ b/AST/castle/peg.py	Thu Dec 23 22:52:42 2021 +0100
@@ -51,7 +51,6 @@
         self.expr = expr
 
 
-
 class Grammar(NonTerminal):
     def __init__(self, *,
                  rules: list[Rule]=None,
@@ -71,6 +70,10 @@
     def __init__(self, *, value=None, **kwargs):
         super().__init__(**kwargs)
         self.value=value
+    def __len__(self):
+        return len(self.value)
+    def __getitem__(self, n):
+        return self.value[n]
 
 
 class OrderedChoice(Expression):pass

diff -r dd3f259f732d -r 033e1be89b60 Arpeggio/pytst/d2_ast/test_2_ID.py
--- a/Arpeggio/pytst/d2_ast/test_2_ID.py	Thu Dec 23 00:21:18 2021 +0100
+++ b/Arpeggio/pytst/d2_ast/test_2_ID.py	Thu Dec 23 22:52:42 2021 +0100
@@ -16,8 +16,23 @@
 
 def test_rule_crossref():
     """The rule's expressions can also refer an ID"""
-    txt="aName"
+    txt="aRef"
     ast = parse(txt, grammar.rule_crossref)
     assert isinstance(ast, peg.ID), "It should be an ID"
     assert ast.name == txt
 
+
+def test_ID_as_single_expr():
+    txt="aRef"
+    ast = parse(txt, grammar.single_expr)
+    assert isinstance(ast, peg.Expression),	"A crossref is also an Expression"
+    assert len(ast.value) == 1,			"An expression with length==1"
+    assert ast.value[0].name == txt, 		"The name of the (ID of the) Expression-value is still the same"
+
+def test_ID_as_expressions():
+    txt="aRef"
+    ast = parse(txt, grammar.expressions)
+    assert isinstance(ast, peg.Expression),	"A crossref is also an Expression"
+    assert len(ast.value) == 1,			"An expression with length==1"
+    assert ast.value[0].name == txt, 		"The name of the (ID of the) Expression-value is still the same"
+

diff -r dd3f259f732d -r 033e1be89b60 Arpeggio/pytst/d2_ast/test_3_rule.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Arpeggio/pytst/d2_ast/test_3_rule.py	Thu Dec 23 22:52:42 2021 +0100
@@ -0,0 +1,22 @@
+import pytest
+
+import grammar
+
+import sys; sys.path.append("./../AST/") ; sys.path.append("./../../AST/")
+from castle import peg # has the AST clases
+
+from . import parse
+
+def test_trivial_rule_with_2IDS():
+    """The most simple rule has only two IDs"""
+    txt="trivial <- cross ;"
+    ast = parse(txt, grammar.rule)
+    assert isinstance(ast, peg.Rule), "It should be an ID"
+
+    name, expr  = ast.name, ast.expr;
+    assert isinstance(name, peg.ID)
+    assert isinstance(expr, peg.Expression), 	"The expression is an Expression ..."
+    assert isinstance(expr, peg.Sequence),	" .. and a Sequence .."
+    assert len(expr) ==1, 			" .. of length==1"
+    assert name.name == txt.split()[0], 	"the name of the (ID of ) rule is the first ID"
+    assert expr[0].name == txt.split()[2], 	"The single element of the expression is the 2nnd ID, which name os the 3 part of the txt"

diff -r dd3f259f732d -r 033e1be89b60 Arpeggio/visitor.py
--- a/Arpeggio/visitor.py	Thu Dec 23 00:21:18 2021 +0100
+++ b/Arpeggio/visitor.py	Thu Dec 23 22:52:42 2021 +0100
@@ -23,6 +23,9 @@
         if len(children) == 1: # No optional part
             ast = peg.Sequence(value=children, parse_tree=node)
         else:
-            assert NotImplementedError("To Do: visit_single_expr with optional part")
+            assert NotImplementedError("To Do: visit_single_expr with optional part")  # XXX
         return ast
 
+    def visit_rule(self, node, children):                               #  Name '<-' expressions ';'
+        ast = peg.Rule(name=children[0],expr=children[1], parse_tree=node)
+        return ast