Commit: ef8e21a1d01e06ea2d0c9e2c93fbde909dd39c59 - CCastle2 (hg)

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

Commit MetaInfo

• Revision: ef8e21a1d01e06ea2d0c9e2c93fbde909dd39c59 (tree)
• Zeit: 2023-10-06 23:03:43
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

Refacrored RPy-templated: split into subdirs

Ändern Zusammenfassung

• modified: castle/writers/RPy/templates/protocol.jinja2
• add: castle/writers/RPy/templates/macros/CastleMacros.jinja2
• add: castle/writers/RPy/templates/parts/protocol_DataStructures.jinja2
• add: castle/writers/RPy/templates/parts/protocol_EventIndexes.jinja2
• delete: castle/writers/RPy/templates/CastleMacros.jinja2
• delete: castle/writers/RPy/templates/EventIndexes.jinja2
• delete: castle/writers/RPy/templates/ProtocolDataStructures.jinja2

Diff

diff -r 0631b1df53f4 -r ef8e21a1d01e castle/writers/RPy/templates/CastleMacros.jinja2
--- a/castle/writers/RPy/templates/CastleMacros.jinja2	Fri Oct 06 15:47:43 2023 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-{#- (C) Albert Mietus, 2023. Part of Castle/CCastle project -#}
-
-{# See:: http://docideas.mietus.nl/en/default/CCastle/3.Design/B.Workshop/rPY/8.RPY_Jinja.html #}
-
-
-{%macro ProtocolName(ProtoName) -%}
-   cc_P_{{ProtoName}}
-{%- endmacro %}
-
-{%macro EventIndexName(ProtoName, EventName) -%}
-   CC_P_{{ProtoName}}_{{EventName}}
-{%- endmacro %}
-
-
-

diff -r 0631b1df53f4 -r ef8e21a1d01e castle/writers/RPy/templates/EventIndexes.jinja2
--- a/castle/writers/RPy/templates/EventIndexes.jinja2	Fri Oct 06 15:47:43 2023 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-{#- (C) Albert Mietus, 2023. Part of Castle/CCastle project -#}
-{% import "CastleMacros.jinja2" as m %}
-
-{# parameters:
-- ``events``  : PTH.Sequence[aigr.Event]
-- ``protocol``: aigr.EventProtocol
-#}
-
-{# Note: the caller (:file:`protocol.jinja2` will loop over the sequence of protocols.
-         Or, should we do it here? #}
-##
-## EventIndexes (All {{events|length}} events of {{protocol.name}})
-##
-
-{% for e in events %}
-  {{- m.EventIndexName(protocol.name, e.name) }} = {{ protocol.eventIndex(e)}}
-{% endfor %}
-

diff -r 0631b1df53f4 -r ef8e21a1d01e castle/writers/RPy/templates/ProtocolDataStructures.jinja2
--- a/castle/writers/RPy/templates/ProtocolDataStructures.jinja2	Fri Oct 06 15:47:43 2023 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-{# (C) Albert Mietus, 2023. Part of Castle/CCastle project #}
-
-{# parameters: ``protocols``: PTH.Sequence[aigr.EventProtocol]
-#}
-
-{%- import "CastleMacros.jinja2" as m -%}
-
-{%- macro Str_or_Type(t) -%}
-  {%- if t is string -%}
-    "{{t}}"
-  {%- else -%}
-    {{t.__name__}}
-  {%- endif -%}
-{%- endmacro -%}
-
-{%- 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}}', {{ Str_or_Type(parm.type) }}),
-    {% endfor %}
-                                ), {#- XXX ToDo: parms: tuple, namedType, strings, ... (see event -- use macro?) #}
-
-  {% endif %}
-                                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) }}))
-  {% endfor %} {#- event #}
-
-{% endfor %} {#- protocols #}

diff -r 0631b1df53f4 -r ef8e21a1d01e castle/writers/RPy/templates/macros/CastleMacros.jinja2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/castle/writers/RPy/templates/macros/CastleMacros.jinja2	Fri Oct 06 16:03:43 2023 +0200
@@ -0,0 +1,15 @@
+{#- (C) Albert Mietus, 2023. Part of Castle/CCastle project -#}
+
+{# See:: http://docideas.mietus.nl/en/default/CCastle/3.Design/B.Workshop/rPY/8.RPY_Jinja.html #}
+
+
+{%macro ProtocolName(ProtoName) -%}
+   cc_P_{{ProtoName}}
+{%- endmacro %}
+
+{%macro EventIndexName(ProtoName, EventName) -%}
+   CC_P_{{ProtoName}}_{{EventName}}
+{%- endmacro %}
+
+
+

diff -r 0631b1df53f4 -r ef8e21a1d01e castle/writers/RPy/templates/parts/protocol_DataStructures.jinja2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/castle/writers/RPy/templates/parts/protocol_DataStructures.jinja2	Fri Oct 06 16:03:43 2023 +0200
@@ -0,0 +1,36 @@
+{# (C) Albert Mietus, 2023. Part of Castle/CCastle project #}
+
+{# parameters: ``protocols``: PTH.Sequence[aigr.EventProtocol]
+#}
+{% import 'macros/CastleMacros.jinja2' as m %}
+{#------------------------------------------#}
+
+{%- macro Str_or_Type(t) -%}
+  {%- if t is string -%}
+    "{{t}}"
+  {%- else -%}
+    {{t.__name__}}
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- 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}}', {{ Str_or_Type(parm.type) }}),
+    {% endfor %}
+                                ), {#- XXX ToDo: parms: tuple, namedType, strings, ... (see event -- use macro?) #}
+
+  {% endif %}
+                                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) }}))
+  {% endfor %} {#- event #}
+
+{% endfor %} {#- protocols #}

diff -r 0631b1df53f4 -r ef8e21a1d01e castle/writers/RPy/templates/parts/protocol_EventIndexes.jinja2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/castle/writers/RPy/templates/parts/protocol_EventIndexes.jinja2	Fri Oct 06 16:03:43 2023 +0200
@@ -0,0 +1,18 @@
+{#- (C) Albert Mietus, 2023. Part of Castle/CCastle project -#}
+{% import 'macros/CastleMacros.jinja2' as m %}
+
+{# parameters:
+- ``events``  : PTH.Sequence[aigr.Event]
+- ``protocol``: aigr.EventProtocol
+#}
+
+{# Note: the caller (:file:`protocol.jinja2` will loop over the sequence of protocols.
+         Or, should we do it here? #}
+##
+## EventIndexes (All {{events|length}} events of {{protocol.name}})
+##
+
+{% for e in events %}
+  {{- m.EventIndexName(protocol.name, e.name) }} = {{ protocol.eventIndex(e)}}
+{% endfor %}
+

diff -r 0631b1df53f4 -r ef8e21a1d01e castle/writers/RPy/templates/protocol.jinja2
--- a/castle/writers/RPy/templates/protocol.jinja2	Fri Oct 06 15:47:43 2023 +0200
+++ b/castle/writers/RPy/templates/protocol.jinja2	Fri Oct 06 16:03:43 2023 +0200
@@ -1,7 +1,5 @@
 {% include '_header.jinja2' %}
 {#--------------------------#}
-{% import 'CastleMacros.jinja2' as m1 %}
-{#------------------------------------#}
 
 
 {# These imports are static #}
@@ -18,10 +16,10 @@
 {% block EventIndexes %}
 {% for protocol in protocols %}
    {% set events = protocol.events %}
-   {% include 'EventIndexes.jinja2' %}
+   {% include 'parts/protocol_EventIndexes.jinja2' %}
 {% endfor %}
 {% endblock %}
 
 {% block ProtocolDataStructures %}
-{% include 'ProtocolDataStructures.jinja2' %}
+{% include 'parts/protocol_DataStructures.jinja2' %}
 {% endblock %}