Commit: 0631b1df53f4594dc96c49ec0d3ea3fcc04c3145 - CCastle2 (hg)

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

Commit MetaInfo

• Révision: 0631b1df53f4594dc96c49ec0d3ea3fcc04c3145 (tree)
• l'heure: 2023-10-06 22:47:43
• Auteur: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Message de Log

Refacored RPy/Jinja-templates: split-off _header castle/writers/RPy/

Change Summary

• modified: Makefile
• modified: TestDoubles/AIGR/protocols/Sieve.py
• modified: castle/writers/RPy/templates/protocol.jinja2
• modified: pytst/writers/RPy/__init__.py
• modified: pytst/writers/RPy/test_99_SieveMoats.py
• add: castle/writers/RPy/templates/_header.jinja2
• add: castle/writers/RPy/templates/moat.jinja2

Modification

diff -r 216c1ade7641 -r 0631b1df53f4 Makefile
--- a/Makefile	Fri Oct 06 13:38:08 2023 +0200
+++ b/Makefile	Fri Oct 06 15:47:43 2023 +0200
@@ -17,11 +17,11 @@
 	pytst/writers/RPy/test_0_templating.py			\
 	pytst/writers/RPy/test_1_EventIndexes.py		\
 	pytst/writers/RPy/test_2_ProtocolDataStructures.py	\
+	pytst/aigr/test_2c_GenericProtocols.py			\
+	pytst/aigr/test_0_aid.py				\
 #
 rPY_CURRENT = \
 	pytst/writers/RPy/test_99_SieveMoats.py			\
-	pytst/aigr/test_2c_GenericProtocols.py			\
-	pytst/aigr/test_0_aid.py				\
 #
 CC2CPy_TODO = \
 	pytst/writers/RPy/test_999.py 				\

diff -r 216c1ade7641 -r 0631b1df53f4 TestDoubles/AIGR/protocols/Sieve.py
--- a/TestDoubles/AIGR/protocols/Sieve.py	Fri Oct 06 13:38:08 2023 +0200
+++ b/TestDoubles/AIGR/protocols/Sieve.py	Fri Oct 06 15:47:43 2023 +0200
@@ -3,7 +3,6 @@
 from castle.aigr.aid import TypedParameter
 from castle.aigr import EventProtocol, Event
 
-import pytest
 
 StartSieve = EventProtocol('StartSieve',
                               events=[

diff -r 216c1ade7641 -r 0631b1df53f4 castle/writers/RPy/templates/_header.jinja2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/castle/writers/RPy/templates/_header.jinja2	Fri Oct 06 15:47:43 2023 +0200
@@ -0,0 +1,5 @@
+# -*- python -*-
+# Generated (R)Python file
+# (C) Albert Mietus, 2023. Part of Castle/CCastle project
+
+

diff -r 216c1ade7641 -r 0631b1df53f4 castle/writers/RPy/templates/moat.jinja2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/castle/writers/RPy/templates/moat.jinja2	Fri Oct 06 15:47:43 2023 +0200
@@ -0,0 +1,1 @@
+

diff -r 216c1ade7641 -r 0631b1df53f4 castle/writers/RPy/templates/protocol.jinja2
--- a/castle/writers/RPy/templates/protocol.jinja2	Fri Oct 06 13:38:08 2023 +0200
+++ b/castle/writers/RPy/templates/protocol.jinja2	Fri Oct 06 15:47:43 2023 +0200
@@ -1,19 +1,15 @@
-# -*- python -*-
-# Generated (R)Python file
-# (C) Albert Mietus, 2023. Part of Castle/CCastle project
-
-# {#- Hi-lock: (( "{{\\(.*\\)}}"     (1 'font-lock-constant-face        prepend))) -#}
-# {#- Hi-lock: (( "{%\\(.*\\)%}"     (1 'font-lock-function-name-face   prepend))) -#}
-# {#- Hi-lock: (( "{#\\(.*\\)\\(#\\)}"    (1 'font-lock-preprocessor-face    prepend))) -#} {# regexp: '(#)}' to escape for rendering
-# {#- Hi-lock: (( "{[{%#]\\|[}%#]}"  (0 'markdown-language-keyword-face prepend))) -#}
-# {#- Hi-lock: end -- highlight jinja2 #}
-
-{% import "CastleMacros.jinja2" as m1 %}
+{% include '_header.jinja2' %}
+{#--------------------------#}
+{% import 'CastleMacros.jinja2' as m1 %}
 {#------------------------------------#}
 
+
 {# These imports are static #}
+{% block static_imports %}
+####
 from CC import buildin
 from CC import base
+{% endblock %}
 
 {% block imports %}
 #Put the Castle/generated imports here

diff -r 216c1ade7641 -r 0631b1df53f4 pytst/writers/RPy/__init__.py
--- a/pytst/writers/RPy/__init__.py	Fri Oct 06 13:38:08 2023 +0200
+++ b/pytst/writers/RPy/__init__.py	Fri Oct 06 15:47:43 2023 +0200
@@ -14,6 +14,10 @@
     return RPy.Template("protocol.jinja2")
 
 @pytest.fixture
+def T_Moat():
+    return RPy.Template("moat.jinja2")
+
[e-mail]
 def T_EventIndexes():
     return RPy.Template("EventIndexes.jinja2")
 
@@ -69,9 +73,7 @@
 
 def _gen_matcher(aigr_mock, td, save_file, out):
     logger.debug("---------- out: (%s)----------\n%s", aigr_mock, out)
-    if save_file:
-        td.write_gen(out)
-
+    if save_file: td.write_gen(out)
     ref = td.read_ref()
     try:
         #assert line by line: gives better feedback when they do not match
@@ -85,7 +87,14 @@
 @pytest.fixture
 def generatedProtocol_verifier(T_Protocol):
      def protocol_matcher(aigr_mock, td, save_file=False):
-         out = T_Protocol.render(protocols=(aigr_mock,)) 
+         out = T_Protocol.render(protocols=(aigr_mock,))
+         return _gen_matcher(aigr_mock, td, save_file, out)
+     return protocol_matcher
+
[e-mail]
+def generatedMoat_verifier(T_Moat):
+     def protocol_matcher(aigr_mock, td, save_file=False):
+         out = T_Moat.render(XXXX=aigr_mock)
          return _gen_matcher(aigr_mock, td, save_file, out)
      return protocol_matcher
 

diff -r 216c1ade7641 -r 0631b1df53f4 pytst/writers/RPy/test_99_SieveMoats.py
--- a/pytst/writers/RPy/test_99_SieveMoats.py	Fri Oct 06 13:38:08 2023 +0200
+++ b/pytst/writers/RPy/test_99_SieveMoats.py	Fri Oct 06 15:47:43 2023 +0200
@@ -3,9 +3,9 @@
 
 import pytest
 from TestDoubles.AIGR.protocols import Sieve
-from . import TstDoubles, generatedProtocol_verifier, T_Protocol
-##Note: T_Protocol is used in generatedProtocol_verifier; but need to be in this scope
-
+from . import TstDoubles, generatedProtocol_verifier, generatedMoat_verifier
+##Note: T_* are used in **_verifier; but need to be in this scope (or pytest can't find it)
+from . import T_Protocol, T_Moat
 
 SAVE_FILE=True
 
@@ -18,4 +18,7 @@
 def test_03_SimpleSieve(generatedProtocol_verifier):
     generatedProtocol_verifier(aigr_mock=Sieve.SimpleSieve, td=TstDoubles('protocols/SimpleSieve'), save_file=SAVE_FILE)
 
[e-mail]
+def test_04_SieveMoat(generatedMoat_verifier):
+    assert False