提交: dc50c83a774264d3692760f7b6ba24591ff6b160 - CCastle2 (hg)

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

Commit MetaInfo

• 修訂: dc50c83a774264d3692760f7b6ba24591ff6b160 (tree)
• 時間: 2021-12-10 23:53:35
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

Rewriten grammar.py (old: ~1, new~2; symlink to select, for NOW. Need t rewrite test

Change Summary

• modified: Arpeggio/pytst/d1_parse_tree/test_3_sequence.py
• modified: Arpeggio/pytst/d1_parse_tree/test_9_grammar.py
• modified: Arpeggio/pytst/grammar.peg
• add: Arpeggio/grammar1.py
• add: Arpeggio/grammar2.py
• delete: Arpeggio/grammar.py

差異

diff -r 968c856be589 -r dc50c83a7742 Arpeggio/grammar.py
--- a/Arpeggio/grammar.py	Thu Dec 09 16:22:12 2021 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-from arpeggio import Optional, ZeroOrMore, OneOrMore, EOF
-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, '<-', ordered_choice, ";"
-def ordered_choice():	return sequence, ZeroOrMore('|', sequence)
-def sequence():		return ZeroOrMore(prefix)
-def prefix():           return Optional(['&','!']), suffix
-def suffix():		return expression, Optional([ '?' , '*' , '+' , '#' ])
-def expression():       return [ regex_term, str_term, ('(', ordered_choice, ')'), rule_crossref]  # OrderedChoice
-def rule_crossref():	return rule_name
-def rule_name():	return ID
-def regex_term():	return [  (RE,   re_no_slash, RE),              # OrderedChoice
-                                  (REs3, str_no_s3,   S3),
-                                  (REd3, str_no_d3,   D3),
-                                  (REs1, str_no_s1,   S1),
-                                  (REd1, str_no_d1,   D1) ]
-def str_term():		return [  (S3, str_no_s3, S3),                  # OrderedChoice
-                                  (D3, str_no_d3, D3),
-                                  (S1, str_no_s1, S1),
-                                  (D1, str_no_d1, D1) ]
-
-def ID():        	return _(r"[a-zA-Z_]([a-zA-Z_]|[0-9])*")
-
-def re_no_slash():	return _(r"((\\/)|[^\/])*")
-
-def str_no_s1():	return _(r"((\\')|[^'\n])*")                    # Does NOT match multiline -- note 'multiline=False' is not the same
-def str_no_d1():	return _(r'((\\")|[^"\n])*')                    # idem
-def str_no_s3():	return _(r"([^']|('[^'])|(''[^']))*")           # ALLOW multiline
-def str_no_d3():	return _(r'''([^"]|("[^"])|(""[^"]))*''')       # idem
-
-S1 = "'"
-D1 = '"'
-S3 = "'''"
-D3 = '"""'
-RE   = '/'
-REs1 = _(r"[rR]'")
-REd1 = _(r'[rR]"')
-REs3 = _(r"[rR]'''")
-REd3 = _(r'[rR]"""')
-
-def comment():          return "//", _(".*\n")
-

diff -r 968c856be589 -r dc50c83a7742 Arpeggio/grammar1.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Arpeggio/grammar1.py	Fri Dec 10 15:53:35 2021 +0100
@@ -0,0 +1,45 @@
+from arpeggio import Optional, ZeroOrMore, OneOrMore, EOF
+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, '<-', ordered_choice, ";"
+def ordered_choice():	return sequence, ZeroOrMore('|', sequence)
+def sequence():		return ZeroOrMore(prefix)
+def prefix():           return Optional(['&','!']), suffix
+def suffix():		return expression, Optional([ '?' , '*' , '+' , '#' ])
+def expression():       return [ regex_term, str_term, ('(', ordered_choice, ')'), rule_crossref]  # OrderedChoice
+def rule_crossref():	return rule_name
+def rule_name():	return ID
+def regex_term():	return [  (RE,   re_no_slash, RE),              # OrderedChoice
+                                  (REs3, str_no_s3,   S3),
+                                  (REd3, str_no_d3,   D3),
+                                  (REs1, str_no_s1,   S1),
+                                  (REd1, str_no_d1,   D1) ]
+def str_term():		return [  (S3, str_no_s3, S3),                  # OrderedChoice
+                                  (D3, str_no_d3, D3),
+                                  (S1, str_no_s1, S1),
+                                  (D1, str_no_d1, D1) ]
+
+def ID():        	return _(r"[a-zA-Z_]([a-zA-Z_]|[0-9])*")
+
+def re_no_slash():	return _(r"((\\/)|[^\/])*")
+
+def str_no_s1():	return _(r"((\\')|[^'\n])*")                    # Does NOT match multiline -- note 'multiline=False' is not the same
+def str_no_d1():	return _(r'((\\")|[^"\n])*')                    # idem
+def str_no_s3():	return _(r"([^']|('[^'])|(''[^']))*")           # ALLOW multiline
+def str_no_d3():	return _(r'''([^"]|("[^"])|(""[^"]))*''')       # idem
+
+S1 = "'"
+D1 = '"'
+S3 = "'''"
+D3 = '"""'
+RE   = '/'
+REs1 = _(r"[rR]'")
+REd1 = _(r'[rR]"')
+REs3 = _(r"[rR]'''")
+REd3 = _(r'[rR]"""')
+
+def comment():          return "//", _(".*\n")
+

diff -r 968c856be589 -r dc50c83a7742 Arpeggio/grammar2.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Arpeggio/grammar2.py	Fri Dec 10 15:53:35 2021 +0100
@@ -0,0 +1,48 @@
+from arpeggio import Optional, ZeroOrMore, OneOrMore, EOF
+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, '<-', expressions, ";"
+
+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
+
+def str_term():		return [  (S3,   str_no_s3,  S3),
+                                  (D3,   str_no_d3,   D3),
+                                  (S1,   str_no_s1,   S1),
+                                  (D1,   str_no_d1,   D1)  ]
+def regex_term():	return [  (RE,   re_no_slash, RE),
+                                  (REs3, str_no_s3,   S3),
+                                  (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])*")
+
+def re_no_slash():	return _(r"((\\/)|[^\/])*")
+def str_no_s1():	return _(r"((\\')|[^'\n])*")                    # Does NOT match multiline -- note 'multiline=False' is not the same
+def str_no_d1():	return _(r'((\\")|[^"\n])*')                    # idem
+def str_no_s3():	return _(r"([^']|('[^'])|(''[^']))*")           # ALLOW multiline
+def str_no_d3():	return _(r'''([^"]|("[^"])|(""[^"]))*''')       # idem
+
+S1 = "'"
+D1 = '"'
+S3 = "'''"
+D3 = '"""'
+RE   = '/'
+REs1 = _(r"[rR]'")
+REd1 = _(r'[rR]"')
+REs3 = _(r"[rR]'''")
+REd3 = _(r'[rR]"""')
+
+def comment():		return "//", _(".*\n")
+
+

diff -r 968c856be589 -r dc50c83a7742 Arpeggio/pytst/d1_parse_tree/test_3_sequence.py
--- a/Arpeggio/pytst/d1_parse_tree/test_3_sequence.py	Thu Dec 09 16:22:12 2021 +0100
+++ b/Arpeggio/pytst/d1_parse_tree/test_3_sequence.py	Fri Dec 10 15:53:35 2021 +0100
@@ -37,7 +37,7 @@
 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]) 
