提交: eb6a71735c23dd9708126a22493e2353edaaa316 - CCastle2 (hg)

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

Commit MetaInfo

• 修订版: eb6a71735c23dd9708126a22493e2353edaaa316 (tree)
• 时间: 2024-05-12 19:33:44
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

More sieveCastle; small mypy issue: 'Is Call a starement?' _(currently not, it a expression which is not a statement)_

更改概述

• modified: TestDoubles_packages/TestDoubles-aigr-sieve/castle/TESTDOUBLES/aigr/sieve/basic1/sieveCastle.py
• modified: TestDoubles_packages/TestDoubles-aigr-sieve/pytst/sieve/basic1/__init__.py
• modified: TestDoubles_packages/TestDoubles-aigr-sieve/pytst/sieve/basic1/test_sieveCastle.py

差异

diff -r a3662337d36b -r eb6a71735c23 TestDoubles_packages/TestDoubles-aigr-sieve/castle/TESTDOUBLES/aigr/sieve/basic1/sieveCastle.py
--- a/TestDoubles_packages/TestDoubles-aigr-sieve/castle/TESTDOUBLES/aigr/sieve/basic1/sieveCastle.py	Sun May 12 12:31:03 2024 +0200
+++ b/TestDoubles_packages/TestDoubles-aigr-sieve/castle/TESTDOUBLES/aigr/sieve/basic1/sieveCastle.py	Sun May 12 12:33:44 2024 +0200
@@ -5,8 +5,12 @@
    .. see also:: :file:`./__init__.py` for a general intro
 """
 
+__all__ = ['Sieve']
 
-from castle.aigr import ComponentImplementation, Body
+
+from castle import aigr
+from castle.aigr import ComponentImplementation, ID, Method
+
 
 
 # implement Sieve {
@@ -18,17 +22,33 @@
 Sieve = ComponentImplementation('Sieve',
                                 interface=components.SieveMoat,
                                 parameters=(),
-                                body=Body()) # Body in filed below
-
-
-
+                                body=aigr.Body()) # Body in filed below
 
 # init(int:onPrime)  // `init` is (typically) part of the construction of a element.
 # {
 #   super.init();    // `super` acts as port to the base-class
 #   .myPrime := onPrime;
 # }
-#
+
+init_method = Method(ID('init'),
+                         returns=None,
+                         parameters=(aigr.TypedParameter(name=ID('onPrime'), type=int),),
+                         body=aigr.Body(statements=[
+                             aigr.Call(
+                                 callable=aigr.Part(
+                                     base=aigr.Call(callable=ID('super')), attribute=ID('init')),
+                                 arguments=()),
+                             aigr.Become(
+                                        targets=(aigr.Part(base=ID('self'), attribute=ID('myPrime', context=aigr.Set())),),
+                                        values=(ID('onPrime', context=aigr.Ref()),))]))
+
+assert isinstance(Sieve.body, aigr.Body) # This make mypy happy for the next line :-)
+Sieve.body.expand(init_method)
+
+
+
+
+
 # SimpleSieve.input(try) on .try
 # {
 #   if ( (try % .myPrime) !=0 ) {

diff -r a3662337d36b -r eb6a71735c23 TestDoubles_packages/TestDoubles-aigr-sieve/pytst/sieve/basic1/__init__.py
--- a/TestDoubles_packages/TestDoubles-aigr-sieve/pytst/sieve/basic1/__init__.py	Sun May 12 12:31:03 2024 +0200
+++ b/TestDoubles_packages/TestDoubles-aigr-sieve/pytst/sieve/basic1/__init__.py	Sun May 12 12:33:44 2024 +0200
@@ -0,0 +1,21 @@
+# (C) Albert Mietus 2024, Part of Castle/CCastle project
+"""Test the AIGR TestDoubles of the Sieve protocols (basic1 variant)
+   See: http://docideas.mietus.nl/en/default/CCastle/4.Blog/b.TheSieve.html#the-design
+"""
+import logging; logger = logging.getLogger(__name__)
+
+import typing as PTH                                                                                 # Python TypeHints
+from castle import aigr
+
+
+def find_name_in_body(name, body) -> PTH.Optional[aigr.statements.callables._Named_callable]:
+    logger.info("find_name_in_body(name=%s, body=%s", name, body)
+    for s in body.statements:
+        logger.debug("\t: %s", s)
+        if isinstance(s, aigr.NamedNode):
+            logger.debug("\t: name=%s in %s", s.name, s)
+            if s.name == name:
+                logger.debug("\t: FOUND name=%s in %s", s.name, s)
+                return s
+    logger.debug("NOT FOUND: %s", name)
+    return None

diff -r a3662337d36b -r eb6a71735c23 TestDoubles_packages/TestDoubles-aigr-sieve/pytst/sieve/basic1/test_sieveCastle.py
--- a/TestDoubles_packages/TestDoubles-aigr-sieve/pytst/sieve/basic1/test_sieveCastle.py	Sun May 12 12:31:03 2024 +0200
+++ b/TestDoubles_packages/TestDoubles-aigr-sieve/pytst/sieve/basic1/test_sieveCastle.py	Sun May 12 12:33:44 2024 +0200
@@ -2,11 +2,15 @@
 """Test the AIGR TestDoubles of the Sieve protocols (basic1 variant)
    See: http://docideas.mietus.nl/en/default/CCastle/4.Blog/b.TheSieve.html#the-design
 """
+import logging; logger = logging.getLogger(__name__)
 
 import pytest
+
 from castle.TESTDOUBLES.aigr.sieve.basic1 import sieveCastle
+from castle import aigr
 
-from castle import aigr
+from . import find_name_in_body
+
 
 @pytest.fixture
 def comp():
@@ -14,7 +18,7 @@
 
 
 def test_0a_types(comp):
-    assert isinstance(comp, aigr.ComponentImplementation) 
+    assert isinstance(comp, aigr.ComponentImplementation)
     assert isinstance(comp.interface, aigr.ComponentInterface)
     assert isinstance(comp.parameters, (type(None), tuple))
     assert isinstance(comp.body, aigr.Body)
@@ -24,5 +28,13 @@
     assert comp.name == 'Sieve'
 
 def test_0c_noParms(comp):
-    assert comp.parameters is ()
+    assert comp.parameters == ()
 
+def test_has_init(comp):
+    init = find_name_in_body('init', comp.body)
+    assert isinstance(init, aigr.Method), f"Expected an init method, got {init}"
+
+def test_init_has_body(comp):
+    init = find_name_in_body('init', comp.body)
+    assert len(init.body)==2, f"Expected that 'init' has 2 statements, but found: {len(init.body.statements)}"
+