提交: 7676a5cd2196d35437142b2852f0f268e821bd66 - CCastle2 (hg)

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

Commit MetaInfo

• 修訂: 7676a5cd2196d35437142b2852f0f268e821bd66 (tree)
• 時間: 2021-12-10 00:00:05
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

AST: peg.Rule() has a 'expr', not a 'value'

Change Summary

• modified: AST/Makefile
• modified: AST/castle/peg.py
• modified: AST/pytst/test_1_Rules.py
• modified: AST/pytst/test_1_Settings.py

差異

diff -r 21c5690c5c1c -r 7676a5cd2196 AST/Makefile
--- a/AST/Makefile	Thu Dec 09 14:43:55 2021 +0100
+++ b/AST/Makefile	Thu Dec 09 16:00:05 2021 +0100
@@ -2,6 +2,7 @@
 
 all:  test demos
 
+test:
 	(cd pytst/; pytest)
 test-s:
 	(cd pytst/; pytest -s)
@@ -9,7 +10,6 @@
 DEMOS:=$(wildcard demo/*demo*.py)
 demos:
 	for d in ${DEMOS}; do echo "*** $$d ***";  python $$d; done
-test:
 
 clean:
 	rm -rf {.,castle}/{__pycache__,.pytest_cache}/

diff -r 21c5690c5c1c -r 7676a5cd2196 AST/castle/peg.py
--- a/AST/castle/peg.py	Thu Dec 09 14:43:55 2021 +0100
+++ b/AST/castle/peg.py	Thu Dec 09 16:00:05 2021 +0100
@@ -37,12 +37,12 @@
 class Rule(NonTerminal):
     def __init__(self, *,
                  name: ID,
-                 value :Expression,
+                 expr :Expression=None,
                  **kwargs):
         ID.validate_or_raise(name)
         super().__init__(**kwargs)
         self.name = name
-        self.value = value
+        self.expr = expr
 
 
 

diff -r 21c5690c5c1c -r 7676a5cd2196 AST/pytst/test_1_Rules.py
--- a/AST/pytst/test_1_Rules.py	Thu Dec 09 14:43:55 2021 +0100
+++ b/AST/pytst/test_1_Rules.py	Thu Dec 09 16:00:05 2021 +0100
@@ -1,22 +1,18 @@
 import pytest
 
-## Notice `test_1_Rules.py` and `test_1_Settings.py` are the same, but for the SUT; in the line below -- Keep it that way!!
-from castle.peg import Rule as SUT
+from castle.peg import Rule
 
 def test_a_ID():
     a_name, a_val = 'aName', 42
-    s=SUT(name=a_name, value=a_val)
+    s=Rule(name=a_name, expr=a_val)
     assert s.name  == a_name, "Remember the ID"
-    assert s.value == a_val,  "Remember the value"
+    assert s.expr == a_val,   "Remember the expr"
 
 
 def test_needID():
     with pytest.raises(ValueError):
-        SUT(name=42, value="the name should be an ID, or string")
+        Rule(name=42) # The name should be an ID, or string
     with pytest.raises(ValueError):
-        SUT(name='a b', value="a space in not allowed in an ID")
+        Rule(name='a b') # "A space in not allowed in an ID
 
-def test_needID():
-    with pytest.raises(TypeError):
-        SUT(name='Forgot_a_Value')
 

diff -r 21c5690c5c1c -r 7676a5cd2196 AST/pytst/test_1_Settings.py
--- a/AST/pytst/test_1_Settings.py	Thu Dec 09 14:43:55 2021 +0100
+++ b/AST/pytst/test_1_Settings.py	Thu Dec 09 16:00:05 2021 +0100
@@ -1,22 +1,22 @@
 import pytest
 
-## Notice `test_1_Rules.py` and `test_1_Settings.py` are the same, but for the SUT; in the line below -- Keep it that way!!
-from castle.peg import Setting as SUT
+
+from castle.peg import Setting
 
 def test_a_ID():
     a_name, a_val = 'aName', 42
-    s=SUT(name=a_name, value=a_val)
+    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):
-        SUT(name=42, value="the name should be an ID, or string")
+        Setting(name=42, value="the name should be an ID, or string")
     with pytest.raises(ValueError):
-        SUT(name='a b', value="a space in not allowed in an ID")
+        Setting(name='a b', value="a space in not allowed in an ID")
 
 def test_needID():
     with pytest.raises(TypeError):
-        SUT(name='Forgot_a_Value')
+        Setting(name='Forgot_a_Value')