Commit: b9c8c8df87927d66b7a7903b9b618bfb6d8ef7f7 - CCastle2 (hg)

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

Commit MetaInfo

• Revision: b9c8c8df87927d66b7a7903b9b618bfb6d8ef7f7 (tree)
• Zeit: 2023-02-05 03:35:53
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

asis

Ändern Zusammenfassung

• modified: Makefile
• modified: castle/writers/CC2Cpy/Component.py
• modified: castle/writers/CC2Cpy/Protocol.py
• modified: pytst/writers/CC2Cpy/test_3a_CompPort.py

Diff

diff -r de24bfc5c82a -r b9c8c8df8792 Makefile
--- a/Makefile	Sat Feb 04 00:47:31 2023 +0100
+++ b/Makefile	Sat Feb 04 19:35:53 2023 +0100
@@ -6,7 +6,6 @@
 	pytst/writers/CC2Cpy/test_2a_groundwork.py		\
 	pytst/writers/CC2Cpy/test_2b_EventProtocol.py		\
 	pytst/writers/CC2Cpy/test_3a_CompPort.py		\
-
 #
 CURRENT_TESTS = \
 	pytst/writers/CC2Cpy/test_3b_CompInterface.py		\

diff -r de24bfc5c82a -r b9c8c8df8792 castle/writers/CC2Cpy/Component.py
--- a/castle/writers/CC2Cpy/Component.py	Sat Feb 04 00:47:31 2023 +0100
+++ b/castle/writers/CC2Cpy/Component.py	Sat Feb 04 19:35:53 2023 +0100
@@ -10,15 +10,15 @@
 CC_Component: TypeAlias = 'CC_Component' # Forward ref                          # pragma: no mutate
 
 class CC_PortDirection(Enum):
-    Unknown = CC_B_PortDirectionIs_UNKNOWN   = 0
-    In      = CC_B_PortDirectionIs_in        = 1
-    Out     = CC_B_PortDirectionIs_out       = 2
-    BiDir   = CC_B_PortDirectionIs_bidirect  = 3 # Not supported yet
-    Master  = CC_B_PortDirectionIs_master    = 4 # Not supported yet
-    Slave   = CC_B_PortDirectionIs_slave     = 5 # Not supported yet
+    CC_B_PortDirectionIs_UNKNOWN  = Unknown   = 0
+    CC_B_PortDirectionIs_in       = In        = 1
+    CC_B_PortDirectionIs_out      = Out       = 2
+    CC_B_PortDirectionIs_bidirect = BiDir     = 3 # Not supported yet
+    CC_B_PortDirectionIs_master   = Master    = 4 # Not supported yet
+    CC_B_PortDirectionIs_slave    = Slave     = 5 # Not supported yet
 
-    def render(self):                                                 ### CC_B_PortDirectionIs_{self.name}'
-        return f'CC_B_PortDirectionIs_{self.name}'
+    def portray_name(self):                                                        ### CC_B_PortDirectionIs_{self.name}'
+        return f'{self.name}'
 
 @dataclass
 class CC_Port(CC_Base):
@@ -27,8 +27,15 @@
     direction: CC_PortDirection =  CC_PortDirection.Unknown
     type: type
 
-    def render(self) ->str:                                           ### <port name>
-        return f'cc_P_{self.type if isinstance(self.type, str) else self.type.name}'
+    def portray_name(self) ->str:                                           ### <port name>
+        return f'{self.name}'
+
+    def portray_type(self) ->str:                                           ### <port type> e.g a protocol
+        if isinstance(self.type, CC_Base):
+            return self.type.portray_name()
+        else:
+            tn = self.type if isinstance(self.type, str) else self.type.__name__
+            return f'cc_P_{tn}'
 
 
 @dataclass

diff -r de24bfc5c82a -r b9c8c8df8792 castle/writers/CC2Cpy/Protocol.py
--- a/castle/writers/CC2Cpy/Protocol.py	Sat Feb 04 00:47:31 2023 +0100
+++ b/castle/writers/CC2Cpy/Protocol.py	Sat Feb 04 19:35:53 2023 +0100
@@ -37,6 +37,9 @@
     kind: CC_ProtocolKind
     based_on: Optional[CC_B_Protocol]=dc_field(default_factory= lambda :CC_B_Protocol._BASE)
 
+    def portray_name(self):
+        return f'cc_P_{self.name}'
+
 
 baseProtocol = CC_B_Protocol("Protocol", kind=CC_ProtocolKind.Unknown, based_on=None)                # pragma: no mutate
 CC_B_Protocol._BASE=baseProtocol
@@ -72,16 +75,15 @@
             self.render_indexes(prepend) + "\n" +
             self.render_FTs(prepend)  + "\n" )
 
