Commit: 8e783da5dab406b5190f8be2618d001491965a13 - CCastle2 (hg)

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

Commit MetaInfo

• Revisão: 8e783da5dab406b5190f8be2618d001491965a13 (tree)
• Hora: 2023-02-13 07:23:54
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Mensagem de Log

(asis) fstring is gone; it just a str(ing)

Mudança Sumário

• modified: Makefile
• modified: castle/writers/CC2Cpy/CCbase.py
• modified: castle/writers/CC2Cpy/Component.py
• modified: castle/writers/CC2Cpy/Event.py
• modified: castle/writers/CC2Cpy/Protocol.py
• modified: pytst/writers/CC2Cpy/test_0.py

Diff

diff -r 42ac70b0a6b1 -r 8e783da5dab4 Makefile
--- a/Makefile	Sun Feb 12 23:09:01 2023 +0100
+++ b/Makefile	Sun Feb 12 23:23:54 2023 +0100
@@ -92,6 +92,9 @@
 XXX:
 	grep XXX `find . -type f -name \*.py`
 
+WC:
+	wc -l `find . -type f -name \*.py`
+
 
 PYREVERSE_DIR=pyreversed/
 PYREVERSE_FORMAT=svg

diff -r 42ac70b0a6b1 -r 8e783da5dab4 castle/writers/CC2Cpy/CCbase.py
--- a/castle/writers/CC2Cpy/CCbase.py	Sun Feb 12 23:09:01 2023 +0100
+++ b/castle/writers/CC2Cpy/CCbase.py	Sun Feb 12 23:23:54 2023 +0100
@@ -1,16 +1,77 @@
 # (C) Albert Mietus, 2022, 2023. Part of Castle/CCastle project
 
+
 from typing import TypeAlias, ClassVar, Optional
 from dataclasses import dataclass, field as dc_field, KW_ONLY
 from collections.abc import Sequence # Use for typing
 
+from castle.auxiliary.abcd import ABCD
 
-fstring: TypeAlias=str # a Fix (sized) string. May be inplemented as a C-string, a Pascal-string, or ...
+from enum import Enum
+
 
 class CC_Base: pass
 
 @dataclass
 class CC_TypedParameter(CC_Base):
     """This is many a helper class/struct to combine a parameter: a name and an type"""
-    name: fstring
+    name: str
     type: type
+
+class CC_PortDirection(Enum):
+    CC_B_PortDirectionIs_UNKNOWN  = Unknown   = 0
+    CC_B_PortDirectionIs_in       = In        = 1
+    CC_B_PortDirectionIs_out      = Out       = 2
+    CC_B_PortDirectionIs_bidirect = BiDir     = 3 # Not supported yet
+    CC_B_PortDirectionIs_master   = Master    = 4 # Not supported yet
+    CC_B_PortDirectionIs_slave    = Slave     = 5 # Not supported yet
+
+    def portray_name(self):                                                        ### CC_B_PortDirectionIs_{self.name}'
+        return f'{self.name}'
+
+@dataclass
+class CC_Port(CC_Base):
+    name: str
+    _ : KW_ONLY
+    direction: CC_PortDirection =  CC_PortDirection.Unknown
+    type: type
+
+    def portray_name(self) ->str:                                           ### <port name>
+        return f'{self.name}'
+
+    def portray_typePtr(self) ->str:                                           ### <port type> e.g a protocol
+        if isinstance(self.type, CC_Base):
+            return f'&{self.type.portray_name()}'
+        elif self.type is None:
+            return "NULL"
+        else:
+            from warnings import warn
+            tn = self.type if isinstance(self.type, str) else self.type.__name__
+            warn(f"Using string (or other non CC_Base types) port.types (for >>{tn}<<) is not wise", DeprecationWarning, stacklevel=2)
+            return f'&cc_P_{tn}'
+
+     
+
+@dataclass
+class CC_Function(ABCD, CC_Base):               # ABC
+    name: str
+    _ : KW_ONLY
+    type: type                            # the return type of the callable
+    body=None;                            # XXX Add the (AST of the) body LATER
+
+
+@dataclass
+class CC_Handler(CC_Function):            # ABC Can be an event of data/stream -- with or without paramters
+    _ : KW_ONLY
+    portID: CC_Port
+
+@dataclass
+class CC_EventHandler(CC_Handler):
+    _ : KW_ONLY
+    parameterTuple: "ToBeDone"
+
+@dataclass
+class CC_Method(CC_Function): pass
+class CC_ClassMethod(CC_Method): pass
+class CC_ElementMethod(CC_Method): pass      #Or CC InstanceMethod??
+

diff -r 42ac70b0a6b1 -r 8e783da5dab4 castle/writers/CC2Cpy/Component.py
--- a/castle/writers/CC2Cpy/Component.py	Sun Feb 12 23:09:01 2023 +0100
+++ b/castle/writers/CC2Cpy/Component.py	Sun Feb 12 23:23:54 2023 +0100
@@ -2,46 +2,12 @@
 
 __all__ = ['CC_B_ComponentInterface', 'CC_Port', 'CC_PortDirection', 'CC_B_ComponentClass']
 
