提交: 7666fcbc367fa041d4db1c3bd2052b94ef8651c1 - CCastle2 (hg)

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

Commit MetaInfo

• 修訂: 7666fcbc367fa041d4db1c3bd2052b94ef8651c1 (tree)
• 時間: 2023-02-21 07:28:50
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

asis

Change Summary

• modified: Makefile
• modified: castle/writers/CC2Cpy/Component.py
• modified: pytst/writers/CC2Cpy/test_2a_groundwork.py
• modified: pytst/writers/CC2Cpy/test_9_genSieve.py
• add: pytst/writers/CC2Cpy/test_4a_HandlerTables.py
• delete: pytst/writers/CC2Cpy/test_3d_CompStruct.py

差異

diff -r 9dc4234ea760 -r 7666fcbc367f Makefile
--- a/Makefile	Fri Feb 17 15:09:29 2023 +0100
+++ b/Makefile	Mon Feb 20 23:28:50 2023 +0100
@@ -10,7 +10,7 @@
 	pytst/writers/CC2Cpy/test_3c_CompClass.py		\
 #
 CURRENT_TESTS = \
-	pytst/writers/CC2Cpy/test_3d_CompStruct.py 		\
+	pytst/writers/CC2Cpy/test_4a_HandlerTables.py 		\
 	pytst/writers/CC2Cpy/test_9_genSieve.py			\
 #
 TODO_TESTS = \

diff -r 9dc4234ea760 -r 7666fcbc367f castle/writers/CC2Cpy/Component.py
--- a/castle/writers/CC2Cpy/Component.py	Fri Feb 17 15:09:29 2023 +0100
+++ b/castle/writers/CC2Cpy/Component.py	Mon Feb 20 23:28:50 2023 +0100
@@ -64,9 +64,6 @@
 ########################################################################################################################
 ##################################### BUSY ### XXX ### BUZY ############################################################
 ########################################################################################################################
-
-
-
 @dataclass
 class CC_B_ComponentClass(CC_Base):
     metaclass="NULL"                         # //NULL for now, later: meta-class
