Commit: d9b4832da639a1d0560cec33fdf6a8476440d9da - CCastle2 (hg)

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

Commit MetaInfo

• Revision: d9b4832da639a1d0560cec33fdf6a8476440d9da (tree)
• Time: 2023-11-21 05:28:20
• Author: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

Is it a hack? Should it be in RenderNS (ToDo), or ... -- Found a solution to render Slowstart_1 correctly

Change Summary

• modified: DocParts/Design/01.Architecture/AIGR_Transformers.puml
• modified: DocParts/Design/50.notes/231117_namespace.rst
• modified: TestDoubles/AIGR/sieve/namespaces.py
• modified: TestDoubles/reference/protocols/simple_sieve.rpy
• modified: castle/writers/RPy/templates/macros/CastleMacros.jinja2
• modified: castle/writers/RPy/templates/parts/protocol_DataStructures.jinja2
• modified: pytst/TD_AIGR/test_2_sieve_NS.py
• modified: pytst/writers/RPy/test_3_SieveProtocols.py

Incremental Difference

diff -r c6035731b985 -r d9b4832da639 DocParts/Design/01.Architecture/AIGR_Transformers.puml
--- a/DocParts/Design/01.Architecture/AIGR_Transformers.puml	Fri Nov 17 15:03:42 2023 +0100
+++ b/DocParts/Design/01.Architecture/AIGR_Transformers.puml	Mon Nov 20 21:28:20 2023 +0100
@@ -6,8 +6,8 @@
 
 ''NOTE: Old RTD/plantuml.1.2020.2.jar syntax!
 
-'!procedure $comp($name)
-!function  $comp($name)
+!procedure $comp($name)
+''!function  $comp($name)
  !$in  = $name + "in"
  !$out = $name + "out"
 
