提交: 5add0f4582070ef8830076038c70e50c477759e3 - CCastle2 (hg)

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

Commit MetaInfo

• 修订版: 5add0f4582070ef8830076038c70e50c477759e3 (tree)
• 时间: 2023-11-01 04:40:40
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

BUSY:: RPy Protocol-rendering: a step, more is needed

更改概述

• modified: TestDoubles/reference/protocols/SimpleSieve.rpy
• modified: TestDoubles/reference/protocols/SlowStart.rpy
• modified: TestDoubles/reference/protocols/StartSieve.rpy
• modified: castle/writers/RPy/templates/parts/protocol_imports.jinja2
• modified: pytst/writers/RPy/__init__.py
• modified: pytst/writers/RPy/test_3_SieveProtocols.py
• delete: TestDoubles/reference/protocols/SlowStart_1.rpy

差异

diff -r fd68262da007 -r 5add0f458207 TestDoubles/reference/protocols/SimpleSieve.rpy
--- a/TestDoubles/reference/protocols/SimpleSieve.rpy	Tue Oct 31 17:40:13 2023 +0100
+++ b/TestDoubles/reference/protocols/SimpleSieve.rpy	Tue Oct 31 20:40:40 2023 +0100
@@ -7,8 +7,15 @@
 
 #Put the Castle/generated imports here
 from CC import base
-import SlowStart_1
 
+import SlowStart
+
+
+##
+## EventIndexes (All 1 events of SlowStart_1)
+##
+
+CC_P_SlowStart_1_setMax = 0
 
 ##
 ## EventIndexes (All 1 events of SimpleSieve)
@@ -17,6 +24,15 @@
 CC_P_SimpleSieve_input = 1
 
 
