提交: 9dc4234ea76047429e99b83e41550fbe90149aef - CCastle2 (hg)

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

Commit MetaInfo

• 修订版: 9dc4234ea76047429e99b83e41550fbe90149aef (tree)
• 时间: 2023-02-17 23:09:29
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

asis

更改概述

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

差异

diff -r d1d35e3ccd56 -r 9dc4234ea760 castle/writers/CC2Cpy/Component.py
--- a/castle/writers/CC2Cpy/Component.py	Fri Feb 17 15:09:14 2023 +0100
+++ b/castle/writers/CC2Cpy/Component.py	Fri Feb 17 15:09:29 2023 +0100
@@ -2,6 +2,7 @@
 
 __all__ = ['CC_B_ComponentInterface', 'CC_Port', 'CC_PortDirection', 'CC_B_ComponentClass']
 
+import logging; logger = logging.getLogger(__name__)
 
 from .CCbase import *
 from castle.auxiliary.pack import mk_tuple
@@ -33,9 +34,11 @@
         return next(p for p in self.ports if p.name=='try')
 
     def render(self, prepend:str="", indent:str="   ") ->str:
-        return self.render_Fill_Interface(prepend=prepend, indent=indent)
+        return (
+            self.render_Fill_Interface(prepend=prepend, indent=indent)\
+            )
 
-    def render_Fill_Interface(self, prepend:str="", indent:str="   ") ->str:          ## struct CC_B_ComponentInterface `cc_CI_$name` = ...
+    def render_Fill_Interface(self, prepend:str="", indent:str="   ") ->str:              ## struct CC_B_ComponentInterface `cc_CI_$name` = ...
         name = f'cc_CI_{self.name}'
         based_on_link = f'&cc_CI_{self.based_on[0].name}' if self.based_on else "NULL"
 
@@ -68,28 +71,74 @@
 class CC_B_ComponentClass(CC_Base):
     metaclass="NULL"                         # //NULL for now, later: meta-class
     interface: CC_B_ComponentInterface
-    handlers:  Sequence[CC_Handler] =()    # EventHanders, DataHandler, StreamHandlers, and all-other-protocolHandlers
-    methods:   Sequence[CC_Method]  =()    # All kind of "internal only" callable(s)
+    _: KW_ONLY
+    data_members: Sequence[CC_TypedParameter]=() # (own) Data-members
+    handlers:     Sequence[CC_Handler] =()       # EventHanders, DataHandler, StreamHandlers, and all-other-protocolHandlers
+    methods:      Sequence[CC_Method]  =()       # All kind of "internal only" callable(s)
+
+    def _name(self): 					return self.interface.name
+    def portray_interface_name(self): 	return f'cc_CI_{self._name()}'
+    def portray_Typedef_CompName(self):	return f'CC_C_{self._name()}'
+    def portray_methods_name(self):		return f'cc_S_{self._name()}_methods'
 
     def render(self, prepend:str="", indent:str="   ") ->str:
-        return self.render_Fill_ComponentClass(prepend=prepend, indent=indent)
+        """.. note:: The order of generated code is relevant!
 
+              As the CC_B_ComponentClass (variable) refers to CC_C_$CompName (typedef) [by sizeof()],
+              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_Fill_ComponentClass(prepend=prepend, indent=indent) + "\n" +
+            "\n" )
 
     def render_Fill_ComponentClass(self, prepend:str="", indent:str="  ") ->str:          ## struct CC_B_ComponentClass cc_C_$name {...}
-        name = self.interface.name
-        interface_name = f'cc_CI_{name}'
-        comp_TypeName  = f'CC_C_{name}'
-        methods_name   = f'cc_B_{name}_methods'
+        interface_name    = self.portray_interface_name()
+        Typedef_CompName  = self.portray_Typedef_CompName()
+        methods_name      = self.portray_methods_name()
 
         retval = []
         retval.append(f'{prepend}struct CC_B_ComponentClass  cc_C_{self.interface.name} = {{')
         retval.append(f'{prepend}{indent}.isa           = {self.metaclass},')
         retval.append(f'{prepend}{indent}.interface     = &{interface_name},')
-        retval.append(f'{prepend}{indent}.instance_size = sizeof({comp_TypeName}),')
+        retval.append(f'{prepend}{indent}.instance_size = sizeof({Typedef_CompName}),')
         retval.append(f'{prepend}{indent}.methods       = {methods_name},')
         retval.append(f'{prepend}}};')
 
         return '\n'.join(retval)+"\n"
 
-    def render_CompName(self, prepend:str="", indent:str="  ") ->str:                     ## typedef struct CC_C_$CompName
-        pass
+    def render_Typedef_CompName(self, prepend:str="", indent:str="  ") ->str:                     ## typedef struct CC_C_$CompName
+        """.. note:: Asume simple inheritance
+
+              :need:`Tools_No_MultipleInheritance-in-1compiler`
+              http://docideas.mietus.nl/en/default/CCastle/3.Design/zz.todo.html#Tools_No_MultipleInheritance-in-1compiler"""
+        Typedef_CompName  = self.portray_Typedef_CompName()
+        retval = []
+        retval.append(f'{prepend}typedef struct {{')
+        for bc in self._bases_classes():   #XXX
+            retval += bc.prerender_CompName_elements(prepend,indent)
+        retval += self.prerender_CompName_elements(prepend,indent)
+        retval.append(f'}} {Typedef_CompName};')
+
+        return '\n'.join(retval)+"\n"
+
+    def _bases_classes(self) ->Sequence:   #XXX
+        return ()                          #XXX WRONG
+
+    def prerender_CompName_elements(self, prepend:str="", indent:str="  ") ->Sequence[str]:
+        retval=[]
+        logger.debug('.data_members)[%s]:: %s', len(self.data_members), self.data_members)
+        for d in self.data_members:
+            retval.append(f'{prepend}{indent}{d.type} \t {d.name};')                          # XXX type is not a string
+        logger.debug('.handlers)[%s]:: %s', len(self.handlers), self.handlers)
+        for h in self.handlers:
+            retval.append(f'{prepend}{indent}struct CC_B_OutPort \t {h.port.name};')
+        logger.debug('.methods)[%s]:: %s', len(self.methods), self.methods)
+        for m in self.methods:
+            retval.append(f'{prepend}{indent} /*XXXXX*/')
+
+        logger.debug('\n'+'\n'.join(retval))
+        return retval

diff -r d1d35e3ccd56 -r 9dc4234ea760 pytst/writers/CC2Cpy/test_9_genSieve.py
--- a/pytst/writers/CC2Cpy/test_9_genSieve.py	Fri Feb 17 15:09:14 2023 +0100
+++ b/pytst/writers/CC2Cpy/test_9_genSieve.py	Fri Feb 17 15:09:29 2023 +0100
@@ -73,7 +73,7 @@
         f.write(sieveInterface.render())
     verify_it_compiles(f.name, tmp_path)
 
-#@pytest.mark.skip(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")
 def test_1b_ProtoInterClass(simpleSieveProto, sieveInterface, sieveClass, tmp_path):
     FILE="sieve-ProtoInterClass.c"
     with open(tmp_path/FILE, 'w') as f: