提交: 5ff5f113ebfe059ad6ee570058bc41f1b02caf42 - CCastle2 (hg)

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

Commit MetaInfo

• 修訂: 5ff5f113ebfe059ad6ee570058bc41f1b02caf42 (tree)
• 時間: 2023-01-30 06:53:49
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

Starting with Component rendering: Port, Interface, Class & struct

Change Summary

• modified: Makefile
• modified: castle/writers/CC2Cpy/Component.py
• add: pytst/writers/CC2Cpy/test_3a_CompPort.py
• add: pytst/writers/CC2Cpy/test_3b_CompInterface.py
• add: pytst/writers/CC2Cpy/test_3c_CompClass.py
• add: pytst/writers/CC2Cpy/test_3d_CompStruct.py
• delete: pytst/writers/CC2Cpy/test_3_Interface.py

差異

diff -r 5a48482b6d4b -r 5ff5f113ebfe Makefile
--- a/Makefile	Sun Jan 29 12:28:05 2023 +0100
+++ b/Makefile	Sun Jan 29 22:53:49 2023 +0100
@@ -7,7 +7,10 @@
 	pytst/writers/CC2Cpy/test_2b_EventProtocol.py		\
 #
 CURRENT_TESTS = \
-	pytst/writers/CC2Cpy/test_3_Interface.py		\
+	pytst/writers/CC2Cpy/test_3a_CompPort.py		\
+	pytst/writers/CC2Cpy/test_3b_CompInterface.py		\
+	pytst/writers/CC2Cpy/test_3c_CompClass.py		\
+	pytst/writers/CC2Cpy/test_3d_CompStruct.py 		\
 #
 TODO_TESTS = \
 	pytst/writers/CC2Cpy/test_999_NoNameCollision.py	\

diff -r 5a48482b6d4b -r 5ff5f113ebfe castle/writers/CC2Cpy/Component.py
--- a/castle/writers/CC2Cpy/Component.py	Sun Jan 29 12:28:05 2023 +0100
+++ b/castle/writers/CC2Cpy/Component.py	Sun Jan 29 22:53:49 2023 +0100
@@ -2,5 +2,83 @@
 
 __all__ = ['CC_B_ComponentInterface', ]
 
+from enum import Enum
+
 from .CCbase import *
-class CC_B_ComponentInterface(CC_Base): pass
+CC_Component: TypeAlias = 'CC_Component' # Forward ref
+
+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
+
+    def render(self):                                                 ### CC_B_PortDirectionIs_{self.name}'
+        return f'CC_B_PortDirectionIs_{self.name}'
+
+@dataclass
+class CC_Port(CC_Base):
+    name: str
+    _ : KW_ONLY
+    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}'
+
+class CC_B_ComponentInterface(CC_Base):pass
+## @dataclass
+## class CC_B_ComponentInterface(CC_Base):
+##     name: str
+##     based_on: Optional[CC_Component]=()
+##     _: KW_ONLY
+##     ports: Sequence[CC_Port] =()
+
+##     def __post_init__(self):
+##         self.based_on = mk_tuple(self.based_on)
+##         self.ports = mk_tuple(self.ports)
+
+##     def no_of_ports(self, inherired=False, mine=True) ->int:
+##         count = 0
+##         if inherired:
+##             for b in self.based_on:
+##                 count += b.no_of_ports(inherired=True)
+##         if mine:
+##             count += len(self.ports)
+##         return count
+
+##     def render(self, prepend:str="", indent="   ") ->str:
+##         self.render_struct(prepend=prepend, indent=indent)
+
+##     def render_struct(self, prepend:str="", indent="   ") ->str:                                   ## struct CC_B_ComponentInterface cc_CI_${name} ...
+##         """
+##         .. todo::
+
+##            - Move `CC_B_ComponentInterface.render()` into a Rendering subclass-delegate
+##            - refactor & test: spilt into parts
+##            - optional: Use Jinja ipv f-strings
+##            - make name/prefix  (``f'cc_CI_{self.name}``) in a getter oid
+##            """
+##         name = f'cc_CI_{self.name}'
+##         based_on_link = f'&cc_CI_{self.based_on[0].name}' if self.based_on[0] else "NULL"
+
+##         retval = []
+##         retval.append(f'{prepend}struct CC_B_ComponentInterface {name} = {{')
+##         retval.append(f'{prepend}{indent}.name          = "{self.name}",')
+##         retval.append(f'{prepend}{indent}.inherit_from  = {based_on_link},')
+##         retval.append(f'{prepend}{indent}.length        = {len(self.ports)},')
+##         retval.append(f'{prepend}{indent}.ports = {{')
+
+##         #loop over ports ...
+##         for n,p in enumerate(self.ports, self.no_of_ports(inherired=True, mine=False)):
+##             retval.append(f'{prepend}{(indent*3)[:-2]}{{ .portNo    = {n}, ')
+##             retval.append(f'{prepend}{indent*3}.protocol  = &{p.render()}, ')
+##             retval.append(f'{prepend}{indent*3}.direction = {p.direction.render()}, ')
+##             retval.append(f'{prepend}{indent*3}.name      = "{p.name}", ')
+##             retval.append(f'{prepend}{indent*3}.part_of   = &{name} }} ,')
+##         retval.append(f'{prepend}{indent}}}')   # end of ports
+##         retval.append(f'{prepend}}} ;')  # end of struct
+
+##         return '\n'.join(retval)+"\n"

