提交: dbe3865aa2cc19e33bbe2b94d97d7adca5ff6d10 - CCastle2 (hg)

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

Commit MetaInfo

• 修订版: dbe3865aa2cc19e33bbe2b94d97d7adca5ff6d10 (tree)
• 时间: 2023-02-04 07:04:13
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

asis

更改概述

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

差异

diff -r 5ff5f113ebfe -r dbe3865aa2cc Makefile
--- a/Makefile	Sun Jan 29 22:53:49 2023 +0100
+++ b/Makefile	Fri Feb 03 23:04:13 2023 +0100
@@ -5,14 +5,16 @@
 LAST = \
 	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		\
+#
+TODO_TESTS = \
 	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 5ff5f113ebfe -r dbe3865aa2cc castle/writers/CC2Cpy/Component.py
--- a/castle/writers/CC2Cpy/Component.py	Sun Jan 29 22:53:49 2023 +0100
+++ b/castle/writers/CC2Cpy/Component.py	Fri Feb 03 23:04:13 2023 +0100
@@ -1,11 +1,13 @@
 # (C) Albert Mietus, 2022, 2023. Part of Castle/CCastle project
 
-__all__ = ['CC_B_ComponentInterface', ]
+__all__ = ['CC_B_ComponentInterface', 'CC_Port', 'CC_PortDirection']
 
 from enum import Enum
 
 from .CCbase import *
-CC_Component: TypeAlias = 'CC_Component' # Forward ref
+from castle.auxiliary.pack import mk_tuple
+
+CC_Component: TypeAlias = 'CC_Component' # Forward ref                          # pragma: no mutate
 
 class CC_PortDirection(Enum):
     Unknown = CC_B_PortDirectionIs_UNKNOWN   = 0
@@ -28,57 +30,57 @@
     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"
+@dataclass
+class CC_B_ComponentInterface(CC_Base):
+    name: str
+    based_on: Sequence[CC_Component]=()                                         # pragma: no mutate
+    _: KW_ONLY
+    ports: Sequence[CC_Port] =()                                                # pragma: no mutate
 
-##         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 = {{')
+    def __post_init__(self):
+        self.based_on = mk_tuple(self.based_on)
+        self.ports = mk_tuple(self.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
+    def no_of_ports(self, inherited=False, mine=True) ->int:
+        count = 0
+        if inherited:
+            for b in self.based_on:
+                count += b.no_of_ports(inherited=True)
+        if mine:
+            count += len(self.ports)
+        return count
 
-##         return '\n'.join(retval)+"\n"
+    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(inherited=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 5ff5f113ebfe -r dbe3865aa2cc pytst/writers/CC2Cpy/test_3a_CompPort.py
--- a/pytst/writers/CC2Cpy/test_3a_CompPort.py	Sun Jan 29 22:53:49 2023 +0100
+++ b/pytst/writers/CC2Cpy/test_3a_CompPort.py	Fri Feb 03 23:04:13 2023 +0100
@@ -9,7 +9,6 @@
 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
@@ -29,7 +28,27 @@
     assert CC_PortDirection.Slave   == CC_PortDirection.CC_B_PortDirectionIs_slave
 
 @pytest.mark.skip(reason="Is rendering needed?")
-def test_1b_PortRender(): pass
+def test_1b_render_PortDirection(): pass
+
+def test_2a1_Port_defaults():
+    n, t = "defaults", int
+    p1 = CC_Port(name=n, type=t) # Only direction is optional
+    assert p1.name == n
+    assert p1.type is t
+    assert p1.direction == CC_PortDirection.Unknown
+
+def test_2a1_Port_full():
+    n, t = "full", float
+    d=CC_PortDirection.In
+    inp = CC_Port(name=n, type=t, direction=d)
+    assert inp.name == n
+    assert inp.type is t
+    assert inp.direction == d
+
+
[e-mail](reason="Is rendering needed?")
+def test_2z_render_Port(): pass
+    
 
 
 

diff -r 5ff5f113ebfe -r dbe3865aa2cc pytst/writers/CC2Cpy/test_3b_CompInterface.py
--- a/pytst/writers/CC2Cpy/test_3b_CompInterface.py	Sun Jan 29 22:53:49 2023 +0100
+++ b/pytst/writers/CC2Cpy/test_3b_CompInterface.py	Fri Feb 03 23:04:13 2023 +0100
@@ -7,8 +7,41 @@
 from castle.writers.CC2Cpy.Component import * # CC_B_ComponentInterface
 
 
[e-mail]
+def emptyComp():
+    return CC_B_ComponentInterface('empty')
 
[e-mail]
+def demo2Comp():
+    return CC_B_ComponentInterface('demo2', ports =[
+        CC_Port(name='no_1', type=None),
+        CC_Port(name='no_2', type=None)])
 
[e-mail]
+def subComp(demo2Comp):
+    return CC_B_ComponentInterface('sub', based_on=demo2Comp)
+
+def test_0_name(emptyComp, demo2Comp):
+    assert emptyComp.name == 'empty'
+    assert demo2Comp.name == 'demo2'
+
+def test_0_based_on(subComp, demo2Comp):
+    assert demo2Comp.based_on == ()
+    assert subComp.based_on[0] is demo2Comp
+
+def test_1_NoOfPorts(emptyComp, demo2Comp):
+    assert emptyComp.no_of_ports() == 0
+    assert demo2Comp.no_of_ports() == 2
+
+def test_1_NoOfPorts_variants(subComp):
+    assert subComp.no_of_ports() == 0                              # inherited=False, mine=True
+
+    assert subComp.no_of_ports(inherited=False, mine=False) == 0
+    assert subComp.no_of_ports(inherited=False, mine=True)  == 0
+    assert subComp.no_of_ports(inherited=True,  mine=False) == 2
+    assert subComp.no_of_ports(inherited=True,  mine=True)  == 2
 
 @pytest.mark.skip(reason="More CompInterface-tests are needed")
 def test_more(): pass
+
+