Commit: bdf28f2a5e322c51758d4cd2a1439e3f82b1f7d0 - CCastle2 (hg)

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

Commit MetaInfo

• Revision: bdf28f2a5e322c51758d4cd2a1439e3f82b1f7d0 (tree)
• Zeit: 2021-11-28 08:06:06
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

UNDO show_dot and show parms -- useless

Ändern Zusammenfassung

• modified: Arpeggio/pytst/test_1_regexp.py
• modified: Arpeggio/pytst/test_2_str.py
• modified: Arpeggio/pytst/test_3_sequence.py
• modified: Arpeggio/pytst/test_4_rule.py
• modified: Arpeggio/pytst/test_9_grammar.py

Diff

diff -r 060e5b95a7c9 -r bdf28f2a5e32 Arpeggio/pytst/test_1_regexp.py
--- a/Arpeggio/pytst/test_1_regexp.py	Sat Nov 27 23:44:11 2021 +0100
+++ b/Arpeggio/pytst/test_1_regexp.py	Sun Nov 28 00:06:06 2021 +0100
@@ -4,11 +4,9 @@
 import arpeggio
 RE, S = arpeggio.RegExMatch, arpeggio.StrMatch                          # shortcut
 
-show_dot=True
-
 def parse_regex(txt, pattern=None):
     #print(f'\nXXX >>{txt}<<')
-    parser = ParserPython(regex_term, comment, debug=show_dot)
+    parser = ParserPython(regex_term, comment) # DoNot use debug/dot_exporter as it will re-use-same-file
     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:]}<<."
 

diff -r 060e5b95a7c9 -r bdf28f2a5e32 Arpeggio/pytst/test_2_str.py
--- a/Arpeggio/pytst/test_2_str.py	Sat Nov 27 23:44:11 2021 +0100
+++ b/Arpeggio/pytst/test_2_str.py	Sun Nov 28 00:06:06 2021 +0100
@@ -4,11 +4,10 @@
 import arpeggio
 RE, S = arpeggio.RegExMatch, arpeggio.StrMatch                          # shortcut
 
-show_dot=True
 
 def parse_str(str, pattern=[S, RE, S]):
     #print(f'\nXXX >>{str}<<')
-    parser = ParserPython(str_term, comment, debug=show_dot)
+    parser = ParserPython(str_term, comment)
     tree = parser.parse(str)
     assert tree.position_end == len(str) , f"Not parsed whole input; Only: >>{str[tree.position: tree.position_end]}<<; Not: >>{str[tree.position_end:]}<<."
 

diff -r 060e5b95a7c9 -r bdf28f2a5e32 Arpeggio/pytst/test_3_sequence.py
--- a/Arpeggio/pytst/test_3_sequence.py	Sat Nov 27 23:44:11 2021 +0100
+++ b/Arpeggio/pytst/test_3_sequence.py	Sun Nov 28 00:06:06 2021 +0100
@@ -5,31 +5,26 @@
 
 R, S, X = regex_term.__name__, str_term.__name__, rule_crossref.__name__  # shortcut in grammar
 
-show_dot=True
-def parse_sequence(txt, pattern=None, show=False):
-    parser = ParserPython(sequence, comment, debug=show_dot)
+def parse_sequence(txt, pattern=None):
+    parser = ParserPython(sequence, comment)
     tree = parser.parse(txt)
-    if show : print(f'\nPARSE_SEQEUENCE >>{txt}<<\n{tree.tree_str()}')
 
     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, show=show)
+    if pattern: validate_pattern(tree,pattern=pattern)
     return tree
 
-def validate_pattern(tree, pattern=None, sub=0, show=False):
-    if show: print(f'\nVALIDATE_PATTERN pattern={pattern} sublevel={sub}\n{tree.tree_str()}')
+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
-    #if show: print("EXS", type(exs), "\n"+exs.tree_str())
     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:
-                #print('XXX1\n', ex[1][0].tree_str())
-                validate_pattern(tree=ex[1][0], pattern=p, sub=sub+1, show=show)
+                validate_pattern(tree=ex[1][0], pattern=p)
 
 
 

diff -r 060e5b95a7c9 -r bdf28f2a5e32 Arpeggio/pytst/test_4_rule.py
--- a/Arpeggio/pytst/test_4_rule.py	Sat Nov 27 23:44:11 2021 +0100
+++ b/Arpeggio/pytst/test_4_rule.py	Sun Nov 28 00:06:06 2021 +0100
@@ -4,10 +4,8 @@
 import arpeggio
 RE, S = arpeggio.RegExMatch, arpeggio.StrMatch                          # shortcut
 
-show_dot=False
-
 def parse_rule(txt, pattern=None):
-    parser = ParserPython(rule, comment, debug=show_dot)
+    parser = ParserPython(rule, 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:]}<<."
     print(f'\nTREE\n{tree.tree_str()}')

diff -r 060e5b95a7c9 -r bdf28f2a5e32 Arpeggio/pytst/test_9_grammar.py
--- a/Arpeggio/pytst/test_9_grammar.py	Sat Nov 27 23:44:11 2021 +0100
+++ b/Arpeggio/pytst/test_9_grammar.py	Sun Nov 28 00:06:06 2021 +0100
@@ -2,13 +2,12 @@
 
 from grammar import *
 
-show_dot=True
 
 def parse_file(filename):                                               # Assume we run in '.../pytst/.'
     with open(filename) as f:
         txt = f.read()
 
-    parser = ParserPython(peg_grammar, comment, debug=show_dot)
+    parser = ParserPython(peg_grammar, comment)
     tree = parser.parse(txt)
 
     assert tree.position_end == len(txt) , f"Not parsed whole input; Only: >>{regex[tree.position: tree.position_end]}<<; Not: >>{regex[tree.position_end:]}<<."