提交: 6d8b6474c25e31acd67aebfb1c7bdd8c5693331b - CCastle2 (hg)

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

Commit MetaInfo

• 修订版: 6d8b6474c25e31acd67aebfb1c7bdd8c5693331b (tree)
• 时间: 2023-02-11 07:20:01
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

asis

更改概述

• modified: Makefile
• modified: castle/writers/CC2Cpy/Component.py
• modified: pytst/writers/CC2Cpy/test_3a_CompPort.py
• modified: pytst/writers/CC2Cpy/test_3d_CompStruct.py
• add: pytst/writers/CC2Cpy/test_9_genSieve.py

差异

diff -r ed0d54295efd -r 6d8b6474c25e Makefile
--- a/Makefile	Wed Feb 08 23:03:41 2023 +0100
+++ b/Makefile	Fri Feb 10 23:20:01 2023 +0100
@@ -7,12 +7,13 @@
 	pytst/writers/CC2Cpy/test_2b_EventProtocol.py		\
 	pytst/writers/CC2Cpy/test_3a_CompPort.py		\
 	pytst/writers/CC2Cpy/test_3b_CompInterface.py		\
+	pytst/writers/CC2Cpy/test_3c_CompClass.py		\
 #
 CURRENT_TESTS = \
-	pytst/writers/CC2Cpy/test_3c_CompClass.py		\
+	pytst/writers/CC2Cpy/test_3d_CompStruct.py 		\
+	pytst/writers/CC2Cpy/test_9_genSieve.py			\
 #
 TODO_TESTS = \
-	pytst/writers/CC2Cpy/test_3d_CompStruct.py 		\
 	pytst/writers/CC2Cpy/test_999_NoNameCollision.py	\
 #
 

diff -r ed0d54295efd -r 6d8b6474c25e castle/writers/CC2Cpy/Component.py
--- a/castle/writers/CC2Cpy/Component.py	Wed Feb 08 23:03:41 2023 +0100
+++ b/castle/writers/CC2Cpy/Component.py	Fri Feb 10 23:20:01 2023 +0100
@@ -77,7 +77,7 @@
         for no,port in enumerate(self.ports, start_port_no):                    # Loop over 'own' ports
             retval.append(f'{prepend}{indent*2}{{')
             retval.append(f'{prepend}{indent*3}.portNo    =  {no},')
-            retval.append(f'{prepend}{indent*3}.protocol  = {port.portray_typePtr()},')
+            retval.append(f'{prepend}{indent*3}.protocol  =  {port.portray_typePtr()},')
             retval.append(f'{prepend}{indent*3}.direction =  {port.direction.portray_name()},')
             retval.append(f'{prepend}{indent*3}.name      = "{port.name}",')
             retval.append(f'{prepend}{indent*3}.part_of   = &{name} }},')

diff -r ed0d54295efd -r 6d8b6474c25e pytst/writers/CC2Cpy/test_3a_CompPort.py
--- a/pytst/writers/CC2Cpy/test_3a_CompPort.py	Wed Feb 08 23:03:41 2023 +0100
+++ b/pytst/writers/CC2Cpy/test_3a_CompPort.py	Fri Feb 10 23:20:01 2023 +0100
@@ -9,7 +9,7 @@
 from . import * # CCompare
 
 from castle.writers.CC2Cpy.Component import *
-
+from castle.writers.CC2Cpy.CCbase import CC_Base
 
 def test_1a_CC_PortDirection():
     # Test the (int) value -- needed for the generated C code
@@ -86,3 +86,7 @@
     assert CCompare('&'+proto.portray_name(),  port.portray_typePtr())
 
 
+def test_BUG():
+    proto = CC_EventProtocol("JustAProtocol", events=[], based_on=None)
+    port  = CC_Port(name="=NoName", type=proto)
+    assert isinstance(port.type, CC_Base)

diff -r ed0d54295efd -r 6d8b6474c25e pytst/writers/CC2Cpy/test_3d_CompStruct.py
--- a/pytst/writers/CC2Cpy/test_3d_CompStruct.py	Wed Feb 08 23:03:41 2023 +0100
+++ b/pytst/writers/CC2Cpy/test_3d_CompStruct.py	Fri Feb 10 23:20:01 2023 +0100
@@ -4,7 +4,7 @@
 import pytest
 from . import * # CCompare
 
-from castle.writers.CC2Cpy.Component import * 
+from castle.writers.CC2Cpy.Component import *
 
 
 

diff -r ed0d54295efd -r 6d8b6474c25e pytst/writers/CC2Cpy/test_9_genSieve.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pytst/writers/CC2Cpy/test_9_genSieve.py	Fri Feb 10 23:20:01 2023 +0100
@@ -0,0 +1,83 @@
+# (C) Albert Mietus, 2022, 2023. Part of Castle/CCastle project
+
+"""CCastle::CC2Cpy integration test: write the C-code for the "Sieve" component
+"""
+
+
+import logging; logger = logging.getLogger(__name__)
+import pytest
+
+
+from castle.writers.CC2Cpy.Protocol import *
+from castle.writers.CC2Cpy.Event import *
+from castle.writers.CC2Cpy.Component import *
+
+### protocol SimpleSieve : Protocol {
+###   kind: event;
+###   input(int:try);
+### }
[e-mail]
+def simpleSieve():
+    return CC_EventProtocol("SimpleSieve", events=[
+        CC_Event("input", typedParameters=[CC_TypedParameter(name='event', type=int)])])
+
+
+### component Sieve : Component {
+###   port SimpleSieve<in>:try;
+###   port SimpleSieve<out>:coprime;
+### }
[e-mail]
+def sieveInterface(simpleSieve):
+    return CC_B_ComponentInterface("Sieve", ports=[
+        CC_Port(name='try',     direction=CC_PortDirection.In,  type=simpleSieve),
+        CC_Port(name='coprime', direction=CC_PortDirection.Out, type=simpleSieve)])
+
+
+### implement Sieve {
+###   int myPrime;
+### ...
[e-mail]
+def sieveClass(sieveInterface):
+    return CC_B_ComponentClass(sieveInterface,
+                                    # methods=
+                                    )
+
+
+from pathlib import Path
+from tempfile import TemporaryDirectory
+import os
+import subprocess
+
+
+def write_header(f):
+    f.writelines("""/*(C) Alber Mietus, Generated code*/
+#include <CC/buildin_types.h>
+#include <CC/runtime.h>
+
+""")
+
+def verify_it_compiles(file, in_dir:Path):
+    os.symlink("/Users/albert/work/CCastle2/from_CC-Castle/SRC-EXAMPLE/SIEVE/2.GCD-work/CC", in_dir/"CC")
+    return_code = subprocess.run(["gcc", "-I", in_dir, "-c", file]).returncode
+    assert return_code == 0
+
+
+def test_0a(simpleSieve, sieveInterface, sieveClass, tmp_path):
+    with open(tmp_path/"sieve-interface.c", 'w') as f:
+        write_header(f)
+        f.write(simpleSieve.render())
+        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")
+def test_0b(simpleSieve, sieveInterface, sieveClass, tmp_path):
+    with open(tmp_path/"sieve-interface.c", 'w') as f:
+        write_header(f)
+        f.write(simpleSieve.render())
+        f.write(sieveInterface.render())
+        f.write(sieveClass.render())
+    verify_it_compiles(f.name, tmp_path)
+    
+
[e-mail](reason="More Generate C-file(s)")
+def test_more(): pass