Commit: b8ac5b1d1fbce13f0f363e8322af775f7bde9efc - CCastle2 (hg)

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

Commit MetaInfo

• Révision: b8ac5b1d1fbce13f0f363e8322af775f7bde9efc (tree)
• l'heure: 2024-03-10 02:20:51
• Auteur: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Message de Log

improved import structure

Change Summary

• modified: base_packages/castle-aigr/castle/aigr/__init__.py
• modified: base_packages/castle-aigr/castle/aigr/aid.py
• modified: base_packages/castle-aigr/castle/aigr/events.py
• modified: base_packages/castle-aigr/castle/aigr/interfaces.py
• modified: base_packages/castle-aigr/castle/aigr/namespaces.py
• modified: base_packages/castle-aigr/castle/aigr/protocols.py
• modified: base_packages/castle-aigr/pytst/test_1_events.py
• modified: base_packages/castle-aigr/pytst/test_2b_protocol.py
• modified: base_packages/castle-aigr/pytst/test_2c_GenericProtocols.py
• modified: base_packages/castle-aigr/pytst/test_3_namespaces.py
• modified: base_packages/castle-aigr/pytst/test_SpecialiseGenerics.py
• add: base_packages/castle-aigr/castle/aigr/nodes.py
• delete: base_packages/castle-aigr/castle/aigr/namednodes.py

Modification

diff -r b36d513ce300 -r b8ac5b1d1fbc base_packages/castle-aigr/castle/aigr/__init__.py
--- a/base_packages/castle-aigr/castle/aigr/__init__.py	Sat Mar 09 17:47:02 2024 +0100
+++ b/base_packages/castle-aigr/castle/aigr/__init__.py	Sat Mar 09 18:20:51 2024 +0100
@@ -21,4 +21,5 @@
 from .protocols import *
 from .interfaces import *
 from .namespaces import *
-from .namednodes import *
+from .nodes import *
+from .aid import *

diff -r b36d513ce300 -r b8ac5b1d1fbc base_packages/castle-aigr/castle/aigr/aid.py
--- a/base_packages/castle-aigr/castle/aigr/aid.py	Sat Mar 09 17:47:02 2024 +0100
+++ b/base_packages/castle-aigr/castle/aigr/aid.py	Sat Mar 09 18:20:51 2024 +0100
@@ -6,9 +6,8 @@
 from dataclasses import dataclass, KW_ONLY
 from dataclasses import field as dc_field
 from . import AIGR
-from .namednodes import NamedNode
+from .nodes import NamedNode
 
-__all__:PTH.List[str] = [] # Manually import what you need!
 
 @dataclass
 class TypedParameter(AIGR):
@@ -26,20 +25,5 @@
     name: PTH.Optional[str]=None # XXX ToDo str or  ID?
 
 
-@dataclass
-class Specialise(NamedNode):
-    _: KW_ONLY
-    based_on:  NamedNode
-    arguments: PTH.Sequence[Argument]
-
-    def __post_init__(self):
-        if not self.name: # or self.name == "":
-            self.name = f"Specialised version of {self.based_on.name}({self.arguments})"
-
-    def __getattr__(self, name):
-        """delegate "everything" to `.`based_on``!
-        Kind of inherit, but not to superclass (Protocol), but to the instance (a Protocol) that is wrapped"""
-
-        return getattr(self.based_on, name)
 
 

diff -r b36d513ce300 -r b8ac5b1d1fbc base_packages/castle-aigr/castle/aigr/events.py
--- a/base_packages/castle-aigr/castle/aigr/events.py	Sat Mar 09 17:47:02 2024 +0100
+++ b/base_packages/castle-aigr/castle/aigr/events.py	Sat Mar 09 18:20:51 2024 +0100
@@ -4,7 +4,7 @@
 import typing as PTH                                                                                  # Python TypeHints
 from dataclasses import dataclass, KW_ONLY
 from .aid import TypedParameter                                                                       # Castle/AIGR type
-from .namednodes import *
+from .nodes import *
 
 __all__ = ['Event']
 

diff -r b36d513ce300 -r b8ac5b1d1fbc base_packages/castle-aigr/castle/aigr/interfaces.py
--- a/base_packages/castle-aigr/castle/aigr/interfaces.py	Sat Mar 09 17:47:02 2024 +0100
+++ b/base_packages/castle-aigr/castle/aigr/interfaces.py	Sat Mar 09 18:20:51 2024 +0100
@@ -7,7 +7,7 @@
 from . import AIGR
 from .protocols import Protocol
 from .aid import TypedParameter                                                                      # Castle/AIGR types
