Commit: ef45c4204cec05e829a130f243833905e0f018c4 - CCastle2 (hg)

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

Commit MetaInfo

• Revisão: ef45c4204cec05e829a130f243833905e0f018c4 (tree)
• Hora: 2023-02-05 07:34:30
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Mensagem de Log

asis

Mudança Sumário

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

Diff

diff -r cc61c20e8edb -r ef45c4204cec castle/writers/CC2Cpy/Component.py
--- a/castle/writers/CC2Cpy/Component.py	Sat Feb 04 23:02:29 2023 +0100
+++ b/castle/writers/CC2Cpy/Component.py	Sat Feb 04 23:34:30 2023 +0100
@@ -80,7 +80,8 @@
         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 = {{')
-        for no,port in enumerate(self.ports, self.no_of_ports(inherited=True, mine=False)):         #loop over ports ...
+        start_port_no = self.no_of_ports(inherited=True, mine=False)
+        for no,port in enumerate(self.ports, start_port_no):                         # Loop over 'own' ports
             retval.append(f'{prepend}{(indent*3)[:-2]}{{')
             retval.append(f'{prepend}{indent*3}.portNo    =  {no},')
             retval.append(f'{prepend}{indent*3}.protocol  = &{port.portray_type()},')

diff -r cc61c20e8edb -r ef45c4204cec pytst/writers/CC2Cpy/test_3a_CompPort.py
--- a/pytst/writers/CC2Cpy/test_3a_CompPort.py	Sat Feb 04 23:02:29 2023 +0100
+++ b/pytst/writers/CC2Cpy/test_3a_CompPort.py	Sat Feb 04 23:34:30 2023 +0100
@@ -57,7 +57,11 @@
     port = CC_Port(name="aPort", type="no_relevant")
     assert CCompare('aPort', port.portray_name())
 
-def test_2b2a_portray_Port_strtype():
+def test_2b2a_portray_Port_NoType():
+    port = CC_Port(name="=NoName", type=None)
+    assert CCompare('NULL', port.portray_type())
+
+def test_2b2b_portray_Port_strtype():
     port = CC_Port(name="=NoName", type="textType")
     assert CCompare('cc_P_textType', port.portray_type())
 
@@ -65,7 +69,7 @@
     port = CC_Port(name="=NoName", type=int)
     assert CCompare('cc_P_int', port.portray_type())
 
-def test_2b2c_portray_Port_floattype():
+def test_2b2d_portray_Port_floattype():
     port = CC_Port(name="=NoName", type=float)
     assert CCompare('cc_P_float', port.portray_type())
 
@@ -81,3 +85,4 @@
     assert CCompare('cc_P_JustAProtocol',  port.portray_type())
     assert CCompare(proto.portray_name(),  port.portray_type())
 
+