-from enum import Enum
 
 from .CCbase import *
 from castle.auxiliary.pack import mk_tuple
-from castle.auxiliary.abcd import ABCD
 
 CC_Component: TypeAlias = 'CC_Component' # Forward ref                          # pragma: no mutate
 
-class CC_PortDirection(Enum):
-    CC_B_PortDirectionIs_UNKNOWN  = Unknown   = 0
-    CC_B_PortDirectionIs_in       = In        = 1
-    CC_B_PortDirectionIs_out      = Out       = 2
-    CC_B_PortDirectionIs_bidirect = BiDir     = 3 # Not supported yet
-    CC_B_PortDirectionIs_master   = Master    = 4 # Not supported yet
-    CC_B_PortDirectionIs_slave    = Slave     = 5 # Not supported yet
-
-    def portray_name(self):                                                        ### CC_B_PortDirectionIs_{self.name}'
-        return f'{self.name}'
-
-@dataclass
-class CC_Port(CC_Base):
-    name: str
-    _ : KW_ONLY
-    direction: CC_PortDirection =  CC_PortDirection.Unknown
-    type: type
-
-    def portray_name(self) ->str:                                           ### <port name>
-        return f'{self.name}'
-
-    def portray_typePtr(self) ->str:                                           ### <port type> e.g a protocol
-        if isinstance(self.type, CC_Base):
-            return f'&{self.type.portray_name()}'
-        elif self.type is None:
-            return "NULL"
-        else:
-            from warnings import warn
-            tn = self.type if isinstance(self.type, str) else self.type.__name__
-            warn(f"Using string (or other non CC_Base types) port.types (for >>{tn}<<) is not wise", DeprecationWarning, stacklevel=2)
-            return f'&cc_P_{tn}'
-
 
 @dataclass
 class CC_B_ComponentInterface(CC_Base):
@@ -95,31 +61,6 @@
 
 
 
-
-@dataclass
-class CC_Function(ABCD, CC_Base):               # ABC
-    name: str
-    _ : KW_ONLY
-    type: type                            # the return type of the callable
-    body=None;                            # XXX Add the (AST of the) body LATER
-
-
-@dataclass
-class CC_Handler(CC_Function):            # ABC Can be an event of data/stream -- with or without paramters
-    _ : KW_ONLY
-    portID: CC_Port
-
-@dataclass
-class CC_EventHandler(CC_Handler):
-    _ : KW_ONLY
-    parameterTuple: "ToBeDone"
-
-@dataclass
-class CC_Method(CC_Function): pass
-class CC_ClassMethod(CC_Method): pass
-class CC_ElementMethod(CC_Method): pass      #Or CC InstanceMethod??
-
-
 @dataclass
 class CC_B_ComponentClass(CC_Base):
     metaclass="NULL"                         # //NULL for now, later: meta-class

diff -r 42ac70b0a6b1 -r 8e783da5dab4 castle/writers/CC2Cpy/Event.py
--- a/castle/writers/CC2Cpy/Event.py	Sun Feb 12 23:09:01 2023 +0100
+++ b/castle/writers/CC2Cpy/Event.py	Sun Feb 12 23:23:54 2023 +0100
@@ -10,7 +10,7 @@
 
        It has a name, a return-type (can be void), and a sequence of typed parameters."""
 
-    name: fstring
+    name: str
     _: KW_ONLY # The field below must be passed as keywords, when initialising
     return_type: type=None
     typedParameters: Sequence[CC_TypedParameter]=()                                ## A tuple `()` is inmutable

diff -r 42ac70b0a6b1 -r 8e783da5dab4 castle/writers/CC2Cpy/Protocol.py
--- a/castle/writers/CC2Cpy/Protocol.py	Sun Feb 12 23:09:01 2023 +0100
+++ b/castle/writers/CC2Cpy/Protocol.py	Sun Feb 12 23:23:54 2023 +0100
@@ -34,7 +34,7 @@
     """
     _BASE: ClassVar=None                                                                             # pragma: no mutate
 
-    name: fstring
+    name: str
     kind: CC_ProtocolKind
     based_on: Optional[CC_B_Protocol]=dc_field(default_factory= lambda :CC_B_Protocol._BASE)
 

diff -r 42ac70b0a6b1 -r 8e783da5dab4 pytst/writers/CC2Cpy/test_0.py
--- a/pytst/writers/CC2Cpy/test_0.py	Sun Feb 12 23:09:01 2023 +0100
+++ b/pytst/writers/CC2Cpy/test_0.py	Sun Feb 12 23:23:54 2023 +0100
@@ -30,5 +30,3 @@
     """Test some trivial (type-hints) types; mostly by just using them"""
 
     assert CC_TypedParameter('test', int).type is int
-    assert fstring is str
-    assert fstring("foo") == "foo"