Commit: cb6ed189fcdc464830d380c22479d2a9224d3f4e - CCastle2 (hg)

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

Commit MetaInfo

• Revision: cb6ed189fcdc464830d380c22479d2a9224d3f4e (tree)
• Zeit: 2021-12-09 21:49:50
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

more unit-tests & fixes

Ändern Zusammenfassung

• modified: AST/castle/_base.py
• modified: AST/castle/peg.py
• add: AST/pytst/test_1_Settings.py

Diff

diff -r 4f710df67cec -r cb6ed189fcdc AST/castle/_base.py
--- a/AST/castle/_base.py	Wed Dec 08 23:58:06 2021 +0100
+++ b/AST/castle/_base.py	Thu Dec 09 13:49:50 2021 +0100
@@ -9,4 +9,19 @@
     @property
     def position_end(self): return self.parse_tree.position_end
 
-class ID(str): pass
+
+class IDError(ValueError):
+    "The given ID is not valid as an ID"
+
+import re
+
+class ID(str):
+    _pattern = re.compile(r'[A-Za-z_][A-Za-z0-9_]*')
+
+    @staticmethod
+    def validate_or_raise(value):
+        if not isinstance(value, str):
+            raise IDError("not a str of ID")
+        if ID._pattern.fullmatch(value) is None:
+            raise IDError("not a valid pattern")
+

diff -r 4f710df67cec -r cb6ed189fcdc AST/castle/peg.py
--- a/AST/castle/peg.py	Wed Dec 08 23:58:06 2021 +0100
+++ b/AST/castle/peg.py	Thu Dec 09 13:49:50 2021 +0100
@@ -25,8 +25,9 @@
 class Setting(PEG):
     def __init__(self, *,
                  name: ID,
-                 value=None,
+                 value,
                  **kwargs):
+        ID.validate_or_raise(name)
         super().__init__(**kwargs)
         self.name = name
         self.value = value
@@ -38,6 +39,7 @@
                  name: ID,
                  value :Expression,
                  **kwargs):
+        ID.validate_or_raise(name)
         super().__init__(**kwargs)
         self.name = name
         self.value = value

diff -r 4f710df67cec -r cb6ed189fcdc AST/pytst/test_1_Settings.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/AST/pytst/test_1_Settings.py	Thu Dec 09 13:49:50 2021 +0100
@@ -0,0 +1,21 @@
+import pytest
+
+from castle.peg import Setting
+
+def test_a_ID():
+    a_name, a_val = 'aName', 42
+    s=Setting(name=a_name, value=a_val)
+    assert s.name  == a_name, "Remember the ID"
+    assert s.value == a_val,  "Remember the value"
+
+
+def test_needID():
+    with pytest.raises(ValueError):
+        Setting(name=42, value="the name should be an ID, or string")
+    with pytest.raises(ValueError):
+        Setting(name='a b', value="a space in not allowed in an ID")
+
+def test_needID():
+    with pytest.raises(TypeError):
+        Setting(name='Forgot_a_Value')
+