-from .namednodes import NamedNode, ID
+from .nodes import NamedNode, ID
 
 __all__ = ['PortDirection', 'Port', 'ComponentInterface']
 

diff -r b36d513ce300 -r b8ac5b1d1fbc base_packages/castle-aigr/castle/aigr/namednodes.py
--- a/base_packages/castle-aigr/castle/aigr/namednodes.py	Sat Mar 09 17:47:02 2024 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-# (C) Albert Mietus, 2023. Part of Castle/CCastle project
-
-from __future__ import annotations
-
-__all__ = ['NameError', 'NamedNode', 'ID']
-
-from dataclasses import dataclass, KW_ONLY
-from dataclasses import field as dc_field
-import typing as PTH                                                                                  # Python TypeHints
-
-from . import AIGR
-
-
-class NameError(AttributeError):pass
-
-class ID(str): pass #XXX for now and ID is a string, but that can be changed
-
-@dataclass
-class NamedNode(AIGR):
-    name       : ID|str
-    _: KW_ONLY
-    # type(_ns) is NamedNode, but that leads to a imports-cycle. So, use te more generic AIGR
-    _ns        :PTH.Optional[AIGR]=dc_field(init=None, default=None)  #type: ignore[call-overload]
-
-    def __post_init__(self):
-        if not isinstance(self.name, ID):
-            self.name = ID(self.name)
-
-    def register_in_NS(self, ns: AIGR): #same: type(ns) is NameSpace, but ...
-        self._ns = ns
-
-    @property
-    def ns(self):
-        return self._ns
-

diff -r b36d513ce300 -r b8ac5b1d1fbc base_packages/castle-aigr/castle/aigr/namespaces.py
--- a/base_packages/castle-aigr/castle/aigr/namespaces.py	Sat Mar 09 17:47:02 2024 +0100
+++ b/base_packages/castle-aigr/castle/aigr/namespaces.py	Sat Mar 09 18:20:51 2024 +0100
@@ -14,7 +14,7 @@
 from dataclasses import dataclass, KW_ONLY
 from dataclasses import field as dc_field
 
-from .namednodes import NamedNode, NameError, ID
+from .nodes import NamedNode, NameError, ID
 
 from . import AIGR, _Marker
 

diff -r b36d513ce300 -r b8ac5b1d1fbc base_packages/castle-aigr/castle/aigr/nodes.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base_packages/castle-aigr/castle/aigr/nodes.py	Sat Mar 09 18:20:51 2024 +0100
@@ -0,0 +1,49 @@
+# (C) Albert Mietus, 2023. Part of Castle/CCastle project
+
+from __future__ import annotations
+
+from dataclasses import dataclass, KW_ONLY
+from dataclasses import field as dc_field
+import typing as PTH                                                                                  # Python TypeHints
+
+from . import AIGR
+
+class ID(str): pass #XXX for now and ID is a string, but that can be changed
+
+
+class NameError(AttributeError):pass
+
+
+@dataclass
+class NamedNode(AIGR):
+    name       : ID|str
+    _: KW_ONLY
+    # type(_ns) is NamedNode, but that leads to a imports-cycle. So, use te more generic AIGR
+    _ns        :PTH.Optional[AIGR]=dc_field(init=None, default=None)  #type: ignore[call-overload]
+
+    def __post_init__(self):
+        if not isinstance(self.name, ID):
+            self.name = ID(self.name)
+
+    def register_in_NS(self, ns: AIGR): #same: type(ns) is NameSpace, but ...
+        self._ns = ns
+
+    @property
+    def ns(self):
+        return self._ns
+
+@dataclass
+class Specialise(NamedNode):
+    _: KW_ONLY
+    based_on:  NamedNode
+    arguments: PTH.Sequence[Argument]
+
+    def __post_init__(self):
+        if not self.name: # or self.name == "":
+            self.name = f"Specialised version of {self.based_on.name}({self.arguments})"
+
+    def __getattr__(self, name):
+        """delegate "everything" to `.`based_on``!
+        Kind of inherit, but not to superclass (Protocol), but to the instance (a Protocol) that is wrapped"""
+
+        return getattr(self.based_on, name)

diff -r b36d513ce300 -r b8ac5b1d1fbc base_packages/castle-aigr/castle/aigr/protocols.py
--- a/base_packages/castle-aigr/castle/aigr/protocols.py	Sat Mar 09 17:47:02 2024 +0100
+++ b/base_packages/castle-aigr/castle/aigr/protocols.py	Sat Mar 09 18:20:51 2024 +0100
@@ -10,8 +10,8 @@
 from . import AIGR
 from .events import Event
 from .aid import TypedParameter, Argument                                                            # Castle/AIGR types
