Commit: cd3f73efabaf2d7867cceab8974c70f5c575cb4a - CCastle2 (hg)

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

Commit MetaInfo

• Revision: cd3f73efabaf2d7867cceab8974c70f5c575cb4a (tree)
• Zeit: 2021-12-21 06:14:58
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

Added RegEx visitor (and tests)

Ändern Zusammenfassung

• modified: Arpeggio/pytst/d2_ast/test_1_term.py
• modified: Arpeggio/visitor.py

Diff

diff -r e301e7991ae1 -r cd3f73efabaf Arpeggio/pytst/d2_ast/test_1_term.py
--- a/Arpeggio/pytst/d2_ast/test_1_term.py	Mon Dec 20 21:51:08 2021 +0100
+++ b/Arpeggio/pytst/d2_ast/test_1_term.py	Mon Dec 20 22:14:58 2021 +0100
@@ -29,3 +29,32 @@
     assert isinstance(ast, peg.Terminal),	"It should be a term ..."
     assert isinstance(ast, peg.StrTerm), 	"... and a str"
     assert ast.value == "triple string", 	"It's correct value should be without quotes"
+
+def test_regex_RE():
+    txt='/a reg.ex/'
+    ast = parse(txt, grammar.term)
+    assert isinstance(ast, peg.Terminal),	"It should be a term ..."
+    assert isinstance(ast, peg.RegExpTerm), 	"... and a RegExp"
+    assert ast.value == 'a reg.ex', 		"It's correct value should be without slahes -- note: the regex itself is a string"
+
+def regex_variants(txt, expect):
+    ast = parse(txt, grammar.term)
+    assert isinstance(ast, peg.Terminal),	"It should be a term ..."
+    assert isinstance(ast, peg.RegExpTerm), 	"... and a RegExp"
+    assert ast.value == expect, 		"And the regex-pre/postfix should be removed from the value"
+
+def testregex_variants():
+    regex_variants(txt:="""/a reg.ex/""", expect=txt[1:-1])                 # Same a test_regex_RE
+    regex_variants(txt:="""/re_slash/""", expect=txt[1:-1])
+
+    regex_variants(txt:="""R're__Rstr_s1'""", expect=txt[2:-1])
+    regex_variants(txt:="""r're__rstr_s1'""", expect=txt[2:-1])
+    regex_variants(txt:='''R"re__Rstr_d1"''', expect=txt[2:-1])
+    regex_variants(txt:='''r"re__rstr_d1"''', expect=txt[2:-1])
+
+    regex_variants(txt:="""R'''re__Rstr_s3'''""", expect=txt[4:-3])
+    regex_variants(txt:="""r'''re__rstr_s3'''""", expect=txt[4:-3])
+    regex_variants(txt:='''R"""re__Rstr_d3"""''', expect=txt[4:-3])
+    regex_variants(txt:='''r"""re__rstr_d3"""''', expect=txt[4:-3])
+
+

diff -r e301e7991ae1 -r cd3f73efabaf Arpeggio/visitor.py
--- a/Arpeggio/visitor.py	Mon Dec 20 21:51:08 2021 +0100
+++ b/Arpeggio/visitor.py	Mon Dec 20 22:14:58 2021 +0100
@@ -7,3 +7,6 @@
     def visit_str_term(self, node, children):
         ast = peg.StrTerm(value=node[1], parse_tree=node)
         return ast
+    def visit_regex_term(self, node, children):
+        ast = peg.RegExpTerm(value=node[1], parse_tree=node)
+        return ast