@@ -17,8 +17,8 @@
 
  $in )-- $name
  $name --( $out
-'!endprocedure
-!endfunction
+!endprocedure
+''!endfunction
 
 
 frame "CCastle Compiler" as CCC #c0c0c0 {

diff -r c6035731b985 -r d9b4832da639 DocParts/Design/50.notes/231117_namespace.rst
--- a/DocParts/Design/50.notes/231117_namespace.rst	Fri Nov 17 15:03:42 2023 +0100
+++ b/DocParts/Design/50.notes/231117_namespace.rst	Mon Nov 20 21:28:20 2023 +0100
@@ -1,32 +1,30 @@
 AIGR/SIEVE Namespace analyse
 ============================
 
-.. UML::
+.. uml::
 
    @startuml
    skin rose
-   skinparam style strictuml
-
+   'skinparam style strictuml
    skinparam sequenceMessageAlign left
 
-
    actor Dev
-
+   entity T_Protocol
+   boundary "CastleMacros.jinja2" as m
 
    !procedure $register($ns, $n, $details=0)
        Dev -> $ns             : register($n)
-      $ns o--\o $n : ""$ns._dict[$n]=$n""
+      $ns o--\o $n : ""$ns._dict[$n] := $n""
        activate $ns
 
       !if $details
         group details
           $ns ->  $ns    : _register_2ways()
           $ns-> $n      : register_in_NS()
-          $n o--\o $ns   :""$n._ns=$ns""
         end
+          $n o--\o $ns   :""$n._ns := $ns""
       !else
-          $ns-> $n      : register_in_NS()
-          $n o--\o $ns   :""$n._ns=$ns""
+          $n o--\o $ns   :""$n._ns := $ns""
       !endif
       deactivate $ns
    !endprocedure
@@ -34,13 +32,73 @@
 
    participant "simple_sieve :NS"  as simple_sieve    #LightSkyBlue
    participant "slow_start :NS"    as slow_start      #LightSkyBlue
+   participant "SimpleSieve:P"     as SimpleSieve
    participant "SlowStart_1:P"     as SlowStart_1
-   participant "SimpleSieve:P"     as SimpleSieve
    participant "SlowStart:P"       as SlowStart
 
+   == TestDoubles/AIGR/sieve/namespaces.py ==
+
+   $register(simple_sieve, slow_start,1)
+   alt "old AIGR"
+     $register(simple_sieve, SlowStart_1)
+   else "deleted 'simple_sieve.register(protocols.SlowStart_1)'"
+     note over simple_sieve, SlowStart1 #aqua: Is it a hack? Should it be in RenderNS (ToDo), or ...
+   end
+   $register(simple_sieve, SimpleSieve)
+   $register(slow_start, SlowStart)
+
+   == pytst/writers/RPy/test_3_SieveProtocols.py==
+
 
+   [-> T_Protocol: render((sieve.SlowStart_1, sieve.SimpleSieve))
+   note left: ""inherit_from={{proto.based_on.ns.name}}.{{m.ProtocolName(proto.based_on)}}""
 
-   $register(simple_sieve, slow_start,1)
-   $register(simple_sieve, SlowStart_1)
-   $register(simple_sieve, SimpleSieve)
+   ... sieve.SlowStart_1 ...
+   T_Protocol -> SlowStart_1: based_on()
+   SlowStart_1 o/--x SlowStart: "".based_on""
+   T_Protocol <-- SlowStart_1: SlowStart
+
+   T_Protocol ->  SlowStart: ns()
+   T_Protocol <-- SlowStart: slow_start
+
+   opt "obj 2 str"
+      T_Protocol -> slow_start :name
+      T_Protocol <-- slow_start : "slow_start"
+   end
+
+   T_Protocol -> m: ProtocolName(SlowStart)
+   T_Protocol <--m: ""cc_P_Slowstart""
+   note right:   cc_P_{{Proto.name}}
+   note left of T_Protocol: inherit_from=slow_start.cc_P_SlowStart
+
+   ... sieve.SimpleSieve ...
+   T_Protocol -> SimpleSieve: based_on()
+   SimpleSieve o/--x SlowStart_1: "".based_on""
+   T_Protocol <-- SimpleSieve: SlowStart_1
+
+   T_Protocol ->  SlowStart_1: ns()
+   alt "old AIGR"
+      T_Protocol <-- SlowStart_1: simple_sieve
+      note left: Note: ‘simple_sieve’ is (also) is the current namespace\n\tSo, it should be named
+
+      opt "obj 2 str"
+         T_Protocol ->   simple_sieve : name
+         T_Protocol <--  simple_sieve : "<color:red>simple_sieve</color>"
+      end
+
+      T_Protocol -> m: ProtocolName(SimpleSieve)
+      T_Protocol <--m: ""cc_P_SimpleSieve""
+      note right:   cc_P_{{Proto.name}}
+
+      note left of T_Protocol #orangered: <color:yellow>inherit_from=<color:white>simple_sieve.<color:yellow>cc_P_SimpleSieve
+   else "deteled 'simple_sieve.register(protocols.SlowStart_1)'"
+      T_Protocol <-- SlowStart_1: <NIL>
+
+      T_Protocol -> m: ProtocolName(SimpleSieve)
+      T_Protocol <--m: ""cc_P_SimpleSieve""
+
+      note left of T_Protocol #lime: <color:white>inherit_from=cc_P_SimpleSieve</color>
+   end
+
    @enduml
+

diff -r c6035731b985 -r d9b4832da639 TestDoubles/AIGR/sieve/namespaces.py
--- a/TestDoubles/AIGR/sieve/namespaces.py	Fri Nov 17 15:03:42 2023 +0100
+++ b/TestDoubles/AIGR/sieve/namespaces.py	Mon Nov 20 21:28:20 2023 +0100
@@ -14,7 +14,7 @@
 start_sieve.register(protocols.StartSieve)
 slow_start.register(protocols.SlowStart)
 simple_sieve.register(slow_start)             # Import/use, to be able to refer slow_start.SlowStart
-simple_sieve.register(protocols.SlowStart_1)
+#simple_sieve.register(protocols.SlowStart_1)
 simple_sieve.register(protocols.SimpleSieve)
 
 

diff -r c6035731b985 -r d9b4832da639 TestDoubles/reference/protocols/simple_sieve.rpy
--- a/TestDoubles/reference/protocols/simple_sieve.rpy	Fri Nov 17 15:03:42 2023 +0100
+++ b/TestDoubles/reference/protocols/simple_sieve.rpy	Mon Nov 20 21:28:20 2023 +0100
@@ -8,8 +8,6 @@
 #Put the Castle/generated imports here
 from CC import base
 from CC import slow_start
-from CC import base                                         #XXX# twice is not needed, but allowed
-from CC import slow_start                                   #XXX# twice is not needed, but allowed
 
 
 

diff -r c6035731b985 -r d9b4832da639 castle/writers/RPy/templates/macros/CastleMacros.jinja2
--- a/castle/writers/RPy/templates/macros/CastleMacros.jinja2	Fri Nov 17 15:03:42 2023 +0100
+++ b/castle/writers/RPy/templates/macros/CastleMacros.jinja2	Mon Nov 20 21:28:20 2023 +0100
@@ -3,7 +3,7 @@
 {# See:: http://docideas.mietus.nl/en/default/CCastle/3.Design/B.Workshop/rPY/8.RPY_Jinja.html #}
 
 
-{%macro ProtocolName(Proto)			-%}  cc_P_{{Proto.name}}			{%- endmacro %}
+{%macro ProtocolName(Proto)			-%}  cc_P_{{Proto.name}}		{%- endmacro %}
 {%macro EventIndexName(Proto, Event)		-%}  CC_P_{{Proto.name}}_{{Event.name}}	{%- endmacro %}
 {%macro comp_interface_Name(Comp) 		-%}  cc_CI_{{Comp.name}}      		{%- endmacro %}
 {%macro comp_component_Name(Comp)		-%}  CC_{{Comp.name}}         		{%- endmacro %}

diff -r c6035731b985 -r d9b4832da639 castle/writers/RPy/templates/parts/protocol_DataStructures.jinja2
--- a/castle/writers/RPy/templates/parts/protocol_DataStructures.jinja2	Fri Nov 17 15:03:42 2023 +0100
+++ b/castle/writers/RPy/templates/parts/protocol_DataStructures.jinja2	Mon Nov 20 21:28:20 2023 +0100
@@ -13,6 +13,17 @@
   {%- endif -%}
 {%- endmacro -%}
 
+
+{%- macro DotOrNot(opt_namespace, id) -%}
+  {%- if opt_namespace|length -%}
+    {{ opt_namespace }}.{{ id }}
+  {%- else -%}
+    {{ id }}
+  {%- endif -%}
+{%- endmacro -%}
+
+
+
 {%- for proto in protocols %}
 ##
 ## The protocol Data Definitions for {{proto.name}} -- with {{proto.events|length}} events
@@ -28,7 +39,8 @@
 
   {% endif %}
                                 kind=buildin.{{proto.kind}},
-                                inherit_from={{proto.based_on.ns.name}}.{{m.ProtocolName(proto.based_on)}}, #XXX# NSa & NSb
+                                inherit_from=
+                                {{- DotOrNot( proto.based_on.ns.name , m.ProtocolName(proto.based_on) ) -}}, #XXX# NSa & NSb
 {#
   * NSa:        Need cleanup
   * NSb: (Prio) Inserts "own" NS, which is wrong

diff -r c6035731b985 -r d9b4832da639 pytst/TD_AIGR/test_2_sieve_NS.py
--- a/pytst/TD_AIGR/test_2_sieve_NS.py	Fri Nov 17 15:03:42 2023 +0100
+++ b/pytst/TD_AIGR/test_2_sieve_NS.py	Mon Nov 20 21:28:20 2023 +0100
@@ -4,6 +4,7 @@
    See file:///Users/albert/work/DocIdeas,hg/__result/html/CCastle/HACK/DocParts/Design/231016_NS.html
    (not published yet -- see .../DocParts/Design/231016_NS.rst for source)"""
 
+import logging; logger = logging.getLogger(__name__)
 import pytest
 
 import castle.aigr as aigr
@@ -32,7 +33,8 @@
 
 def test_simple_sieve_has_SimpleSieve_and_SpecialiseGeneric():
     ns = namespaces.simple_sieve
-    verify_NS(ns, "simple_sieve", ["SlowStart_1", "SimpleSieve"])
+    #verify_NS(ns, "simple_sieve", ["SlowStart_1", "SimpleSieve"])
+    verify_NS(ns, "simple_sieve", ["SimpleSieve"])
 
 
 def test_top():

diff -r c6035731b985 -r d9b4832da639 pytst/writers/RPy/test_3_SieveProtocols.py
--- a/pytst/writers/RPy/test_3_SieveProtocols.py	Fri Nov 17 15:03:42 2023 +0100
+++ b/pytst/writers/RPy/test_3_SieveProtocols.py	Mon Nov 20 21:28:20 2023 +0100
@@ -9,8 +9,8 @@
 """
 
 import logging; logger = logging.getLogger(__name__)
+import pytest
 
-import pytest
 from TestDoubles.AIGR import sieve
 from . import TstDoubles, generatedProtocol_verifier
 ##Note: T_* are used in **_verifier; but need to be in this scope (or pytest can't find it)
@@ -24,7 +24,6 @@
 def test_02_SlowStart(generatedProtocol_verifier):
     generatedProtocol_verifier(aigr_mocks=sieve.SlowStart, td=TstDoubles('protocols/slow_start'), strip_remarker=True)
 
[e-mail](reason="ToDo BUSY")
 def test_03_SimpleSieve_withGeneric(generatedProtocol_verifier):
     """``SimpleSieve`` depend on the instantiated generic ``SlowStart_1``.
         They are in the same namespace and (so) need to be rendered in the same file.