Commit: 7d5caf66e65b91878bd51a52ac9241cbc56e73bd - CCastle2 (hg)

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

Commit MetaInfo

• Révision: 7d5caf66e65b91878bd51a52ac9241cbc56e73bd (tree)
• l'heure: 2023-09-29 04:44:36
• Auteur: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Message de Log

ASIS/BUSY: Protocol-with-parms: rendering with types seems oke - more tests needed (and a bit of design

Change Summary

• modified: Makefile
• modified: TestDoubles/reference/protocols/StartSieve.rpy
• modified: castle/writers/RPy/templates/ProtocolDataStructures.jinja2
• modified: castle/writers/RPy/templates/protocol.jinja2

Modification

diff -r 1cfd23275f86 -r 7d5caf66e65b Makefile
--- a/Makefile	Thu Sep 28 18:04:14 2023 +0200
+++ b/Makefile	Thu Sep 28 21:44:36 2023 +0200
@@ -1,6 +1,7 @@
 default: all
 
 all: current demo test mutmut pyanalyse XXX missing todo diff_TestDoubles
+
 NOTES: CC2CpyNote
 include Mk/RPy.mk
 
@@ -28,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 1cfd23275f86 -r 7d5caf66e65b TestDoubles/reference/protocols/StartSieve.rpy
--- a/TestDoubles/reference/protocols/StartSieve.rpy	Thu Sep 28 18:04:14 2023 +0200
+++ b/TestDoubles/reference/protocols/StartSieve.rpy	Thu Sep 28 21:44:36 2023 +0200
@@ -3,7 +3,6 @@
 # (C) Albert Mietus, 2023. Part of Castle/CCastle project
 
 ####
-
 from CC import buildin
 from CC import base
 
@@ -19,9 +18,6 @@
 CC_P_StartSieve_newMax = 1
 
 
-
-
-
 cc_P_StartSieve = buildin.CC_B_Protocol(name="StartSieve",
 				kind=buildin.ProtocolKind.Event,
 				inherit_from=cc_P_Protocol

diff -r 1cfd23275f86 -r 7d5caf66e65b castle/writers/RPy/templates/ProtocolDataStructures.jinja2
--- a/castle/writers/RPy/templates/ProtocolDataStructures.jinja2	Thu Sep 28 18:04:14 2023 +0200
+++ b/castle/writers/RPy/templates/ProtocolDataStructures.jinja2	Thu Sep 28 21:44:36 2023 +0200
@@ -3,9 +3,7 @@
 {# parameters: ``protocols``: PTH.Sequence[aigr.EventProtocol]
 #}
 
-{% import "CastleMacros.jinja2" as m %}
-
-{#GAM Note: do not put {% block ... inside the loop - does not work#}
+{%- import "CastleMacros.jinja2" as m -%}
 
 {%- macro Str_or_Type(t) -%}
   {%- if t is string -%}
@@ -15,7 +13,7 @@
   {%- endif -%}
 {%- endmacro -%}
 
-{% for proto in protocols %}
+{%- for proto in protocols %}
   {{- m.ProtocolName(proto.name) }} = buildin.CC_B_Protocol(name="{{ proto.name }}",
   {% if proto.typedParameters  %}
                                 parameters=(

diff -r 1cfd23275f86 -r 7d5caf66e65b castle/writers/RPy/templates/protocol.jinja2
--- a/castle/writers/RPy/templates/protocol.jinja2	Thu Sep 28 18:04:14 2023 +0200
+++ b/castle/writers/RPy/templates/protocol.jinja2	Thu Sep 28 21:44:36 2023 +0200
@@ -8,7 +8,6 @@
 # {#- Hi-lock: (( "{[{%#]\\|[}%#]}"  (0 'markdown-language-keyword-face prepend))) -#}
 # {#- Hi-lock: end -- highlight jinja2 #}
 
-
 {% import "CastleMacros.jinja2" as m1 %}
 {#------------------------------------#}