@@ -88,10 +85,7 @@
               we need to call render_Typedef_CompName first!"""
         return ( "\n"+
             self.render_Typedef_CompName(prepend=prepend, indent=indent) + "\n" +
-            self.render_handlers(prepend=prepend, indent=indent) + "\n" +
-            self.render_methods(prepend=prepend, indent=indent) + "\n" +
-            self.render_(prepend=prepend, indent=indent) + "\n" +
-           
+            self.render_callables(prepend=prepend, indent=indent) + "\n" +   # handlers & methods (implementation) XXX TODO
             self.render_Fill_ComponentClass(prepend=prepend, indent=indent) + "\n" +
             "\n" )
 
@@ -125,6 +119,44 @@
 
         return '\n'.join(retval)+"\n"
 
+
+    def render_callables(self, prepend:str="", indent:str="   ") ->str:
+        return """\
+/** TODO: render_callables::
+     all Event/Data/Stream-handlers and local ("internal") methods/functions.
+
+    This are a lot of (tobe static) C-function implementations, like
+    * CC_C_Sieve*  CC_Mi_Sieve__init(CC_C_Sieve* self, int prime) ...
+    * CC_C_Sieve*  CC_E_Sieve__SimpleSieve_input__try(CC_C_Sieve* self, CC_OutPortType sender, int try) ...
+    * etc (one for every event in every input-port, plus the local ones
+
+    Those functions are collected in CC_B_methodHandler-array and CC_B_eventHandler-arrays (aka dispatch-tables).
+    those are NOW generated here*/"""
+
+    def render_Fill_MethodHandlers(self, prepend:str="", indent:str="   ") ->str:
+        retval = []
+        retval.append(f'CC_B_methodHandler cc_S_Sieve_methods[] = {{')
+
+        retval.append("""/* TODO: render_Fill_MethodHandlers
+                            the local/internal functions & methods */
+                            Note: cc_S_Sieve_methods is hardcoded""")
+        retval.append(f'}};')
+        return '\n'.join(retval)+"\n"
+
+    def render_Fill_PortHandlers(self, port, prepend:str="", indent:str="   ") ->str:
+        retval = []
+
+        retval.append(f'CC_B_methodHandler cc_S_Sieve_try[] = {{')
+
+        retval.append("""/* TODO: ``render_Fill_PortHandlers(port)``
+                             the local/internal functions & methods
+                             Note: `cc_S_Sieve_try` is hardcoded""")
+        retval.append(f'}};')
+        return '\n'.join(retval)+"\n"
+
+
+
+
     def _bases_classes(self) ->Sequence:   #XXX
         return ()                          #XXX WRONG
 

diff -r 9dc4234ea760 -r 7666fcbc367f pytst/writers/CC2Cpy/test_2a_groundwork.py
--- a/pytst/writers/CC2Cpy/test_2a_groundwork.py	Fri Feb 17 15:09:29 2023 +0100
+++ b/pytst/writers/CC2Cpy/test_2a_groundwork.py	Mon Feb 20 23:28:50 2023 +0100
@@ -37,3 +37,11 @@
     assert p1.name == 'aName'
     assert p1.kind == CC_ProtocolKind.Unknown
     assert p1.based_on is baseProtocol
+
+
+import dataclasses
+
+def test_3_dataclasses_are_dataclasses():
+    assert dataclasses.is_dataclass(CC_RootProtocol)
+    assert dataclasses.is_dataclass(baseProtocol)
+

diff -r 9dc4234ea760 -r 7666fcbc367f pytst/writers/CC2Cpy/test_3d_CompStruct.py
--- a/pytst/writers/CC2Cpy/test_3d_CompStruct.py	Fri Feb 17 15:09:29 2023 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +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 *
-
-
-
-
-
[e-mail](reason="More CompStruct-tests are needed")
-def test_more(): pass

diff -r 9dc4234ea760 -r 7666fcbc367f pytst/writers/CC2Cpy/test_4a_HandlerTables.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pytst/writers/CC2Cpy/test_4a_HandlerTables.py	Mon Feb 20 23:28:50 2023 +0100
@@ -0,0 +1,49 @@
+# (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
+
+
+ref_sieveMethods="""\
+CC_B_methodHandler cc_S_Sieve_methods[] = {
+ (CC_B_methodHandler)CC_Mi_error,
+ (CC_B_methodHandler)CC_Mc_New,
+ (CC_B_methodHandler)CC_Mi_error,
+ (CC_B_methodHandler)CC_Mi_Sieve__init,
+};
+"""
+
+ref_TryPort="""\
+CC_B_eventHandler cc_S_Sieve_try[] = {
+  (CC_B_eventHandler)CC_Mi_error,
+  (CC_B_eventHandler)CC_Mi_error,
+  (CC_B_eventHandler)CC_Mi_error,
+  (CC_B_eventHandler)CC_Mi_error,
+  (CC_B_eventHandler)CC_Mi_error,
+  (CC_B_eventHandler)CC_Mi_error,
+  (CC_B_eventHandler)CC_E_Sieve__SimpleSieve_input__try,
+};
+"""
+
+#XXX move to common?
+from .test_9_genSieve import *
+
[e-mail]
+def test_SieveMethods(sieveClass):
+    dispatch_table= sieveClass.render_Fill_MethodHandlers()
+    logger.debug("\n%s\n", dispatch_table)
+    assert CCompare(ref_sieveMethods,dispatch_table, log_all=True)
+
+TRY="fill_in_later"
[e-mail]
+def test_TryPortHandlers(sieveClass):
+    dispatch_table= sieveClass.render_Fill_PortHandlers(TRY)
+    logger.debug("\n%s\n", dispatch_table)
+    assert CCompare(ref_TryPorr, dispatch_table, log_all=True)
+
+
[e-mail](reason="More CompStruct-tests are needed")
+def test_more(): pass

diff -r 9dc4234ea760 -r 7666fcbc367f pytst/writers/CC2Cpy/test_9_genSieve.py
--- a/pytst/writers/CC2Cpy/test_9_genSieve.py	Fri Feb 17 15:09:29 2023 +0100
+++ b/pytst/writers/CC2Cpy/test_9_genSieve.py	Mon Feb 20 23:28:50 2023 +0100
@@ -73,7 +73,7 @@
         f.write(sieveInterface.render())
     verify_it_compiles(f.name, tmp_path)
 
[e-mail](reason="sieveClass refer to ``cc_B_Sieve_methods`` and ``CC_C_Sieve`` which aren't renderable yet")
[e-mail](reason="sieveClass refer to ``cc_B_Sieve_methods`` and ``CC_C_Sieve`` which aren't renderable yet. See test-4")
 def test_1b_ProtoInterClass(simpleSieveProto, sieveInterface, sieveClass, tmp_path):
     FILE="sieve-ProtoInterClass.c"
     with open(tmp_path/FILE, 'w') as f: