Commit: 7156fb339e3311903043a33ebd30c776a742d3a4 - CCastle2 (hg)

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

Commit MetaInfo

• Revision: 7156fb339e3311903043a33ebd30c776a742d3a4 (tree)
• Zeit: 2021-12-23 08:20:52
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

Added ID (rule_name & rule_crossref) to AST/vistor

Ändern Zusammenfassung

• modified: AST/castle/_base.py
• modified: AST/castle/peg.py
• modified: Arpeggio/pytst/d2_ast/__init__.py
• modified: Arpeggio/pytst/d2_ast/test_1_term.py
• modified: Arpeggio/visitor.py

Diff

diff -r bea0d751eb50 -r 7156fb339e33 AST/castle/_base.py
--- a/AST/castle/_base.py	Mon Dec 20 23:48:17 2021 +0100
+++ b/AST/castle/_base.py	Thu Dec 23 00:20:52 2021 +0100
@@ -17,7 +17,7 @@
 
 import re
 
-class ID(str):
+class ID(AST_BASE):
     _pattern = re.compile(r'[A-Za-z_][A-Za-z0-9_]*')
 
     @staticmethod
@@ -27,3 +27,8 @@
         if ID._pattern.fullmatch(value) is None:
             raise IDError("not a valid pattern")
 
+    def __init__(self, *, name, **kwargs):
+        super().__init__(**kwargs)
+        self.validate_or_raise(name)
+        self.name=name
+

diff -r bea0d751eb50 -r 7156fb339e33 AST/castle/peg.py
--- a/AST/castle/peg.py	Mon Dec 20 23:48:17 2021 +0100
+++ b/AST/castle/peg.py	Thu Dec 23 00:20:52 2021 +0100
@@ -1,4 +1,4 @@
-from ._base import AST_BASE, ID
+from ._base import AST_BASE, ID, IDError
 
 class PEG (AST_BASE):                                                   # abstract
     """Base class of all PEG classes"""
@@ -72,7 +72,7 @@
         super().__init__(**kwargs)
         self.value=value
 
-    
+
 class OrderedChoice(Expression):pass
 class Predicate(Expression): pass                                       # abstract
 

diff -r bea0d751eb50 -r 7156fb339e33 Arpeggio/pytst/d2_ast/__init__.py
--- a/Arpeggio/pytst/d2_ast/__init__.py	Mon Dec 20 23:48:17 2021 +0100
+++ b/Arpeggio/pytst/d2_ast/__init__.py	Thu Dec 23 00:20:52 2021 +0100
@@ -0,0 +1,10 @@
+import visitor
+import arpeggio
+
+def parse(txt, rule):
+    parser = arpeggio.ParserPython(rule)
+    pt = parser.parse(txt)
+    assert pt.position_end == len(txt), f"Did not parse all input txt=>>{txt}<<len={len(txt)} ==> parse_tree: >>{pt}<<_end={pt.position_end}"
+    ast = arpeggio.visit_parse_tree(pt, visitor.PegVisitor())
+    assert ast.position == 0 and ast.position_end == len(txt), f"Also the AST (type={type(ast)}) should include all input"
+    return ast

diff -r bea0d751eb50 -r 7156fb339e33 Arpeggio/pytst/d2_ast/test_1_term.py
--- a/Arpeggio/pytst/d2_ast/test_1_term.py	Mon Dec 20 23:48:17 2021 +0100
+++ b/Arpeggio/pytst/d2_ast/test_1_term.py	Thu Dec 23 00:20:52 2021 +0100
@@ -1,20 +1,11 @@
 import pytest
 
 import grammar
-import visitor
-import arpeggio
 
 import sys; sys.path.append("./../AST/") ; sys.path.append("./../../AST/")
 from castle import peg # has the AST clases
 
-
-def parse(txt, rule):
-    parser = arpeggio.ParserPython(rule)
-    pt = parser.parse(txt)
-    assert pt.position_end == len(txt), "Did not parse all input"       # JTBS
-    ast = arpeggio.visit_parse_tree(pt, visitor.PegVisitor())
-    assert ast.position == 0 and ast.position_end == len(txt), "Also the AST should include all input"
-    return ast
+from . import parse
 
 def test_simple_str():
     txt="'a string'"

diff -r bea0d751eb50 -r 7156fb339e33 Arpeggio/visitor.py
--- a/Arpeggio/visitor.py	Mon Dec 20 23:48:17 2021 +0100
+++ b/Arpeggio/visitor.py	Thu Dec 23 00:20:52 2021 +0100
@@ -4,16 +4,25 @@
 from castle import peg # has the AST clases
 
 class PegVisitor(arpeggio.PTNodeVisitor):
+
     def visit_str_term(self, node, children):
         ast = peg.StrTerm(value=node[1], parse_tree=node)
         return ast
     def visit_regex_term(self, node, children):
         ast = peg.RegExpTerm(value=node[1], parse_tree=node)
         return ast
+
+    def visit_rule_name(self, node, children):
+        ast = peg.ID(name=str(node), parse_tree=node)
+        return ast
+    def visit_rule_crossref(self, node, children):
+        ast = peg.ID(name=str(node), parse_tree=node)
+        return ast
+
     def visit_single_expr(self, node, children):                        #  [ rule_crossref, term, group, predicate ] Optional([ '?' , '*' , '+' , '#' ]))
         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")
+        return ast
 
-        return ast