提交: 1403faaa44fb4319baa0ac784a3d017a71cdefc5 - CCastle2 (hg)

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

Commit MetaInfo

• 修订版: 1403faaa44fb4319baa0ac784a3d017a71cdefc5 (tree)
• 时间: 2023-10-19 00:05:00
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

ASIS (busy with NameSpace)

更改概述

• modified: Makefile
• modified: TestDoubles/AIGR/sieve/__init__.py
• modified: TestDoubles/AIGR/sieve/protocols.py
• modified: TestDoubles/reference/protocols/SimpleSieve.rpy
• modified: TestDoubles/reference/protocols/SlowStart.rpy
• modified: TestDoubles/reference/protocols/SlowStart_1.rpy
• modified: TestDoubles/reference/protocols/StartSieve.rpy
• modified: castle/aigr/__init__.py
• modified: castle/aigr/namespaces.py
• modified: castle/aigr/protocols.py
• modified: castle/writers/RPy/templates/parts/interface_DataStructures.jinja2
• modified: castle/writers/RPy/templates/parts/protocol_DataStructures.jinja2
• modified: castle/writers/RPy/templates/protocol.jinja2
• modified: pytst/writers/RPy/test_3_SieveProtocols.py
• add: TestDoubles/AIGR/base/__init__.py
• add: castle/writers/RPy/templates/parts/protocol_imports.jinja2

差异

diff -r 26824204f5e1 -r 1403faaa44fb Makefile
--- a/Makefile	Wed Oct 18 16:06:13 2023 +0200
+++ b/Makefile	Wed Oct 18 17:05:00 2023 +0200
@@ -21,10 +21,12 @@
 	pytst/aigr/test_0_aid.py				\
 #
 rPY_CURRENT = \
+	pytst/aigr/test_3_namespaces.py				\
+#
+CC2CPy_TODO = \
+	pytst/aigr/test_0_AIGR.py				\
 	pytst/writers/RPy/test_3_SieveProtocols.py		\
 	pytst/writers/RPy/test_4_NameSpaces.py			\
-#
-CC2CPy_TODO = \
 	pytst/writers/RPy/test_99_SieveMoats.py			\
 	pytst/writers/RPy/test_999.py 				\
 #

diff -r 26824204f5e1 -r 1403faaa44fb TestDoubles/AIGR/base/__init__.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TestDoubles/AIGR/base/__init__.py	Wed Oct 18 17:05:00 2023 +0200
@@ -0,0 +1,5 @@
+# (C) Albert Mietus, 2023. Part of Castle/CCastle project
+
+from castle.aigr.protocols import baseProtocol
+
+Protocol = baseProtocol

diff -r 26824204f5e1 -r 1403faaa44fb TestDoubles/AIGR/sieve/__init__.py
--- a/TestDoubles/AIGR/sieve/__init__.py	Wed Oct 18 16:06:13 2023 +0200
+++ b/TestDoubles/AIGR/sieve/__init__.py	Wed Oct 18 17:05:00 2023 +0200
@@ -1,4 +1,5 @@
 # (C) Albert Mietus, 2023. Part of Castle/CCastle project
 
 from .protocols import *
-from .moats import *
+from .namespaces import *
+#XXXfrom .moats import *

diff -r 26824204f5e1 -r 1403faaa44fb TestDoubles/AIGR/sieve/protocols.py
--- a/TestDoubles/AIGR/sieve/protocols.py	Wed Oct 18 16:06:13 2023 +0200
+++ b/TestDoubles/AIGR/sieve/protocols.py	Wed Oct 18 17:05:00 2023 +0200
@@ -10,6 +10,7 @@
                                    Event(name='runTo',  return_type=None, typedParameters=(TypedParameter(name='max', type=int),)),
                                    Event(name='newMax', return_type=None, typedParameters=(TypedParameter(name='max', type=int),))))
 