-
     def render_struct(self, prepend:str="", indent="  ") ->str:                                     ## struct CC_B_Protocol $name = {...} ;
-        var_name = f'cc_P_{self.name}'
-        based_on_link = f'&cc_P_{self.based_on.name}' if self.based_on else "NULL"
+        var_name = self.portray_name()
+        based_on_ref = f'&{self.based_on.portray_name()}' if self.based_on else "NULL"
 
         retval = []
         retval.append(f'{prepend}struct CC_B_Protocol {var_name} = {{')
         retval.append(f'{prepend}{indent}.name           = "{self.name}",')
         retval.append(f'{prepend}{indent}.kind           = CC_B_ProtocolKindIs_{self.kind.name},')
-        retval.append(f'{prepend}{indent}.inherit_from   = {based_on_link},')
+        retval.append(f'{prepend}{indent}.inherit_from   = {based_on_ref},')
         retval.append(f'{prepend}{indent}.length         = {len(self.events)},')
         retval.append(f'{prepend}{indent}.events         = {{')
 

diff -r de24bfc5c82a -r b9c8c8df8792 pytst/writers/CC2Cpy/test_3a_CompPort.py
--- a/pytst/writers/CC2Cpy/test_3a_CompPort.py	Sat Feb 04 00:47:31 2023 +0100
+++ b/pytst/writers/CC2Cpy/test_3a_CompPort.py	Sat Feb 04 19:35:53 2023 +0100
@@ -2,7 +2,7 @@
 """
 Test the supporting types (Enum, dataclasses ect) for  CC_B_ComponentInterface, and ...
 
-The more relevant test of Protocol can be found in test_3b_* and test_3c_*"""
+The more relevant test of Component(s) can be found in test_3b_* and test_3c_*"""
 
 import logging; logger = logging.getLogger(__name__)
 import pytest
@@ -10,6 +10,7 @@
 
 from castle.writers.CC2Cpy.Component import *
 
+
 def test_1a_CC_PortDirection():
     # Test the (int) value -- needed for the generated C code
     assert CC_PortDirection.Unknown.value == 0
@@ -27,8 +28,14 @@
     assert CC_PortDirection.Master  == CC_PortDirection.CC_B_PortDirectionIs_master
     assert CC_PortDirection.Slave   == CC_PortDirection.CC_B_PortDirectionIs_slave
 
[e-mail](reason="Is rendering needed?")
-def test_1b_render_PortDirection(): pass
+def test_1b_portray_PortDirection():
+    assert CCompare('CC_B_PortDirectionIs_UNKNOWN',   CC_PortDirection.Unknown.portray_name())
+    assert CCompare('CC_B_PortDirectionIs_in',        CC_PortDirection.In.portray_name())
+    assert CCompare('CC_B_PortDirectionIs_out',       CC_PortDirection.Out.portray_name())
+    assert CCompare('CC_B_PortDirectionIs_bidirect',  CC_PortDirection.BiDir.portray_name())
+    assert CCompare('CC_B_PortDirectionIs_master',    CC_PortDirection.Master.portray_name())
+    assert CCompare('CC_B_PortDirectionIs_slave',     CC_PortDirection.Slave.portray_name())
+
 
 def test_2a1_Port_defaults():
     n, t = "defaults", int
@@ -46,11 +53,31 @@
     assert inp.direction == d
 
 
[e-mail](reason="Is rendering needed?")
-def test_2z_render_Port(): pass
-    
+def test_2b1_portray_Port_name():
+    port = CC_Port(name="aPort", type="no_relevant")
+    assert CCompare('aPort', port.portray_name())
 
-
+def test_2b2a_portray_Port_strtype():
+    port = CC_Port(name="=NoName", type="textType")
+    assert CCompare('cc_P_textType', port.portray_type())
 
[e-mail](reason="More basic-testse are needed")
-def test_more(): pass
+def test_2b2b_portray_Port_inttype():
+    port = CC_Port(name="=NoName", type=int)
+    assert CCompare('cc_P_int', port.portray_type())
+
+def test_2b2c_portray_Port_floattype():
+    port = CC_Port(name="=NoName", type=float)
+    assert CCompare('cc_P_float', port.portray_type())
+
+from castle.writers.CC2Cpy.Protocol import * #CC_EventProtocol
+
+def test_2b2c_portray_Port_Protocol():
+    proto = CC_EventProtocol("JustAProtocol", events=[], based_on=None)
+    port  = CC_Port(name="=NoName", type=proto)
+    # Note: When a Port's type is a Protocol, than the port's  portray_type is both
+    ## the string 'cc_P_<xxxx>', and
+    ## the portray_name of that protocol.
+    ## We check both for now.
+    assert CCompare('cc_P_JustAProtocol',  port.portray_type())
+    assert CCompare(proto.portray_name(),  port.portray_type())
+