Commit: 1fe9416066c5c173e52d00091e5e5bb77e701309 - CCastle2 (hg)

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

Commit MetaInfo

• Révision: 1fe9416066c5c173e52d00091e5e5bb77e701309 (tree)
• l'heure: 2023-09-25 23:27:00
• Auteur: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Message de Log

RPY: added ProtocolDataStructures (test&code&template)

Change Summary

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

Modification

diff -r 253881064ed7 -r 1fe9416066c5 castle/writers/RPy/templates/EventIndexes.jinja2
--- a/castle/writers/RPy/templates/EventIndexes.jinja2	Sun Sep 24 00:48:56 2023 +0200
+++ b/castle/writers/RPy/templates/EventIndexes.jinja2	Mon Sep 25 16:27:00 2023 +0200
@@ -4,8 +4,8 @@
 ##
 ## EventIndexes (All {{events|length}} events of {{protocol.name}})
 ##
-{% block EventIndexes %}
-   {% for e in events %}
-     {{- m.EventIndexName(protocol.name, e.name) }} = {{e.indexNo}}
-   {% endfor %}
-{% endblock %}
+
+{% for e in events %}
+  {{- m.EventIndexName(protocol.name, e.name) }} = {{e.indexNo}}
+{% endfor %}
+

diff -r 253881064ed7 -r 1fe9416066c5 castle/writers/RPy/templates/ProtocolDataStructures.jinja2
--- a/castle/writers/RPy/templates/ProtocolDataStructures.jinja2	Sun Sep 24 00:48:56 2023 +0200
+++ b/castle/writers/RPy/templates/ProtocolDataStructures.jinja2	Mon Sep 25 16:27:00 2023 +0200
@@ -2,21 +2,21 @@
 
 {% import "CastleMacros.jinja2" as m %}
 
-{#GAM Note: do not put {% block ... inside the loop - does not work#} 
-{% block ProtocolDataStructures %}
-   {% for p in protocols %}
+{#GAM Note: do not put {% block ... inside the loop - does not work#}
 
-{{- m.ProtocolName(p.name) -}} = buildin.CC_B_Protocol(name="{{ p.name }}",
-                                            kind=buildin.{{p.kind}},
-                                            inherit_from=<ToDo>,
-                                            events = [])
-      {% 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) }} ))
-      {% endfor %} {# event #}
-   {% endfor %} {# protocols #}
-{% endblock %} {# ProtocolDataStructures #}
+{% for p in protocols %}
+  {{- m.ProtocolName(p.name) }} = buildin.CC_B_Protocol(name="{{ p.name }}",
+				kind=buildin.{{p.kind}},
+				inherit_from={{m.ProtocolName(p.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) }} ))
+  {% endfor %} {#- event #}
+
+{% endfor %} {# protocols #}
 
 
+

diff -r 253881064ed7 -r 1fe9416066c5 castle/writers/RPy/templates/protocol.jinja2
--- a/castle/writers/RPy/templates/protocol.jinja2	Sun Sep 24 00:48:56 2023 +0200
+++ b/castle/writers/RPy/templates/protocol.jinja2	Mon Sep 25 16:27:00 2023 +0200
@@ -20,6 +20,10 @@
 #Put the Castle/generated imports here
 {% endblock %}
 
+{% block EventIndexes %}
 {% include 'EventIndexes.jinja2' %}
+{% endblock %}
 
+{% block ProtocolDataStructures %}
 {% include 'ProtocolDataStructures.jinja2' %}
+{% endblock %}

diff -r 253881064ed7 -r 1fe9416066c5 pytst/writers/RPy/test_2_ProtocolDataStructures.py
--- a/pytst/writers/RPy/test_2_ProtocolDataStructures.py	Sun Sep 24 00:48:56 2023 +0200
+++ b/pytst/writers/RPy/test_2_ProtocolDataStructures.py	Mon Sep 25 16:27:00 2023 +0200
@@ -11,14 +11,41 @@
 from . import T_Protocol
 from . import assert_marker
 
+protoData_PreFix = "cc_P_"               #Keep in sync with implementation
+
 @pytest.mark.skip("XXX ToDo:: The MockProtocol should go")
 def test_ToDo(): pass
 
[e-mail]
+def p_1e():
+    "Protocol with 1 event"
+    p = EventProtocol(name="P1", events=(MockEvent(name="e1", indexNo=101),))
+    logger.debug("%s", p)
+    return p
 
-def test_0(T_ProtocolDataStructures):
-    p1=EventProtocol(name="DEMO", events=(MockEvent(name="e1", indexNo=101), MockEvent(name="e2", indexNo=102)))
-    logger.debug(p1)
[e-mail]
+def p_2e_1i(p_1e):
+    "Protocol with 2 events, and 1 inherited; so 3 in total"
+    p = EventProtocol(name="P2", events=(MockEvent(name="e2", indexNo=102), MockEvent(name="e3", indexNo=103)), based_on=p_1e)
+    logger.debug("%s", p)
+    return p
 
-    out = T_ProtocolDataStructures.render(protocols=[p1])
-    logger.info("\n---------- out:: ------------------------\n%s\n--------------------------------", out)
-    assert False, out
+##
+## assert_marker(.. `need`) CALCULATION
+##	1*p  (protocol dataclasses assignment
+##  2*e  (each event: 1 [ <P-name>...append ] + 1 part_of=<P-name>
+##  The  inherited events dont' count
+
+def test_0(T_ProtocolDataStructures, p_1e):
+    out = T_ProtocolDataStructures.render(protocols=[p_1e])
+    logger.debug("\n---------- out:: ------------------------\n%s\n--------------------------------", out)
+
+    assert_marker(protoData_PreFix + 'P1', out, 1+2*1)
+
+
+def test_0n(T_ProtocolDataStructures, p_1e, p_2e_1i):
+    out = T_ProtocolDataStructures.render(protocols=[p_1e, p_2e_1i])
+    logger.debug("\n---------- out:: ------------------------\n%s\n--------------------------------", out)
+
+    assert_marker(protoData_PreFix + 'P2', out, 1+2*2)
+