Commit: 505c823ca2b935a5b3af3d55657559284e90e0ad - CCastle2 (hg)

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

Commit MetaInfo

• Révision: 505c823ca2b935a5b3af3d55657559284e90e0ad (tree)
• l'heure: 2022-02-13 07:54:03
• Auteur: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Message de Log

Added basic support for 'Settings' in grammar.py -- TESTS are needed

Change Summary

• modified: castle/readers/parser/grammar.py
• modified: castle/readers/parser/visitor.py
• modified: pytst/readers/parser/d1_parse_tree/test_4_rule.py
• modified: pytst/readers/parser/d2_ast/__init__.py
• modified: pytst/readers/parser/d2_ast/test_3_rule.py
• modified: pytst/readers/parser/d2_ast/test_4_quantity.py
• modified: pytst/readers/parser/d2_ast/test_5_group.py
• modified: pytst/readers/parser/d2_ast/test_6_predicate.py
• modified: pytst/readers/parser/d2_ast/test_7_rules.py

Modification

diff -r 038633259101 -r 505c823ca2b9 castle/readers/parser/grammar.py
--- a/castle/readers/parser/grammar.py	Sat Feb 12 22:46:33 2022 +0100
+++ b/castle/readers/parser/grammar.py	Sat Feb 12 23:54:03 2022 +0100
@@ -2,9 +2,10 @@
 from arpeggio import RegExMatch as _
 from arpeggio import ParserPython
 
+
 def peg_grammar(): 	return rules, EOF
-def rules(): 		return OneOrMore(rule)
-def rule():		return rule_name, '<-', expression, ";"
+def rules(): 		return OneOrMore([parse_rule, setting])
+def parse_rule():	return rule_name, '<-', expression, ";"
 
 def expression():	return sequence, op_alternative
 def sequence():		return OneOrMore(single_expr)
@@ -42,9 +43,9 @@
 def value():            return [ str_term, regex_term, number, setting_xref ]
 def number():		return [ complex_lit, float_lit, int_lit ]
 def setting_xref():	return ID
-def complex_lit():	return _("([0-9](*\.[0-9]*)?)[+-][iIjJ]([0-9](*\.[0-9]*)?)")
-def float_lit():	return _("[0-9]*\.[0-9]+")
-def int_lit():		return _("[1-9][0-9]*")
+def complex_lit():	return _(r"([0-9](\.[0-9]*)?)[+-][iIjJ]([0-9](\.[0-9]*)?)")
+def float_lit():	return _(r"[0-9]\.[0-9]+")
+def int_lit():		return _(r"[1-9][0-9]*")
 
 
 S1 = "'"

diff -r 038633259101 -r 505c823ca2b9 castle/readers/parser/visitor.py
--- a/castle/readers/parser/visitor.py	Sat Feb 12 22:46:33 2022 +0100
+++ b/castle/readers/parser/visitor.py	Sat Feb 12 23:54:03 2022 +0100
@@ -37,7 +37,7 @@
     def visit_rule_crossref(self, node, children):
         return peg.ID(name=str(node), parse_tree=node)
 
-    def visit_rule(self, node, children):                               #  Name '<-' expression ';'
+    def visit_parse_rule(self, node, children):                               #  Name '<-' expression ';'
         return peg.Rule(name=children[0],expr=children[1], parse_tree=node)
 
 

diff -r 038633259101 -r 505c823ca2b9 pytst/readers/parser/d1_parse_tree/test_4_rule.py
--- a/pytst/readers/parser/d1_parse_tree/test_4_rule.py	Sat Feb 12 22:46:33 2022 +0100
+++ b/pytst/readers/parser/d1_parse_tree/test_4_rule.py	Sat Feb 12 23:54:03 2022 +0100
@@ -7,7 +7,7 @@
 RE, S = arpeggio.RegExMatch, arpeggio.StrMatch                          # shortcut
 
 def parse_rule(txt, pattern=None):
-    parser = arpeggio.ParserPython(grammar.rule)
+    parser = arpeggio.ParserPython(grammar.parse_rule)
     tree = parser.parse(txt)
     logger.debug(f'\nTREE\n{tree.tree_str()}')
 

diff -r 038633259101 -r 505c823ca2b9 pytst/readers/parser/d2_ast/__init__.py
--- a/pytst/readers/parser/d2_ast/__init__.py	Sat Feb 12 22:46:33 2022 +0100
+++ b/pytst/readers/parser/d2_ast/__init__.py	Sat Feb 12 23:54:03 2022 +0100
@@ -1,22 +1,23 @@
-##import visitor
-from castle.readers.parser import visitor
+import logging; logger = logging.getLogger(__name__)
+
 import arpeggio
 
+from castle.readers.parser import visitor
 from castle.readers.parser import grammar
 from castle.ast import peg
 
 def parse(txt, rule, *,
           with_comments=False,
-          print_tree_debug=False,
           visitor_debug=False):
 
     parser = arpeggio.ParserPython(rule, comment_def = grammar.comment if with_comments else None)
     pt = parser.parse(txt)
+    logger.debug('PARSE_TREE\n'+pt.tree_str())
 
