Commit: 281b35b96aa71fb93481e651086810f70fe87a04 - CCastle2 (hg)

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

Commit MetaInfo

• Revisão: 281b35b96aa71fb93481e651086810f70fe87a04 (tree)
• Hora: 2024-04-19 06:15:52
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Mensagem de Log

Addeds aigr.Become(statement)

Mudança Sumário

• modified: base_packages/castle-aigr/Makefile
• modified: base_packages/castle-aigr/castle/aigr/statements.py
• add: base_packages/castle-aigr/pytst/statements/__init__.py
• add: base_packages/castle-aigr/pytst/statements/test_become.py
• add: base_packages/castle-aigr/pytst/statements/test_if.py
• delete: base_packages/castle-aigr/pytst/test_4_statements.py

Diff

diff -r 928390b2799b -r 281b35b96aa7 base_packages/castle-aigr/Makefile
--- a/base_packages/castle-aigr/Makefile	Thu Apr 18 14:25:17 2024 +0200
+++ b/base_packages/castle-aigr/Makefile	Thu Apr 18 23:15:52 2024 +0200
@@ -4,9 +4,10 @@
 PYREVERSE_PKGS = castle/aigr castle/aigr.machinery
 
 LAST = \
+	pytst/statements/test_if.py	\
 #
 CURRENT = \
-	pytst/test_4_statements.py	\
+	pytst/statements/test_become.py	\
 #
 TODO = \
 	pytst/test_3_namespaces.py			\

diff -r 928390b2799b -r 281b35b96aa7 base_packages/castle-aigr/castle/aigr/statements.py
--- a/base_packages/castle-aigr/castle/aigr/statements.py	Thu Apr 18 14:25:17 2024 +0200
+++ b/base_packages/castle-aigr/castle/aigr/statements.py	Thu Apr 18 23:15:52 2024 +0200
@@ -19,3 +19,20 @@
     test:   AIGR                     # Boolean Expr
     body:   AIGR                     # Typical: `AIGR.Body`
     orelse: PTH.Optional[AIGR]=None  # Typical: `AIGR.Body | AIGR.If`
+
+@dataclass
+class Become(_statement):
+    """ It can be a single assignment as `a:=2`; or `b=foo()`; or more complex ones ...
+
+        * Multiple assignment: `a,b := b,a` -- works as expected: swap the values
+        * For multiple assignment `len(targets)==len(values)`
+        * Tuple assignment `a := 1,2,3` is also possible -- then the two tuples do not have the same length
+        * Un/Packing as in Python `a,*b,c= 1,2,3,4,5;` is also possible -- here 'b' becomes '2,3,4'
+
+        Currently, only single assignment are supported -- so both tuples have len==1
+
+    """
+    _kids = ('targets', 'values')
+    _ : KW_ONLY
+    targets: tuple[AIGR]                   # LHS: (sequence of) Variables etc
+    values:  tuple[AIGR]                   # RGS: (sequence of) Values

diff -r 928390b2799b -r 281b35b96aa7 base_packages/castle-aigr/pytst/statements/__init__.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base_packages/castle-aigr/pytst/statements/__init__.py	Thu Apr 18 23:15:52 2024 +0200
@@ -0,0 +1,37 @@
+# (C) Albert Mietus, 2024. Part of Castle/CCastle project
+
+import logging; logger = logging.getLogger(__name__)
+import pytest
+import typing as PTH                                                                                  # Python TypeHints
+
+from castle.aigr import AIGR
+from castle.aigr import If
+
+from dataclasses import dataclass
+
+
+@dataclass
+class Dummy(AIGR):
+    mark: PTH.Any
+
+    def __repr__(self):
+        return f'<Dummy.{self.mark}>'
+
+
+def verifyMark(dummy, mark):
+    logger.debug("verifyMark: dummy=%s, mark=%s", dummy, mark)
+    if mark is None:
+        assert dummy is None
+    else:
+        assert isinstance(dummy, Dummy)
+        assert dummy.mark == mark, f"Expecting mark: {mark}, but got {dummy.mark}"
+
+
+def verifyKids(s):
+    logger.debug("verifyKids: statements: %s", s)
+    unique = Dummy('unique')
+    for k in s._kids:
+        logger.debug("verifyKid  getattr(s,%s,unique) (%s) != unique (%s) %s",
+                         k, getattr(s,k,unique), unique, getattr(s,k,unique)!=unique)
+        assert unique != getattr(s,k, unique), f"Kid `{k}` should exist in {s}, but doesn't"
+

