提交: c4a8f019dd794211406b1532ee506bf33cf8a01c - CCastle2 (hg)

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

Commit MetaInfo

• 修訂: c4a8f019dd794211406b1532ee506bf33cf8a01c (tree)
• 時間: 2023-10-11 17:05:32
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

ASIS: A bit of work on rendering Moat/Inferface's -- Work is needed for 'NameSpaces' and requirements

Change Summary

• modified: TestDoubles/reference/interfaces/SieveMoat.rpy
• modified: castle/writers/RPy/templates/parts/interface_DataStructures.jinja2
• modified: pytst/writers/RPy/test_99_SieveMoats.py

差異

diff -r b006978bdf60 -r c4a8f019dd79 TestDoubles/reference/interfaces/SieveMoat.rpy
--- a/TestDoubles/reference/interfaces/SieveMoat.rpy	Tue Oct 10 21:53:53 2023 +0200
+++ b/TestDoubles/reference/interfaces/SieveMoat.rpy	Wed Oct 11 10:05:32 2023 +0200
@@ -17,7 +17,7 @@
 cc_CI_Sieve.ports.append(buildin.CC_B_C_PortID(name="try",
                                 portNo=2,   # XXXX
                                 protocol=SimpleSieve.cc_P_SimpleSieve,
-                                direction=buildin.PortDirection.In,
+                                direction=buildin.PortDirection.In, ## or base.?
                                 part_of=cc_CI_Sieve))
 cc_CI_Sieve.ports.append(buildin.CC_B_C_PortID(name="coprime",
                                 portNo=3,      #XXX

diff -r b006978bdf60 -r c4a8f019dd79 castle/writers/RPy/templates/parts/interface_DataStructures.jinja2
--- a/castle/writers/RPy/templates/parts/interface_DataStructures.jinja2	Tue Oct 10 21:53:53 2023 +0200
+++ b/castle/writers/RPy/templates/parts/interface_DataStructures.jinja2	Wed Oct 11 10:05:32 2023 +0200
@@ -8,16 +8,15 @@
 
 {%- for interface in interfaces %}
   {{- m.comp_interface_Name(interface.name) }} = buildin.CC_B_ComponentInterface(name="{{ interface.name }}",
-                                  inherit_from={{interface.based_on.NS{}}}{{ m.comp_interface_Name(interface.based_on.name) }},
+                                  inherit_from= XXX_NS_XXX. {{ m.comp_interface_Name(interface.based_on.name) }},
                                   ports=[])
 
   {% for p in interface.ports %}
-    {{- m.ProtocolName(interface.name) }}.ports.append(buildin.CC_B_PortID(name="{{ p.name  }}",
+    {{- m.comp_interface_Name(interface.name) }}.ports.append(buildin.CC_B_C_PortID(name="{{ p.name  }}",
                                 portNo=XXXX,
                                 protocol={{m.ProtocolName(p.type.name)}},
-                                direction={{p.direction.value}},
+                                direction=XXX_NS_XXX. {{p.direction}},
                                 part_of={{ m.comp_interface_Name(interface.name) }}))
-
   {% endfor %} {#- ports #}
 
 {% endfor %} {#- interfaces #}

diff -r b006978bdf60 -r c4a8f019dd79 pytst/writers/RPy/test_99_SieveMoats.py
--- a/pytst/writers/RPy/test_99_SieveMoats.py	Tue Oct 10 21:53:53 2023 +0200
+++ b/pytst/writers/RPy/test_99_SieveMoats.py	Wed Oct 11 10:05:32 2023 +0200
@@ -22,7 +22,7 @@
     generatedProtocol_verifier(aigr_mock=sieve.SimpleSieve, td=TstDoubles('protocols/SimpleSieve'))
 
 
[e-mail]("To Busy with other things")
+#@pytest.mark.skip("To Busy with other things")
 def test_04_SieveMoat(generatedMoat_verifier):
     generatedMoat_verifier(aigr_mock=sieve.SieveMoat, td=TstDoubles('interfaces/SieveMoat'))