-    if print_tree_debug:
-        print('\n'+pt.tree_str())
     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(debug=visitor_debug))
+    logger.debug('AST\n' + f'{ast}:{type(ast).__name__}')
+
     if with_comments: #   When the txt starts with comments, the AST does start 'after' that comment -- so skip the start-check
         assert ast.position_end == len(txt), f"The AST (type={type(ast)}) does not include (start) comments; however typically the end_position ({ast.position_end}) is the end of the text ({len(txt)}"
     else:

diff -r 038633259101 -r 505c823ca2b9 pytst/readers/parser/d2_ast/test_3_rule.py
--- a/pytst/readers/parser/d2_ast/test_3_rule.py	Sat Feb 12 22:46:33 2022 +0100
+++ b/pytst/readers/parser/d2_ast/test_3_rule.py	Sat Feb 12 23:54:03 2022 +0100
@@ -11,7 +11,7 @@
     """The most simple rule has only two IDs"""
 
     txt="trivial <- cross ;"
-    ast = parse(txt, grammar.rule)
+    ast = parse(txt, grammar.parse_rule)
 
     assert_Rule(ast, rune_name=txt.split()[0])                # The name of a rule is a ID with the left-side ID as name
 
@@ -22,7 +22,7 @@
 
 def test_rule_with_ID_and_terms():
     txt = """aRule <- 'aStr' aCross /regexp/ ;"""
-    ast = parse(txt, grammar.rule)
+    ast = parse(txt, grammar.parse_rule)
 
     assert_Rule(ast, rune_name=txt.split()[0])
 

diff -r 038633259101 -r 505c823ca2b9 pytst/readers/parser/d2_ast/test_4_quantity.py
--- a/pytst/readers/parser/d2_ast/test_4_quantity.py	Sat Feb 12 22:46:33 2022 +0100
+++ b/pytst/readers/parser/d2_ast/test_4_quantity.py	Sat Feb 12 23:54:03 2022 +0100
@@ -11,7 +11,7 @@
 def assert_Quantification(token:str, kind:type(peg.Quantity)):
     txt = f"R <- X {token} ;"
 
-    ast = parse(txt, grammar.rule)
+    ast = parse(txt, grammar.parse_rule)
     assert_ID(ast.name, 'R')
 
     expr = ast.expr

diff -r 038633259101 -r 505c823ca2b9 pytst/readers/parser/d2_ast/test_5_group.py
--- a/pytst/readers/parser/d2_ast/test_5_group.py	Sat Feb 12 22:46:33 2022 +0100
+++ b/pytst/readers/parser/d2_ast/test_5_group.py	Sat Feb 12 23:54:03 2022 +0100
@@ -17,7 +17,7 @@
 def test_simple_group():
     txt = "R <- ( A B ) ;"
 
-    ast = parse(txt, grammar.rule)
+    ast = parse(txt, grammar.parse_rule)
     precondition_Rule(ast, 'R')
 
     grp = ast.expr
@@ -27,7 +27,7 @@
 def test_nested_group():
     txt = "R <- ( (  A B ) ) ;"
 
-    ast = parse(txt, grammar.rule)
+    ast = parse(txt, grammar.parse_rule)
     precondition_Rule(ast, 'R')
 
     grp = ast.expr
@@ -40,7 +40,7 @@
 def test_unordered_group():
     txt = "R <- ( A B )# ;"
 
-    ast = parse(txt, grammar.rule)
+    ast = parse(txt, grammar.parse_rule)
     precondition_Rule(ast, 'R')
 
     grp = ast.expr

diff -r 038633259101 -r 505c823ca2b9 pytst/readers/parser/d2_ast/test_6_predicate.py
--- a/pytst/readers/parser/d2_ast/test_6_predicate.py	Sat Feb 12 22:46:33 2022 +0100
+++ b/pytst/readers/parser/d2_ast/test_6_predicate.py	Sat Feb 12 23:54:03 2022 +0100
@@ -7,7 +7,7 @@
 from . import parse, assert_ID, precondition_ID, precondition_Expressions
 
 def simple_ID_Predicate_ID(txt, predicateType, rule_name='R', id0='A', predicateID='B', id2='C'):
-    ast = parse(txt, grammar.rule)
+    ast = parse(txt, grammar.parse_rule)
     precondition_ID(ast.name, rule_name)
 
     expr = ast.expr

diff -r 038633259101 -r 505c823ca2b9 pytst/readers/parser/d2_ast/test_7_rules.py
--- a/pytst/readers/parser/d2_ast/test_7_rules.py	Sat Feb 12 22:46:33 2022 +0100
+++ b/pytst/readers/parser/d2_ast/test_7_rules.py	Sat Feb 12 23:54:03 2022 +0100
@@ -9,7 +9,7 @@
 def test_some_rules():
     txt="""R1 <- A;
            R2 <- B;"""
-    ast = parse(txt, grammar.rules, print_tree_debug=False, visitor_debug=False)
+    ast = parse(txt, grammar.rules, visitor_debug=False)
 
     assert isinstance(ast, peg.Rules)
     assert len(ast) == 2, "We expect the same number as Rules as lines"