-from .namednodes import NamedNode, ID
-from .aid import Specialise
+from .nodes import NamedNode, ID
+
 
 
 __all__ = ['ProtocolKind', 'Protocol', 'EventProtocol']

diff -r b36d513ce300 -r b8ac5b1d1fbc base_packages/castle-aigr/pytst/test_1_events.py
--- a/base_packages/castle-aigr/pytst/test_1_events.py	Sat Mar 09 17:47:02 2024 +0100
+++ b/base_packages/castle-aigr/pytst/test_1_events.py	Sat Mar 09 18:20:51 2024 +0100
@@ -1,7 +1,7 @@
 # (C) Albert Mietus, 2023. Part of Castle/CCastle project
 
 from castle.aigr import Event
-from castle.aigr.aid import TypedParameter
+from castle.aigr import TypedParameter
 
 
 def test_0_Event_empty():

diff -r b36d513ce300 -r b8ac5b1d1fbc base_packages/castle-aigr/pytst/test_2b_protocol.py
--- a/base_packages/castle-aigr/pytst/test_2b_protocol.py	Sat Mar 09 17:47:02 2024 +0100
+++ b/base_packages/castle-aigr/pytst/test_2b_protocol.py	Sat Mar 09 18:20:51 2024 +0100
@@ -5,7 +5,7 @@
 
 from castle.aigr import Protocol, ProtocolKind
 from castle.aigr import Event, EventProtocol
-from castle.aigr.aid import TypedParameter
+from castle.aigr import TypedParameter
 
 
 @pytest.fixture
@@ -32,12 +32,12 @@
 
 
 def test_2a_based_onRoot(emptyProtocol):
-    import castle.aigr.protocols
-    emptyProtocol.based_on is castle.aigr.protocols._RootProtocol
+    from castle.aigr.protocols import _RootProtocol # Only available when imported
+    emptyProtocol.based_on is _RootProtocol
 
 def test_2b_based_onRoot_notSet(emptyProtocol_baseNotSet):
-    import castle.aigr.protocols
-    emptyProtocol_baseNotSet.based_on is castle.aigr.protocols._RootProtocol
+    from castle.aigr.protocols import _RootProtocol # Only available when imported
+    emptyProtocol_baseNotSet.based_on is _RootProtocol
 
 
 def test_3a_eventIndex_empty(emptyProtocol, anEvent):

diff -r b36d513ce300 -r b8ac5b1d1fbc base_packages/castle-aigr/pytst/test_2c_GenericProtocols.py
--- a/base_packages/castle-aigr/pytst/test_2c_GenericProtocols.py	Sat Mar 09 17:47:02 2024 +0100
+++ b/base_packages/castle-aigr/pytst/test_2c_GenericProtocols.py	Sat Mar 09 18:20:51 2024 +0100
@@ -49,7 +49,7 @@
 
 from castle.aigr import Protocol, ProtocolKind
 from castle.aigr import Event, EventProtocol
-from castle.aigr.aid import TypedParameter, Argument, Specialise
+from castle.aigr import TypedParameter, Argument, Specialise
 
 """ There are a few cases
 ///CastleCode

diff -r b36d513ce300 -r b8ac5b1d1fbc base_packages/castle-aigr/pytst/test_3_namespaces.py
--- a/base_packages/castle-aigr/pytst/test_3_namespaces.py	Sat Mar 09 17:47:02 2024 +0100
+++ b/base_packages/castle-aigr/pytst/test_3_namespaces.py	Sat Mar 09 18:20:51 2024 +0100
@@ -8,8 +8,8 @@
 
 from castle.aigr import NameSpace, Source_NS
 
-from castle.aigr.namespaces import NamedNode ## May be moved ip
-from castle.aigr.namespaces import NameError
+from castle.aigr import NamedNode, NameError
+
 
 @dataclass
 class DummyNode(NamedNode):

diff -r b36d513ce300 -r b8ac5b1d1fbc base_packages/castle-aigr/pytst/test_SpecialiseGenerics.py
--- a/base_packages/castle-aigr/pytst/test_SpecialiseGenerics.py	Sat Mar 09 17:47:02 2024 +0100
+++ b/base_packages/castle-aigr/pytst/test_SpecialiseGenerics.py	Sat Mar 09 18:20:51 2024 +0100
@@ -2,9 +2,9 @@
 
 import pytest
 
-from castle.aigr import AIGR, NamedNode
-from castle.aigr.aid import TypedParameter, Argument
-from castle.aigr.aid import Specialise
+from castle.aigr import AIGR, NamedNode, Specialise
+from castle.aigr import TypedParameter, Argument
+
 
 @pytest.fixture
 def named_node():