diff -r 5a48482b6d4b -r 5ff5f113ebfe pytst/writers/CC2Cpy/test_3_Interface.py
--- a/pytst/writers/CC2Cpy/test_3_Interface.py	Sun Jan 29 12:28:05 2023 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-# (C) Albert Mietus, 2022, 2023. Part of Castle/CCastle project
-
-import logging; logger = logging.getLogger(__name__)
-import pytest
-from . import * # CCompare
-
-from castle.writers.CC2Cpy.Component import * # CC_B_ComponentInterface

diff -r 5a48482b6d4b -r 5ff5f113ebfe pytst/writers/CC2Cpy/test_3a_CompPort.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pytst/writers/CC2Cpy/test_3a_CompPort.py	Sun Jan 29 22:53:49 2023 +0100
@@ -0,0 +1,37 @@
+# (C) Albert Mietus, 2022, 2023. Part of Castle/CCastle project
+"""
+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_*"""
+
+import logging; logger = logging.getLogger(__name__)
+import pytest
+from . import * # CCompare
+
+from castle.writers.CC2Cpy.Component import *
+from castle.writers.CC2Cpy.Component import CC_PortDirection # Not public XXX
+
+def test_1a_CC_PortDirection():
+    # Test the (int) value -- needed for the generated C code
+    assert CC_PortDirection.Unknown.value == 0
+    assert CC_PortDirection.In.value      == 1
+    assert CC_PortDirection.Out.value     == 2
+    assert CC_PortDirection.BiDir.value   == 3
+    assert CC_PortDirection.Master.value  == 4
+    assert CC_PortDirection.Slave.value   == 5
+
+    # Test the long-name & short-name are the same
+    assert CC_PortDirection.Unknown == CC_PortDirection.CC_B_PortDirectionIs_UNKNOWN
+    assert CC_PortDirection.In      == CC_PortDirection.CC_B_PortDirectionIs_in
+    assert CC_PortDirection.Out     == CC_PortDirection.CC_B_PortDirectionIs_out
+    assert CC_PortDirection.BiDir   == CC_PortDirection.CC_B_PortDirectionIs_bidirect
+    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_PortRender(): pass
+
+
+
[e-mail](reason="More basic-testse are needed")
+def test_more(): pass

diff -r 5a48482b6d4b -r 5ff5f113ebfe pytst/writers/CC2Cpy/test_3b_CompInterface.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pytst/writers/CC2Cpy/test_3b_CompInterface.py	Sun Jan 29 22:53:49 2023 +0100
@@ -0,0 +1,14 @@
+# (C) Albert Mietus, 2022, 2023. Part of Castle/CCastle project
+
+import logging; logger = logging.getLogger(__name__)
+import pytest
+from . import * # CCompare
+
+from castle.writers.CC2Cpy.Component import * # CC_B_ComponentInterface
+
+
+
+
+
[e-mail](reason="More CompInterface-tests are needed")
+def test_more(): pass

diff -r 5a48482b6d4b -r 5ff5f113ebfe pytst/writers/CC2Cpy/test_3c_CompClass.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pytst/writers/CC2Cpy/test_3c_CompClass.py	Sun Jan 29 22:53:49 2023 +0100
@@ -0,0 +1,14 @@
+# (C) Albert Mietus, 2022, 2023. Part of Castle/CCastle project
+
+import logging; logger = logging.getLogger(__name__)
+import pytest
+from . import * # CCompare
+
+from castle.writers.CC2Cpy.Component import * # CC_B_ComponentClass
+
+
+
+
+
[e-mail](reason="More CompClass-tests are needed")
+def test_more(): pass

diff -r 5a48482b6d4b -r 5ff5f113ebfe pytst/writers/CC2Cpy/test_3d_CompStruct.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pytst/writers/CC2Cpy/test_3d_CompStruct.py	Sun Jan 29 22:53:49 2023 +0100
@@ -0,0 +1,14 @@
+# (C) Albert Mietus, 2022, 2023. Part of Castle/CCastle project
+
+import logging; logger = logging.getLogger(__name__)
+import pytest
+from . import * # CCompare
+
+from castle.writers.CC2Cpy.Component import * 
+
+
+
+
+
[e-mail](reason="More CompStruct-tests are needed")
+def test_more(): pass