+cc_P_SlowStart_1 = buildin.CC_B_Protocol(name="SlowStart_1",
+                                kind=buildin.ProtocolKind.Event,
+                                inherit_from=SlowStart.cc_P_SlowStart,
+                                events=[])
+
+cc_P_SlowStart_1.events.append(buildin.CC_B_P_EventID(name="setMax",
+                                seqNo=CC_P_SlowStart_1_setMax,
+                                part_of=cc_P_SlowStart_1))
+
 cc_P_SimpleSieve = buildin.CC_B_Protocol(name="SimpleSieve",
                                 kind=buildin.ProtocolKind.Event,
                                 inherit_from=SlowStart_1.cc_P_SlowStart_1,

diff -r fd68262da007 -r 5add0f458207 TestDoubles/reference/protocols/SlowStart.rpy
--- a/TestDoubles/reference/protocols/SlowStart.rpy	Tue Oct 31 17:40:13 2023 +0100
+++ b/TestDoubles/reference/protocols/SlowStart.rpy	Tue Oct 31 20:40:40 2023 +0100
@@ -9,6 +9,7 @@
 from CC import base
 
 
+
 ##
 ## EventIndexes (All 1 events of SlowStart)
 ##

diff -r fd68262da007 -r 5add0f458207 TestDoubles/reference/protocols/SlowStart_1.rpy
--- a/TestDoubles/reference/protocols/SlowStart_1.rpy	Tue Oct 31 17:40:13 2023 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# -*- python -*-
-# Generated (R)Python file
-# (C) Albert Mietus, 2023. Part of Castle/CCastle project
-
-####
-from CC import buildin
-
-#Put the Castle/generated imports here
-from CC import base
-import SlowStart
-
-
-##
-## EventIndexes (All 1 events of SlowStart_1)
-##
-
-CC_P_SlowStart_1_setMax = 0
-
-
-cc_P_SlowStart_1 = buildin.CC_B_Protocol(name="SlowStart_1",
-                                kind=buildin.ProtocolKind.Event,
-                                inherit_from=SlowStart.cc_P_SlowStart,
-                                events=[])
-
-cc_P_SlowStart_1.events.append(buildin.CC_B_P_EventID(name="setMax",
-                                seqNo=CC_P_SlowStart_1_setMax,
-                                part_of=cc_P_SlowStart_1))
-

diff -r fd68262da007 -r 5add0f458207 TestDoubles/reference/protocols/StartSieve.rpy
--- a/TestDoubles/reference/protocols/StartSieve.rpy	Tue Oct 31 17:40:13 2023 +0100
+++ b/TestDoubles/reference/protocols/StartSieve.rpy	Tue Oct 31 20:40:40 2023 +0100
@@ -9,6 +9,7 @@
 from CC import base
 
 
+
 ##
 ## EventIndexes (All 2 events of StartSieve)
 ##

diff -r fd68262da007 -r 5add0f458207 castle/writers/RPy/templates/parts/protocol_imports.jinja2
--- a/castle/writers/RPy/templates/parts/protocol_imports.jinja2	Tue Oct 31 17:40:13 2023 +0100
+++ b/castle/writers/RPy/templates/parts/protocol_imports.jinja2	Tue Oct 31 20:40:40 2023 +0100
@@ -8,6 +8,6 @@
   {%- if p_ns is not none -%}
     {%- for ns_name in p_ns.all_NS() -%}
       from CC import {{ ns_name }}   #XXX# This works, but is a bit simple
-    {%- endfor -%}
+    {% endfor -%}
     {%- endif -%}
 {%- endfor -%}

diff -r fd68262da007 -r 5add0f458207 pytst/writers/RPy/__init__.py
--- a/pytst/writers/RPy/__init__.py	Tue Oct 31 17:40:13 2023 +0100
+++ b/pytst/writers/RPy/__init__.py	Tue Oct 31 20:40:40 2023 +0100
@@ -72,7 +72,7 @@
         logger.info("Saved rendered protocol in: %s", self.gen_file)
 
 
-def _gen_matcher(aigr_mock, td, save_file, out, strip_remarker=False, template=None):
+def _gen_matcher(td, save_file, out, strip_remarker=False, template=None):
     MARKER='#XXX#'
     def match_line(out, ref, strip_remarker=False, filename=None):
         if out == ref:
@@ -97,16 +97,13 @@
 
 @pytest.fixture
 def generatedProtocol_verifier(T_Protocol):
-     def protocol_matcher(aigr_mock, td, save_file=SAVE_FILE, **kw):
-         out = T_Protocol.render(protocols=(aigr_mock,))
-         return _gen_matcher(aigr_mock, td, save_file=save_file, out=out, template=T_Protocol, **kw)
+     def protocol_matcher(aigr_mocks, td, save_file=SAVE_FILE, **kw):
+         if not isinstance(aigr_mocks, (tuple, list)): aigr_mocks= list((aigr_mocks,))
+         out = T_Protocol.render(protocols=aigr_mocks)
+         return _gen_matcher(td, save_file=save_file, out=out, template=T_Protocol, **kw)
      return protocol_matcher
 
 @pytest.fixture
[e-mail](reason="To Busy with other things")
 def generatedMoat_verifier(T_Moat):
-     def protocol_matcher(aigr_mock, td, save_file=SAVE_FILE, strip_remarker=False):
-         out = T_Moat.render(interfaces=(aigr_mock,))
-         return _gen_matcher(aigr_mock, td, save_file, out)
-     return protocol_matcher
-
-
+    assert False, "see above"

diff -r fd68262da007 -r 5add0f458207 pytst/writers/RPy/test_3_SieveProtocols.py
--- a/pytst/writers/RPy/test_3_SieveProtocols.py	Tue Oct 31 17:40:13 2023 +0100
+++ b/pytst/writers/RPy/test_3_SieveProtocols.py	Tue Oct 31 20:40:40 2023 +0100
@@ -19,20 +19,21 @@
 
 
 def test_01_StartSieve(generatedProtocol_verifier):
-    generatedProtocol_verifier(aigr_mock=sieve.StartSieve, td=TstDoubles('protocols/StartSieve'), strip_remarker=True)
+    generatedProtocol_verifier(aigr_mocks=sieve.StartSieve, td=TstDoubles('protocols/StartSieve'), strip_remarker=True)
 
 def test_02_SlowStart(generatedProtocol_verifier):
-    generatedProtocol_verifier(aigr_mock=sieve.SlowStart, td=TstDoubles('protocols/SlowStart'), strip_remarker=True)
+    generatedProtocol_verifier(aigr_mocks=sieve.SlowStart, td=TstDoubles('protocols/SlowStart'), strip_remarker=True)
 
 if False: # SlowStart1 and SimpleSieve are in the same NS, so in the same file
     def test_03_SlowStart1(generatedProtocol_verifier):
-        generatedProtocol_verifier(aigr_mock=sieve.SlowStart_1, td=TstDoubles('protocols/SlowStart_1'), strip_remarker=True)
+        generatedProtocol_verifier(aigr_mocks=sieve.SlowStart_1, td=TstDoubles('protocols/SlowStart_1'), strip_remarker=True)
 
     def test_04_SimpleSieve(generatedProtocol_verifier):
-        generatedProtocol_verifier(aigr_mock=sieve.SimpleSieve, td=TstDoubles('protocols/SimpleSieve'), strip_remarker=True)
+        generatedProtocol_verifier(aigr_mocks=sieve.SimpleSieve, td=TstDoubles('protocols/SimpleSieve'), strip_remarker=True)
 
[e-mail]("ToDo: Merge")
+
[e-mail](reason="ToDo BUSY")
 def test_03_SimpleSieve_withGeneric(generatedProtocol_verifier):
-    generatedProtocol_verifier(aigr_mock=(sieve.SlowStart_1, sieve.SimpleSieve), td=TstDoubles('protocols/SimpleSieve'), strip_remarker=True)
+    generatedProtocol_verifier(aigr_mocks=(sieve.SlowStart_1, sieve.SimpleSieve), td=TstDoubles('protocols/SimpleSieve'), strip_remarker=True)
 
     assert False, "Not yet done"