+def test_sub_sub2():	parse_sequence(r'level0 ( level1_1  (level2a level2b ) level1_2) level0', pattern=[X, [X, [X,X], X], X])
 
 
 

diff -r 968c856be589 -r dc50c83a7742 Arpeggio/pytst/d1_parse_tree/test_9_grammar.py
--- a/Arpeggio/pytst/d1_parse_tree/test_9_grammar.py	Thu Dec 09 16:22:12 2021 +0100
+++ b/Arpeggio/pytst/d1_parse_tree/test_9_grammar.py	Fri Dec 10 15:53:35 2021 +0100
@@ -11,10 +11,12 @@
     with (path_to_current_dir / dir / filename).open() as f:
         txt = f.read()
 
-    parser = ParserPython(peg_grammar, comment)
+    parser = ParserPython(peg_grammar, comment, debug=False)
     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:]}<<."
+
+    print("\nPARSE TREE\n" + tree.tree_str())
     return tree
 
 def test_grammar(): parse_file("grammar.peg")

diff -r 968c856be589 -r dc50c83a7742 Arpeggio/pytst/grammar.peg
--- a/Arpeggio/pytst/grammar.peg	Thu Dec 09 16:22:12 2021 +0100
+++ b/Arpeggio/pytst/grammar.peg	Fri Dec 10 15:53:35 2021 +0100
@@ -1,4 +1,4 @@
-// This is a fragment from ../examples/My_GrammarParser.Castle
+//This is a fragment from ../examples/My_GrammarParser.Castle
 
    peg_grammar     <-  rule+ ;
    rule	           <-  rule_name '<-' ordered_choice ';' ;