Commit: 614d3d329c7e8456ce094dc8caedec15b973e5ae - CCastle2 (hg)

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

Commit MetaInfo

• Revisão: 614d3d329c7e8456ce094dc8caedec15b973e5ae (tree)
• Hora: 2021-12-11 04:28:40
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Mensagem de Log

Rewriten grammar.py test_3_sequence is replaced by test_3_expressions

Mudança Sumário

• modified: Arpeggio/grammar2.py
• add: Arpeggio/pytst/d1_parse_tree/test_3_expressions.py
• delete: Arpeggio/pytst/d1_parse_tree/test_3_sequence.py

Diff

diff -r db00795b866a -r 614d3d329c7e Arpeggio/grammar2.py
--- a/Arpeggio/grammar2.py	Fri Dec 10 16:18:18 2021 +0100
+++ b/Arpeggio/grammar2.py	Fri Dec 10 20:28:40 2021 +0100
@@ -9,7 +9,6 @@
 def expressions():	return ( OneOrMore(single_expr), Optional( '|' , expressions ) )
 def single_expr():	return ( [ rule_crossref, term, group, predicate ], Optional([ '?' , '*' , '+' , '#' ]))
 
-
 def term():		return [ str_term, regex_term ]
 def group():		return '(', expressions, ')'
 def predicate():	return ['&','!'], single_expr
@@ -23,6 +22,7 @@
                                   (REd3, str_no_d3,   D3),
                                   (REs1, str_no_s1,   S1),
                                   (REd1, str_no_d1,   D1)  ]
+
 def rule_name():	return ID
 def rule_crossref():	return ID
 def ID():        	return _(r"[a-zA-Z_]([a-zA-Z_]|[0-9])*")

diff -r db00795b866a -r 614d3d329c7e Arpeggio/pytst/d1_parse_tree/test_3_expressions.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Arpeggio/pytst/d1_parse_tree/test_3_expressions.py	Fri Dec 10 20:28:40 2021 +0100
@@ -0,0 +1,61 @@
+import pytest
+import grammar
+
+import arpeggio
+
+R, S, X = grammar.regex_term.__name__, grammar.str_term.__name__, grammar.rule_crossref.__name__  # shortcut in grammar
+P = grammar.predicate.__name__
+G = grammar.group.__name__
+
+def parse_expressions(txt, pattern=None):
+    parser = arpeggio.ParserPython(grammar.expressions)
+    parse_tree = parser.parse(txt)
+    print("\nPARSE-TREE\n" + parse_tree.tree_str()+'\n')
+
+    assert parse_tree.position_end == len(txt) , f"Not parsed whole input; Only: >>{txt[parse_tree.position: parse_tree.position_end]}<<; Not: >>{txt[parse_tree.position_end:]}<<."
+    assert parse_tree.rule_name == "expressions"
+
+    if pattern: validate_pattern(parse_tree, pattern=pattern)
+
+    return parse_tree
+
+def validate_pattern(pt, pattern=None):
+    print('VVV', pt, type(pt))
+    assert len(pt) == len(pattern), f"Not correct number-of-element"
+
+    for p, s in zip(pattern, pt): # E <- S* (| E)?
+        if p is None: continue
+        if p == X:
+            assert s[0].rule_name == p
+        elif p in (S,R):
+            assert s[0][0].rule_name == p  # S => T => str/regex
+        elif isinstance(p, tuple):         # Group: '(' ... ')'
+            assert s[0].rule_name == G
+            print("\nVVV:G\n" + s.tree_str())
+            # XXXXX
+            validate_pattern(s[0][1:-1][0], pattern=p) # G=>E=>
+        elif p == P:
+            assert False, "To Do: Predicate"
+        else:
+            assert False, "To Do: More"
+    print('VVV OKE')
+
+
+def test_simple_1():	parse_expressions(r"abc",	pattern=[X])
+def test_simple_2():	parse_expressions(r'A  Bc',	pattern=[X, X])
+
+def test_string_1():	parse_expressions(r"'abc'",	pattern=[S])
+def test_regexp_1():	parse_expressions(r"/re/",	pattern=[R])
+
+def test_mix():		parse_expressions(r'/regex/ "string" crossref crossref',	pattern=[R,S, X, X])
+
+def test_sub():		parse_expressions(r'( A  B )',	pattern=[(X, X)])
+def test_mix_nosub():	parse_expressions(r'/regex/ "string" ( A  B ) crossref',	pattern=[R,S, None, X])
+def test_mix_sub():	parse_expressions(r'/regex/ "string" ( A  B ) crossref',	pattern=[R,S, (X, X), X])
+
+def test_sub_sub():	parse_expressions(r'level0 ( level1_1  (level2a level2b ) level1_2) level0', pattern=[X, (X, (X,X), X), X])
+
+
+
+
+

diff -r db00795b866a -r 614d3d329c7e Arpeggio/pytst/d1_parse_tree/test_3_sequence.py
--- a/Arpeggio/pytst/d1_parse_tree/test_3_sequence.py	Fri Dec 10 16:18:18 2021 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-import pytest
-from grammar import *
-
-import arpeggio
-
-R, S, X = regex_term.__name__, str_term.__name__, rule_crossref.__name__  # shortcut in grammar
-
-def parse_sequence(txt, pattern=None):
-    parser = ParserPython(sequence, comment)
-    tree = parser.parse(txt)
-
-    assert tree.position_end == len(txt) , f"Not parsed whole input; Only: >>{txt[tree.position: tree.position_end]}<<; Not: >>{txt[tree.position_end:]}<<."
-    assert isinstance(tree.rule, arpeggio.ZeroOrMore) and tree.rule_name == "sequence"
-
-    if pattern: validate_pattern(tree,pattern=pattern)
-    return tree
-
-def validate_pattern(tree, pattern=None):
-    assert len(tree) == len(pattern), f"Not correct number-of-element at sublevel={sub}"
-
-    exs=tree.prefix.suffix.expression
-    for ex,p in zip(exs, pattern):
-        if p is not None:
-            if not isinstance(p, (tuple, list)):
-                assert ex[0].rule_name == p, f"{ex} doesn't match given {p} sublevel={sub}"
-            else:
-                validate_pattern(tree=ex[1][0], pattern=p)
-
-
-
-def test_simple_1():	parse_sequence(r"abc",		pattern=[X])
-def test_simple_2():	parse_sequence(r'A  Bc',	pattern=[X, X])
-def test_mix():		parse_sequence(r'/regex/ "string" crossref crossref',	pattern=[R,S, X, X])
-
-def test_sub():		parse_sequence(r'( A  B )',	pattern=[(X, X)])
-def test_mix_nosub():	parse_sequence(r'/regex/ "string" ( A  B ) crossref',	pattern=[R,S, None, X])
-def test_mix_sub():	parse_sequence(r'/regex/ "string" ( A  B ) crossref',	pattern=[R,S, (X, X), X])
-
-def test_sub_sub():	parse_sequence(r'level0 ( level1_1  (level2a level2b ) level1_2) level0', pattern=[X, (X, (X,X), X), X])
-def test_sub_sub2():	parse_sequence(r'level0 ( level1_1  (level2a level2b ) level1_2) level0', pattern=[X, [X, [X,X], X], X])
-
-
-
-