+
 SlowStart = EventProtocol('SlowStart',
                               typedParameters=(TypedParameter(name='queue_max', type=int),),
                               events=(
@@ -17,7 +18,7 @@
 
 SlowStart_1 = ProtocolWrapper("SlowStart_1",
                               based_on=SlowStart,
-                              #arguments=(Argument(name=queue_max, value=1),))
+                              #OR: arguments=(Argument(name=queue_max, value=1),))
                               arguments=(Argument(value=1),))
 
 SimpleSieve = EventProtocol('SimpleSieve',

diff -r 26824204f5e1 -r 1403faaa44fb TestDoubles/reference/protocols/SimpleSieve.rpy
--- a/TestDoubles/reference/protocols/SimpleSieve.rpy	Wed Oct 18 16:06:13 2023 +0200
+++ b/TestDoubles/reference/protocols/SimpleSieve.rpy	Wed Oct 18 17:05:00 2023 +0200
@@ -6,8 +6,7 @@
 from CC import buildin
 from CC import base
 
-#Put the Castle/generated imports here
-
+import SlowStart_1
 
 
 ##
@@ -19,7 +18,7 @@
 
 cc_P_SimpleSieve = buildin.CC_B_Protocol(name="SimpleSieve",
                                 kind=buildin.ProtocolKind.Event,
-                                inherit_from=cc_P_SlowStart_1,
+                                inherit_from=SlowStart_1.cc_P_SlowStart_1,
                                 events=[])
 
 cc_P_SimpleSieve.events.append(buildin.CC_B_P_EventID(name="input",

diff -r 26824204f5e1 -r 1403faaa44fb TestDoubles/reference/protocols/SlowStart.rpy
--- a/TestDoubles/reference/protocols/SlowStart.rpy	Wed Oct 18 16:06:13 2023 +0200
+++ b/TestDoubles/reference/protocols/SlowStart.rpy	Wed Oct 18 17:05:00 2023 +0200
@@ -22,7 +22,7 @@
                                     ('queue_max', int),
                                 ),
                                 kind=buildin.ProtocolKind.Event,
-                                inherit_from=cc_P_Protocol,
+                                inherit_from=base.cc_P_Protocol,
                                 events=[])
 
 cc_P_SlowStart.events.append(buildin.CC_B_P_EventID(name="setMax",

diff -r 26824204f5e1 -r 1403faaa44fb TestDoubles/reference/protocols/SlowStart_1.rpy
--- a/TestDoubles/reference/protocols/SlowStart_1.rpy	Wed Oct 18 16:06:13 2023 +0200
+++ b/TestDoubles/reference/protocols/SlowStart_1.rpy	Wed Oct 18 17:05:00 2023 +0200
@@ -6,8 +6,7 @@
 from CC import buildin
 from CC import base
 
-#Put the Castle/generated imports here
-
+import SlowStart
 
 
 ##
@@ -19,7 +18,7 @@
 
 cc_P_SlowStart_1 = buildin.CC_B_Protocol(name="SlowStart_1",
                                 kind=buildin.ProtocolKind.Event,
-                                inherit_from=cc_P_SlowStart,
+                                inherit_from=SlowStart.cc_P_SlowStart,
                                 events=[])
 
 cc_P_SlowStart_1.events.append(buildin.CC_B_P_EventID(name="setMax",

diff -r 26824204f5e1 -r 1403faaa44fb TestDoubles/reference/protocols/StartSieve.rpy
--- a/TestDoubles/reference/protocols/StartSieve.rpy	Wed Oct 18 16:06:13 2023 +0200
+++ b/TestDoubles/reference/protocols/StartSieve.rpy	Wed Oct 18 17:05:00 2023 +0200
@@ -20,7 +20,7 @@
 
 cc_P_StartSieve = buildin.CC_B_Protocol(name="StartSieve",
                                 kind=buildin.ProtocolKind.Event,
-                                inherit_from=cc_P_Protocol,
+                                inherit_from=base.cc_P_Protocol,
                                 events=[])
 
 cc_P_StartSieve.events.append(buildin.CC_B_P_EventID(name="runTo",

diff -r 26824204f5e1 -r 1403faaa44fb castle/aigr/__init__.py
--- a/castle/aigr/__init__.py	Wed Oct 18 16:06:13 2023 +0200
+++ b/castle/aigr/__init__.py	Wed Oct 18 17:05:00 2023 +0200
@@ -13,3 +13,4 @@
 from .events import *
 from .protocols import *
 from .interfaces import *
+from .namespaces import *

diff -r 26824204f5e1 -r 1403faaa44fb castle/aigr/namespaces.py
--- a/castle/aigr/namespaces.py	Wed Oct 18 16:06:13 2023 +0200
+++ b/castle/aigr/namespaces.py	Wed Oct 18 17:05:00 2023 +0200
@@ -4,14 +4,75 @@
 
 There are several NameSpaces: the most prominent one is the ``Source_NS``, roughly the file that contains the (Castle) code.
 """
+from __future__ import annotations
 
-from __future__ import annotations
+__all__ = ['NameSpace', 'Source_NS', 'GENERATED']
+
+import logging; logger = logging.getLogger(__name__)
 import typing as PTH                                                                                  # Python TypeHints
 from enum import Enum
 from dataclasses import dataclass, KW_ONLY
 from dataclasses import field as dc_field
 
-from . import AIGR
 
-class NameSpace(AIGR): pass
-class Source_NS(NameSpace): pass
+from . import AIGR, _Marker
+
+class GENERATED(_Marker):pass
+
+
+class NamedNode(AIGR): pass # Move up, name:str is part of it
+class NameError(AttributeError):pass
+
+@dataclass
+class NameSpace(AIGR):
+    """This models a namespace (like a file, see ``Source_NS``).
+
+    It contained *"named nodes"* that should be :method:`register()`ed and can be found by :method:`getID()` and/or :method:`findNode()`.
+
+    XXX More"""
+
+    name       :str
+    _: KW_ONLY
+    _dict      :dict=dc_field(init=None, default_factory=lambda: dict())
+
+    def register(self, named_node :NamedNode):
+        name = named_node.name
+        if name in self._dict:
+            old=self._dict[name]
+            logger.warning(f"The '{name}'-node is already in this namespace; -- it will be lost." +
+                           f"Removed: {old}. New: {named_node}")
+
+        self._dict[name] = named_node
+        named_node.ns = self
+
+
+    def findNode(self, name :str) ->PTH.Optional(NamedNode):
+        """Return the NamedNode with the specified name (aka ID), or None.
+           See :method:`getID` for an alternative"""
+        return self._dict.get(name, None)
+
+
+    def getID(self, name :str) ->NamedNode: #Or raise NameError
+        """Return the NamedNode with the specified name (aka ID), or raised an NameError:AttributeError.
+           See :method:`findNode` for an alternative"""
+        node = self.findNode(name)
+        if node is None:
+            raise NameError(f"No node named {name} in NS:{self.name}")
+        return node
+
+    def search(self, dottedName :str) ->PTH.Optional(NamedNode):
+        """Search the namespace for the 1st part of `dottedName`, then that NS for the next part, etc. And return the "deepest" node, or None"""
+
+        parts = dottedName.split('.',maxsplit=1) # parts is [<name>, (<name>.)*] parts[1] can be absent, parts[0] always exist
+        node = self.findNode(parts[0])
+        if len(parts) == 1:
+            return node
+        try:
+            return node.search(parts[1])
+        except AttributeError: #node isn't a search'able/NameSpace --> Not found --> return None
+            return none
+
+@dataclass
+class Source_NS(NameSpace):
+    _: KW_ONLY
+    source       :str

diff -r 26824204f5e1 -r 1403faaa44fb castle/aigr/protocols.py
--- a/castle/aigr/protocols.py	Wed Oct 18 16:06:13 2023 +0200
+++ b/castle/aigr/protocols.py	Wed Oct 18 17:05:00 2023 +0200
@@ -10,6 +10,7 @@
 from . import AIGR, _Marker
 from .events import Event
 from .aid import TypedParameter, Argument                                                            # Castle/AIGR types
+from .namespaces import NameSpace
 
 __all__ = ['ProtocolKind', 'Protocol', 'EventProtocol']
 # DataProtocol, StreamProtocol are added/implemented later
@@ -35,11 +36,12 @@
     """
     _BASE: PTH.ClassVar=None                                                                        # pragma: no mutate
 
-    name: str
+    name             :str
     _: KW_ONLY
-    kind: ProtocolKind
-    based_on: PTH.Optional[Protocol]=dc_field(default_factory= lambda :Protocol._BASE)             # pragma: no mutate
-    typedParameters: PTH.Optional[PTH.Sequence[TypedParameter]]=()
+    kind             :ProtocolKind
+    based_on         :PTH.Optional[Protocol]=dc_field(default_factory= lambda :Protocol._BASE)             # pragma: no mutate
+    typedParameters  :PTH.Optional[PTH.Sequence[TypedParameter]]=()
+    _ns              :PTH.Optional[NameSpace]=dc_field(init=None, default=None)
 
 
 @dataclass                                                                                          # pragma: no mutate

diff -r 26824204f5e1 -r 1403faaa44fb castle/writers/RPy/templates/parts/interface_DataStructures.jinja2
--- a/castle/writers/RPy/templates/parts/interface_DataStructures.jinja2	Wed Oct 18 16:06:13 2023 +0200
+++ b/castle/writers/RPy/templates/parts/interface_DataStructures.jinja2	Wed Oct 18 17:05:00 2023 +0200
@@ -14,7 +14,7 @@
   {% for p in interface.ports %}
     {{- m.comp_interface_Name(interface.name) }}.ports.append(buildin.CC_B_C_PortID(name="{{ p.name  }}",
                                 protocol={{m.ProtocolName(p.type.name)}},
-                                direction=XXX_NS_XXX. {{p.direction}},
+                                direction={{p.direction}},
                                 part_of={{ m.comp_interface_Name(interface.name) }}))
   {% endfor %} {#- ports #}
 

diff -r 26824204f5e1 -r 1403faaa44fb castle/writers/RPy/templates/parts/protocol_DataStructures.jinja2
--- a/castle/writers/RPy/templates/parts/protocol_DataStructures.jinja2	Wed Oct 18 16:06:13 2023 +0200
+++ b/castle/writers/RPy/templates/parts/protocol_DataStructures.jinja2	Wed Oct 18 17:05:00 2023 +0200
@@ -24,7 +24,7 @@
 
   {% endif %}
                                 kind=buildin.{{proto.kind}},
-                                inherit_from={{m.ProtocolName(proto.based_on.name)}},
+                                inherit_from={{proto.based_on.ns}}.{{m.ProtocolName(proto.based_on.name)}}, # XXX NS not ready
                                 events=[])
 
   {% for e in proto.events %}

diff -r 26824204f5e1 -r 1403faaa44fb castle/writers/RPy/templates/parts/protocol_imports.jinja2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/castle/writers/RPy/templates/parts/protocol_imports.jinja2	Wed Oct 18 17:05:00 2023 +0200
@@ -0,0 +1,1 @@
+XXX protocol_imports.jinja2

diff -r 26824204f5e1 -r 1403faaa44fb castle/writers/RPy/templates/protocol.jinja2
--- a/castle/writers/RPy/templates/protocol.jinja2	Wed Oct 18 16:06:13 2023 +0200
+++ b/castle/writers/RPy/templates/protocol.jinja2	Wed Oct 18 17:05:00 2023 +0200
@@ -15,8 +15,10 @@
 
 {% block imports %}
 #Put the Castle/generated imports here
+{% include 'parts/protocol_imports.jinja2' %}
 {% endblock %}
 
+
 {% block EventIndexes %}
 {% for protocol in protocols %}
    {% set events = protocol.events %}

diff -r 26824204f5e1 -r 1403faaa44fb pytst/writers/RPy/test_3_SieveProtocols.py
--- a/pytst/writers/RPy/test_3_SieveProtocols.py	Wed Oct 18 16:06:13 2023 +0200
+++ b/pytst/writers/RPy/test_3_SieveProtocols.py	Wed Oct 18 17:05:00 2023 +0200
@@ -8,16 +8,23 @@
 from . import T_Protocol
 
 
-
[e-mail](reason="NS support in ``TestDoubles/reference/protocols/*``, not in code")
 def test_01_StartSieve(generatedProtocol_verifier):
     generatedProtocol_verifier(aigr_mock=sieve.StartSieve, td=TstDoubles('protocols/StartSieve'))
 
+
[e-mail]("Top one first")
[e-mail](reason="NS support in ``TestDoubles/reference/protocols/*``, not in code")
 def test_02_SlowStart(generatedProtocol_verifier):
     generatedProtocol_verifier(aigr_mock=sieve.SlowStart, td=TstDoubles('protocols/SlowStart'))
 
[e-mail]("Top one first")
[e-mail](reason="NS support in ``TestDoubles/reference/protocols/*``, not in code")
 def test_03a_SlowStart1(generatedProtocol_verifier):
     generatedProtocol_verifier(aigr_mock=sieve.SlowStart_1, td=TstDoubles('protocols/SlowStart_1'))
 
[e-mail]("Top one first")
[e-mail](reason="NS support in ``TestDoubles/reference/protocols/*``, not in code")
 def test_03b_SimpleSieve(generatedProtocol_verifier):
     generatedProtocol_verifier(aigr_mock=sieve.SimpleSieve, td=TstDoubles('protocols/SimpleSieve'))