Commit: d89d215a0dd2cabf316ed1f1a49a2120a338833e - CCastle2 (hg)

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

Commit MetaInfo

• Révision: d89d215a0dd2cabf316ed1f1a49a2120a338833e (tree)
• l'heure: 2021-12-20 06:03:53
• Auteur: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Message de Log

Another peg.StrTerm test

Change Summary

• modified: AST/castle/_base.py
• modified: AST/castle/peg.py
• modified: Arpeggio/pytst/d2_ast/test_1_term.py

Modification

diff -r 151697e5fa4e -r d89d215a0dd2 AST/castle/_base.py
--- a/AST/castle/_base.py	Tue Dec 14 23:17:36 2021 +0100
+++ b/AST/castle/_base.py	Sun Dec 19 22:03:53 2021 +0100
@@ -1,13 +1,15 @@
 class AST_BASE:
     """Base class for all Castle ATS nodes"""
 
-    def __init__(self, *, parse_tree=None):
+    def __init__(self, *, parse_tree=None, **kwargs):
+        super().__init__(**kwargs)
         self._parse_tree = parse_tree
 
+
     @property
-    def position(self): return self.parse_tree.position
+    def position(self): return self._parse_tree.position
     @property
-    def position_end(self): return self.parse_tree.position_end
+    def position_end(self): return self._parse_tree.position_end
 
 
 class IDError(ValueError):

diff -r 151697e5fa4e -r d89d215a0dd2 AST/castle/peg.py
--- a/AST/castle/peg.py	Tue Dec 14 23:17:36 2021 +0100
+++ b/AST/castle/peg.py	Sun Dec 19 22:03:53 2021 +0100
@@ -2,6 +2,9 @@
 
 class PEG (AST_BASE):                                                   # abstract
     """Base class of all PEG classes"""
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
 
 ##
 ## Note: When using TypeHints with PEG-classes; the clases
@@ -13,6 +16,8 @@
     def __init__(self, *, value=None, **kwargs):
         super().__init__(**kwargs)
         self.value=value
+
+
 class NonTerminal(PEG): pass                                            # abstract
 class Markers(PEG): pass                                                # abstract
 
@@ -24,7 +29,6 @@
 class Expression(NonTerminal): pass                                     # abstract
 
 
-
 class Setting(PEG):
     def __init__(self, *,
                  name: ID,
@@ -36,7 +40,6 @@
         self.value = value
 
 
-
 class Rule(NonTerminal):
     def __init__(self, *,
                  name: ID,

diff -r 151697e5fa4e -r d89d215a0dd2 Arpeggio/pytst/d2_ast/test_1_term.py
--- a/Arpeggio/pytst/d2_ast/test_1_term.py	Tue Dec 14 23:17:36 2021 +0100
+++ b/Arpeggio/pytst/d2_ast/test_1_term.py	Sun Dec 19 22:03:53 2021 +0100
@@ -21,7 +21,20 @@
     return ast
 
 def test_simple_str():
-    ast = parse("'a string'", grammar.term)
+    txt="'a string'"
+    ast = parse(txt, grammar.term)
     assert isinstance(ast, peg.Terminal),	"It should be a term ..."
     assert isinstance(ast, peg.StrTerm), 	"... and a str"
     assert ast.value == "a string", 		"It's correct value should be without quotes"
+    assert ast.position == 0,			"The term's position includes the quotes ..."
+    assert ast.position_end == len(txt),      	" ... on both ends."
+
+def test_simple_str_2():
+    txt='"""triple string"""'
+    ast = parse(txt, grammar.term)
+    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"
+    assert ast.position == 0,			"The term's position includes the quotes ..."
+    assert ast.position_end == len(txt),      	" ... on both ends."
+