diff -r 928390b2799b -r 281b35b96aa7 base_packages/castle-aigr/pytst/statements/test_become.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base_packages/castle-aigr/pytst/statements/test_become.py	Thu Apr 18 23:15:52 2024 +0200
@@ -0,0 +1,22 @@
+# (C) Albert Mietus, 2024. Part of Castle/CCastle project
+
+import pytest
+from . import  Dummy, verifyMark, verifyKids
+
+from castle.aigr import Become
+
+
+
+
+def test_1_simpleAssign():
+    "a:=1"
+    s=Become(targets=(Dummy('a'),),values=(Dummy(1),))
+    verifyMark(s.targets[0],'a')
+    verifyMark(s.values[0],1)
+
+
+
+def test_if_kids():
+    verifyKids(Become(targets=(),values=()))
+
+

diff -r 928390b2799b -r 281b35b96aa7 base_packages/castle-aigr/pytst/statements/test_if.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base_packages/castle-aigr/pytst/statements/test_if.py	Thu Apr 18 23:15:52 2024 +0200
@@ -0,0 +1,30 @@
+# (C) Albert Mietus, 2024. Part of Castle/CCastle project
+
+import pytest
+from . import  Dummy, verifyMark, verifyKids
+
+from castle.aigr import If
+
+
+def test_1a_if3():
+    s = If(test=Dummy('if-test'),body=Dummy('then-body'), orelse=Dummy('else'))
+    verifyMark(s.test, 'if-test')
+    verifyMark(s.body, 'then-body')
+    verifyMark(s.orelse,'else', )
+
+def test_1a_if2():
+    s = If(test=Dummy('if-test'),body=Dummy('then-body'))
+    verifyMark(s.test,'if-test')
+    verifyMark(s.body, 'then-body')
+    verifyMark(s.orelse, None)
+
+def test_2_if_missing():
+    with pytest.raises(TypeError): If(test=Dummy('WRONG'))
+    with pytest.raises(TypeError): If(body=Dummy('WRONG'))
+    with pytest.raises(TypeError): If()
+
+
+def test_if_kids():
+    verifyKids(If(test=Dummy('1/3'), body=Dummy('2/3'), orelse=Dummy('3/3')))
+    verifyKids(If(test=Dummy('1/2'), body=Dummy('2/2')))
+

diff -r 928390b2799b -r 281b35b96aa7 base_packages/castle-aigr/pytst/test_4_statements.py
--- a/base_packages/castle-aigr/pytst/test_4_statements.py	Thu Apr 18 14:25:17 2024 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-# (C) Albert Mietus, 2024. Part of Castle/CCastle project
-
-import logging; logger = logging.getLogger(__name__)
-import pytest
-import typing as PTH                                                                                  # Python TypeHints
-
-from castle.aigr import AIGR
-from castle.aigr import If
-
-from dataclasses import dataclass
-
-
-@dataclass
-class Dummy(AIGR):
-    mark: PTH.Any
-
-    def __repr__(self):
-        return f'<Dummy.{self.mark}>'
-
-
-def verifyMark(dummy, mark):
-    if mark is None:
-        assert dummy is None
-    else:
-        assert isinstance(dummy, Dummy)
-        assert dummy.mark == mark, f"Expecting mark: {mark}, but got {dummy.mark}"
-
-def test_1a_if3():
-    s = If(test=Dummy('if-test'),body=Dummy('then-body'), orelse=Dummy('else'))
-    verifyMark(s.test, 'if-test')
-    verifyMark(s.body, 'then-body')
-    verifyMark(s.orelse,'else', )
-
-
-def test_1a_if2():
-    s = If(test=Dummy('if-test'),body=Dummy('then-body'))
-    verifyMark(s.test,'if-test')
-    verifyMark(s.body, 'then-body')
-    verifyMark(s.orelse, None)
-
-def test_2_if_missing():
-    with pytest.raises(TypeError): If(test=Dummy('WRONG'))
-    with pytest.raises(TypeError): If(body=Dummy('WRONG'))
-    with pytest.raises(TypeError): If()
-
-def verifyKids(s):
-    logger.debug("verifyKids: statements: %s", s)
-    unique = Dummy('unique')
-    for k in s._kids:
-        logger.debug("verifyKid  getattr(s,%s,unique) (%s) != unique (%s) %s",
-                         k, getattr(s,k,unique), unique, getattr(s,k,unique)!=unique)
-        assert unique != getattr(s,k, unique), f"Kid `{k}` should exist in {s}, but doesn't"
-
-def test_if_kids():
-    verifyKids(If(test=Dummy('1/3'), body=Dummy('2/3'), orelse=Dummy('3/3')))
-    verifyKids(If(test=Dummy('1/2'), body=Dummy('2/2')))
-