提交: 2cba36f3f7276cc6f553a892d7aa8db081877d11 - CCastle2 (hg)

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

Commit MetaInfo

• 修訂: 2cba36f3f7276cc6f553a892d7aa8db081877d11 (tree)
• 時間: 2023-01-29 08:58:07
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

(asis) Removed unused indent= parm in most render_* methods. MutMut showed it, extra test removed

Change Summary

• modified: castle/writers/CC2Cpy/Protocol.py
• modified: pytst/writers/CC2Cpy/test_2b_EventProtocol.py

差異

diff -r 04e9ef19c231 -r 2cba36f3f727 castle/writers/CC2Cpy/Protocol.py
--- a/castle/writers/CC2Cpy/Protocol.py	Sat Jan 28 23:41:04 2023 +0100
+++ b/castle/writers/CC2Cpy/Protocol.py	Sun Jan 29 00:58:07 2023 +0100
@@ -69,8 +69,8 @@
     def render(self, prepend:str="", indent="  ") ->str:
         return (
             self.render_struct(prepend, indent)  + "\n" +
-            self.render_indexes(prepend, indent) + "\n" +
-            self.render_FTs(prepend, indent)  + "\n" )
+            self.render_indexes(prepend) + "\n" +
+            self.render_FTs(prepend)  + "\n" )
 
 
     def render_struct(self, prepend:str="", indent="  ") ->str:                                     ## struct CC_B_Protocol $name = {...} ;
@@ -100,18 +100,16 @@
         return '\n'.join(retval) +"\n"
 
 
-    # XXX Mutant 2* : default values prepend/indent
-    def render_indexes(self, prepend:str="", indent="  ") ->str:                                    ## #define CC_P_<proto>_<event> index
-        ## For now, loop over the events here ...
+    def render_indexes(self, prepend:str="") ->str:                                ## #define CC_P_<proto>_<event> index
         retval = []
-        for n, e in enumerate(self.events, len(self.event_dict(inherired=True,mine=False))): # pragma: no mutate on event_dict parms
+        for n, e in enumerate(self.events, len(self.event_dict(inherired=True, mine=False))): # pragma: no mutate on event_dict parms
             retval.append(f'{prepend}#define CC_P_{self.name}_{e.name}\t{n}')
         return '\n'.join(retval)+"\n"
 
 
     # XXX Mutant 2*: default values prepend/indent
-    def render_FTs(self, prepend:str="", indent="  ") ->str: ##typedef void (*CC_E_{...}_FT)(CC_selfType, CC_ComponentType, {...});
-        type_name = lambda ptype : ptype if isinstance(ptype, str) else ptype.__name__   # XXX Mutant
+    def render_FTs(self, prepend:str="", ) ->str:                 ##typedef void (*CC_E_{...}_FT)(CC_selfType, CC_ComponentType, {...});
+        type_name = lambda ptype : ptype if isinstance(ptype, str) else ptype.__name__   # pragma: no mutate -- is it needed?
 
         retval = []
         for  e in self.events:

diff -r 04e9ef19c231 -r 2cba36f3f727 pytst/writers/CC2Cpy/test_2b_EventProtocol.py
--- a/pytst/writers/CC2Cpy/test_2b_EventProtocol.py	Sat Jan 28 23:41:04 2023 +0100
+++ b/pytst/writers/CC2Cpy/test_2b_EventProtocol.py	Sun Jan 29 00:58:07 2023 +0100
@@ -161,7 +161,7 @@
     verify_prepend(demoProtocol)
 
 
-def verify_indent(ref, protocol): # indent can be used several time ...
+def verify_indent(ref, protocol): # indent can be used several times ...
     try_indent="_-|"
     out = protocol.render_struct(indent=try_indent, prepend="")
     logger.info("Protocol %s results in::\n%s", protocol.name, out)
@@ -187,5 +187,16 @@
     verify_indent(ref_demo, demoProtocol)
 
 
+def test_prepend_indexes(demoProtocol):
+    assert CCompare(ref_demo_index, demoProtocol.render_indexes())
+    assert CCompare(ref_demo_index, demoProtocol.render_indexes(prepend=""))
+    assert CCompare(ref_demo_index, demoProtocol.render_indexes(prepend="\t"))
+
+def test_prepend_FTs(demoProtocol):
+    assert CCompare(ref_demo_FTs, demoProtocol.render_FTs())
+    assert CCompare(ref_demo_FTs, demoProtocol.render_FTs(prepend=""))
+    assert CCompare(ref_demo_FTs, demoProtocol.render_FTs(prepend="\t"))
+
+
 @pytest.mark.skip(reason="CURRENT: busy with testing all part of *C&P CC_EventProtocol")
 def test_more(): pass