Commit: 719f51fc5c87629725514f8b5caf3a2e81c32c3c - CCastle2 (hg)

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

Commit MetaInfo

• Révision: 719f51fc5c87629725514f8b5caf3a2e81c32c3c (tree)
• l'heure: 2023-09-28 23:51:22
• Auteur: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Message de Log

ASIS/BUSY: Protocol-with-parms: draft rendering

Change Summary

• modified: Makefile
• modified: castle/writers/RPy/templates/ProtocolDataStructures.jinja2
• modified: pytst/writers/RPy/test_2_ProtocolDataStructures.py

Modification

diff -r 4a6cf7249f77 -r 719f51fc5c87 Makefile
--- a/Makefile	Thu Sep 28 15:15:48 2023 +0200
+++ b/Makefile	Thu Sep 28 16:51:22 2023 +0200
@@ -16,7 +16,6 @@
 	pytst/writers/RPy/test_1_EventIndexes.py		\
 #
 rPY_CURRENT = \
-	pytst/aigr/test_2b_protocol.py				\
 	pytst/writers/RPy/test_2_ProtocolDataStructures.py	\
 
 #

diff -r 4a6cf7249f77 -r 719f51fc5c87 castle/writers/RPy/templates/ProtocolDataStructures.jinja2
--- a/castle/writers/RPy/templates/ProtocolDataStructures.jinja2	Thu Sep 28 15:15:48 2023 +0200
+++ b/castle/writers/RPy/templates/ProtocolDataStructures.jinja2	Thu Sep 28 16:51:22 2023 +0200
@@ -7,19 +7,23 @@
 
 {#GAM Note: do not put {% block ... inside the loop - does not work#}
 
-{% for p in protocols %}
-  {{- m.ProtocolName(p.name) }} = buildin.CC_B_Protocol(name="{{ p.name }}",
-  {% if p.typedParameters  %}
-                                parameters= XXX {{ p.typedParameters }}
+{% for proto in protocols %}
+  {{- m.ProtocolName(proto.name) }} = buildin.CC_B_Protocol(name="{{ proto.name }}",
+  {% if proto.typedParameters  %}
+                                parameters=(
+    {%- for parm in proto.typedParameters -%}
+                                    ({{ parm.name}} , {{parm.type}}), 
+    {%- endfor -%}
+                                ), # XXX ToDo: parms: (seq of] typle, namedType,  strings?
   {% endif %}
-				kind=buildin.{{p.kind}},
-				inherit_from={{m.ProtocolName(p.based_on.name)}}
+				kind=buildin.{{proto.kind}},
+				inherit_from={{m.ProtocolName(proto.based_on.name)}}
 				events = []) {#- filled in below -- see design notes // limitation #}
 
-  {% for e in p.events %}
-    {{- m.ProtocolName(p.name) }}.events.append(buildin.CC_B_P_EventID(name="{{- e.name -}}",
-				seqNo={{- m.EventIndexName(p.name, e.name) }},
-				part_of={{ m.ProtocolName(p.name) }} ))
+  {% 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) }} ))
   {% endfor %} {#- event #}
 
 {% endfor %} {# protocols #}

diff -r 4a6cf7249f77 -r 719f51fc5c87 pytst/writers/RPy/test_2_ProtocolDataStructures.py
--- a/pytst/writers/RPy/test_2_ProtocolDataStructures.py	Thu Sep 28 15:15:48 2023 +0200
+++ b/pytst/writers/RPy/test_2_ProtocolDataStructures.py	Thu Sep 28 16:51:22 2023 +0200
@@ -12,8 +12,6 @@
 
 protoData_PreFix = "cc_P_"               #Keep in sync with implementation
 
[e-mail]("XXX ToDo:: The MockProtocol should go")
-def test_ToDo(): pass
 
 @pytest.fixture
 def p_1e():
@@ -62,10 +60,39 @@
 
     assert_marker(protoData_PreFix + 'P2', out, 1+2*2)
 
[e-mail]("Need to test AIGR.protocols:: parameters first")
+
+def test_protocol_with_NoParms_a(T_ProtocolDataStructures):
+    "An (event) protocol without parameters does not render the parameter line"
+    out = T_ProtocolDataStructures.render(protocols=[EventProtocol(name="NoParms_", events=[])])
+    assert 'parameters' not in out
+
+def test_protocol_with_NoParms_b(T_ProtocolDataStructures):
+    out = T_ProtocolDataStructures.render(protocols=[EventProtocol(name="NoParms",
+                                                                   events=[],
+                                                                   typedParameters=[])])
+    assert 'parameters' not in out
+
+def test_protocol_with_1parm(T_ProtocolDataStructures):
+    out = T_ProtocolDataStructures.render(protocols=[EventProtocol(name="With_1_Parm",
+                                                                       events=[],
+                                                                       typedParameters=[TypedParameter(name='a_parm', type="A_Type")])])
+    logger.debug("\n---------- out:: ------------------------\n%s\n--------------------------------", out)
+    assert 'parameters=' in out
+    assert False, "check rendering"
+
 def test_protocol_with_parms(T_ProtocolDataStructures):
-    "An (event) protocol can have parameters itself (see SlowStart)"
-    assert False
+    out = T_ProtocolDataStructures.render(protocols=[EventProtocol(name="WithParms",
+                                                                       events=[],
+                                                                       typedParameters=[
+                                                                           TypedParameter(name='a_parm', type="A_Type"),
+                                                                           TypedParameter(name='b_parm', type=int),
+                                                                           TypedParameter(name='c_parm', type=float),
+                                                                           TypedParameter(name='1', type=int)
+                                                                           ])])
+    logger.debug("\n---------- out:: ------------------------\n%s\n--------------------------------", out)
+    assert 'parameters=' in out
+    assert False, "check rendering"
+
 
 
 def test_ProtocolDataStructures_in_protocol(T_Protocol, p_1e, p_2e_1i):