Commit: c96d582a07d767ce81e597d1c5fe88d8aedd844f - CCastle2 (hg)

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

Commit MetaInfo

• Révision: c96d582a07d767ce81e597d1c5fe88d8aedd844f (tree)
• l'heure: 2021-12-11 04:40:49
• Auteur: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Message de Log

Rewriten grammar.py Done. 'grammar.py' is now grammar2

Change Summary

• add: Arpeggio/grammar.py
• delete: Arpeggio/grammar1.py
• delete: Arpeggio/grammar2.py

Modification

diff -r f751c988d68b -r c96d582a07d7 Arpeggio/grammar.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Arpeggio/grammar.py	Fri Dec 10 20:40:49 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 f751c988d68b -r c96d582a07d7 Arpeggio/grammar1.py
--- a/Arpeggio/grammar1.py	Fri Dec 10 20:39:26 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 f751c988d68b -r c96d582a07d7 Arpeggio/grammar2.py
--- a/Arpeggio/grammar2.py	Fri Dec 10 20:39:26 2021 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +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, '<-', 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")
-
-