提交: 2f2ee2f28a8e65eca88b5ba513bb28745a00bac6 - CCastle2 (hg)

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

Commit MetaInfo

• 修订版: 2f2ee2f28a8e65eca88b5ba513bb28745a00bac6 (tree)
• 时间: 2023-02-22 01:03:52
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

asis

更改概述

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

差异

diff -r 54ed798bdf8c -r 2f2ee2f28a8e .hgignore
--- a/.hgignore	Tue Feb 21 00:25:39 2023 +0100
+++ b/.hgignore	Tue Feb 21 17:03:52 2023 +0100
@@ -17,3 +17,4 @@
 castle/writers/CC2Cpy/_ComponentClass.c
 castle/writers/CC2Cpy/_SIEVE.c
 castle/writers/CC2Cpy/jinja_hack.py
+.mypy_cache

diff -r 54ed798bdf8c -r 2f2ee2f28a8e Makefile
--- a/Makefile	Tue Feb 21 00:25:39 2023 +0100
+++ b/Makefile	Tue Feb 21 17:03:52 2023 +0100
@@ -63,8 +63,6 @@
 	PYTHONPATH=`pwd` pytest ${PYTEST_OPTONS}  ${TODO_TESTS}
 current-ds current-sd:
 	PYTHONPATH=`pwd` pytest ${PYTEST_OPTONS}  --log-cli-level=DEBUG -s ${CURRENT_TESTS}
-
-
 demo: pytest-demo python-demo
 
 python-demo:

diff -r 54ed798bdf8c -r 2f2ee2f28a8e castle/writers/CC2Cpy/Component.py
--- a/castle/writers/CC2Cpy/Component.py	Tue Feb 21 00:25:39 2023 +0100
+++ b/castle/writers/CC2Cpy/Component.py	Tue Feb 21 17:03:52 2023 +0100
@@ -30,8 +30,8 @@
             count += len(self.ports)
         return count
 
-    def find_port_by_name(self,name:str) -> CC_Port:
-        return next(p for p in self.ports if p.name=='try')
+    def find_port_by_name(self, name:str) -> CC_Port:
+        return next(p for p in self.ports if p.name==name)
 
     def render(self, prepend:str="", indent:str="   ") ->str:
         return (
@@ -138,17 +138,26 @@
     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(f'{prepend}CC_B_methodHandler cc_S_{self._name()}_methods[] = {{')
+        ### XXX TODO:: loop over base_classes
 
-        retval.append("""/* TODO: render_Fill_MethodHandlers
-                            the local/internal functions & methods
-                            Note: cc_S_Sieve_methods is hardcoded
-                          */""")
+        for m in self.methods:
+            retval.append(f'{prepend}{indent}(CC_B_methodHandler)CC_Mi_{self._name()}__{m.name},')
+
         retval.append(f'}};')
         return '\n'.join(retval)+"\n"
 
+
+
+
+
     def render_Fill_PortHandlers(self, port, prepend:str="", indent:str="   ") ->str:
         retval = []
 

diff -r 54ed798bdf8c -r 2f2ee2f28a8e pytst/writers/CC2Cpy/test_4a_HandlerTables.py
--- a/pytst/writers/CC2Cpy/test_4a_HandlerTables.py	Tue Feb 21 00:25:39 2023 +0100
+++ b/pytst/writers/CC2Cpy/test_4a_HandlerTables.py	Tue Feb 21 17:03:52 2023 +0100
@@ -16,6 +16,11 @@
  (CC_B_methodHandler)CC_Mi_Sieve__init,
 };
 """
+ref_sieveMethods="""\
+CC_B_methodHandler cc_S_Sieve_methods[] = {
+ (CC_B_methodHandler)CC_Mi_Sieve__init,
+};
+"""
 
 ref_TryPort="""\
 CC_B_eventHandler cc_S_Sieve_try[] = {
@@ -38,7 +43,7 @@
     assert CCompare(ref_sieveMethods,dispatch_table, log_all=True)
 
 TRY="fill_in_later"
-#@pytest.mark.skip
[e-mail]
 def test_TryPortHandlers(sieveClass):
     dispatch_table= sieveClass.render_Fill_PortHandlers(TRY)
     logger.debug("\n%s\n", dispatch_table)

diff -r 54ed798bdf8c -r 2f2ee2f28a8e pytst/writers/CC2Cpy/test_9_genSieve.py
--- a/pytst/writers/CC2Cpy/test_9_genSieve.py	Tue Feb 21 00:25:39 2023 +0100
+++ b/pytst/writers/CC2Cpy/test_9_genSieve.py	Tue Feb 21 17:03:52 2023 +0100
@@ -40,7 +40,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. See test-4")
[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: