Commit: 655b2a8b6a00156540ebd742df1efeedb463dd95 - CCastle2 (hg)

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

Commit MetaInfo

• Revisión: 655b2a8b6a00156540ebd742df1efeedb463dd95 (tree)
• Tiempo: 2023-10-03 03:48:31
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

ASIS/BUSY: Protocol-with-parms: SlowStart & StartSieve reference(s) added (TDD:Oke)

Cambiar Resumen

• modified: Makefile
• modified: TestDoubles/AIGR/protocols/Sieve.py
• modified: TestDoubles/reference/protocols/SlowStart.rpy
• modified: TestDoubles/reference/protocols/StartSieve.rpy
• modified: castle/writers/RPy/templates/ProtocolDataStructures.jinja2
• modified: pytst/writers/RPy/test_99_SieveMoats.py

Diferencia incremental

diff -r 7e2dbbfb3f5a -r 655b2a8b6a00 Makefile
--- a/Makefile	Fri Sep 29 12:09:40 2023 +0200
+++ b/Makefile	Mon Oct 02 20:48:31 2023 +0200
@@ -29,7 +29,7 @@
 include Mk/testing.mk
 include Mk/helpful.mk
 
-diff_TestDoubles: 
+diff_TestDoubles:
 	diff -w -rs TestDoubles/reference/ TestDoubles/_generated/
 
 missing: missing_visitor missing_serialization

diff -r 7e2dbbfb3f5a -r 655b2a8b6a00 TestDoubles/AIGR/protocols/Sieve.py
--- a/TestDoubles/AIGR/protocols/Sieve.py	Fri Sep 29 12:09:40 2023 +0200
+++ b/TestDoubles/AIGR/protocols/Sieve.py	Mon Oct 02 20:48:31 2023 +0200
@@ -15,7 +15,6 @@
                               typedParameters=(TypedParameter(name='queue_max', type=int),),
                               events=[
                                    Event(name='setMax', return_type=None, typedParameters=(TypedParameter(name='queue_max', type=int),))],
-                              #parameters
                               )
 
 

diff -r 7e2dbbfb3f5a -r 655b2a8b6a00 TestDoubles/reference/protocols/SlowStart.rpy
--- a/TestDoubles/reference/protocols/SlowStart.rpy	Fri Sep 29 12:09:40 2023 +0200
+++ b/TestDoubles/reference/protocols/SlowStart.rpy	Mon Oct 02 20:48:31 2023 +0200
@@ -3,7 +3,6 @@
 # (C) Albert Mietus, 2023. Part of Castle/CCastle project
 
 ####
-
 from CC import buildin
 from CC import base
 
@@ -18,14 +17,15 @@
 CC_P_SlowStart_setMax = 0
 
 
-
+cc_P_SlowStart = buildin.CC_B_Protocol(name="SlowStart",
+                                parameters=(
+                                    ('queue_max', int),
+                                ),
+                                kind=buildin.ProtocolKind.Event,
+                                inherit_from=cc_P_Protocol,
+                                events=[])
 
-cc_P_SlowStart = buildin.CC_B_Protocol(name = "SlowStart",
-               parameters = [('queue_max', int)],
-               kind = buildin.ProtocolKind.Event,
-               inherit_from=cc_P_Protocol
-               events = [])
-cc_P_SlowStart.events.append( buildin.CC_B_P_EventID(name="setMax",
-              seqNo=CC_P_SlowStart_setMax
-              parameters = [('queue_max', int)],
-              part_of=cc_P_SlowStart))
+cc_P_SlowStart.events.append(buildin.CC_B_P_EventID(name="setMax",
+                                seqNo=CC_P_SlowStart_setMax,
+                                part_of=cc_P_SlowStart))
+

diff -r 7e2dbbfb3f5a -r 655b2a8b6a00 TestDoubles/reference/protocols/StartSieve.rpy
--- a/TestDoubles/reference/protocols/StartSieve.rpy	Fri Sep 29 12:09:40 2023 +0200
+++ b/TestDoubles/reference/protocols/StartSieve.rpy	Mon Oct 02 20:48:31 2023 +0200
@@ -19,15 +19,14 @@
 
 
 cc_P_StartSieve = buildin.CC_B_Protocol(name="StartSieve",
-				kind=buildin.ProtocolKind.Event,
-				inherit_from=cc_P_Protocol
-				events = [])
+                                kind=buildin.ProtocolKind.Event,
+                                inherit_from=cc_P_Protocol,
+                                events=[])
+
 cc_P_StartSieve.events.append(buildin.CC_B_P_EventID(name="runTo",
-				seqNo=CC_P_StartSieve_runTo,
-				part_of=cc_P_StartSieve ))
+                                seqNo=CC_P_StartSieve_runTo,
+                                part_of=cc_P_StartSieve))
 cc_P_StartSieve.events.append(buildin.CC_B_P_EventID(name="newMax",
-				seqNo=CC_P_StartSieve_newMax,
-				part_of=cc_P_StartSieve ))
+                                seqNo=CC_P_StartSieve_newMax,
+                                part_of=cc_P_StartSieve))
 
- 
-

diff -r 7e2dbbfb3f5a -r 655b2a8b6a00 castle/writers/RPy/templates/ProtocolDataStructures.jinja2
--- a/castle/writers/RPy/templates/ProtocolDataStructures.jinja2	Fri Sep 29 12:09:40 2023 +0200
+++ b/castle/writers/RPy/templates/ProtocolDataStructures.jinja2	Mon Oct 02 20:48:31 2023 +0200
@@ -18,21 +18,19 @@
   {% if proto.typedParameters  %}
                                 parameters=(
     {% for parm in proto.typedParameters %}
-                                    ('{{ parm.name}}' , {{ Str_or_Type(parm.type) }}),
+                                    ('{{ parm.name}}', {{ Str_or_Type(parm.type) }}),
     {% endfor %}
-                                ), ### XXX ToDo: parms: tuple, namedType, strings, ... (see event -- use macro?)
+                                ), {#- XXX ToDo: parms: tuple, namedType, strings, ... (see event -- use macro?) #}
+
   {% endif %}
-				kind=buildin.{{proto.kind}},
-				inherit_from={{m.ProtocolName(proto.based_on.name)}}
-				events = []) {#- filled in below -- see design notes // limitation #}
+                                kind=buildin.{{proto.kind}},
+                                inherit_from={{m.ProtocolName(proto.based_on.name)}},
+                                events=[])
 
   {% for e in proto.events %}
     {{- m.ProtocolName(proto.name) }}.events.append(buildin.CC_B_P_EventID(name="{{- e.name -}}",
-				seqNo={{- m.EventIndexName(proto.name, e.name) }},
-				part_of={{ m.ProtocolName(proto.name) }} ))
+                                seqNo={{- m.EventIndexName(proto.name, e.name) }},
+                                part_of={{ m.ProtocolName(proto.name) }}))
   {% endfor %} {#- event #}
 
-{% endfor %} {# protocols #}
-
-
-
+{% endfor %} {#- protocols #}

diff -r 7e2dbbfb3f5a -r 655b2a8b6a00 pytst/writers/RPy/test_99_SieveMoats.py
--- a/pytst/writers/RPy/test_99_SieveMoats.py	Fri Sep 29 12:09:40 2023 +0200
+++ b/pytst/writers/RPy/test_99_SieveMoats.py	Mon Oct 02 20:48:31 2023 +0200
@@ -24,7 +24,7 @@
     assert filecmp.cmp(gen_file, ref_file), f"The generated file ({gen_file}) and the reference ({ref_file}) are not the same"
 
 
[e-mail]("Need to test AIGR.protocols:: parameters first (and writer for it to)")
+#@pytest.mark.skip("Need to test AIGR.protocols:: parameters first (and writer for it to)")
 def test_03_SlowStart(T_Protocol):
     ref_file = 'TestDoubles/reference/protocols/SlowStart.rpy'
     gen_file = 'Testdoubles/_generated/protocols/SlowStart.rpy'