提交: 43d9cfa74f236e001b636cd47d89b714ad8f8da9 - CCastle2 (hg)

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

Commit MetaInfo

• 修订版: 43d9cfa74f236e001b636cd47d89b714ad8f8da9 (tree)
• 时间: 2023-10-20 22:22:22
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

NameSpace/NamedNode: REFACTOR: new module: namednode - move code from init.py tp namednodes.py

更改概述

• modified: castle/aigr/__init__.py
• modified: castle/aigr/events.py
• modified: castle/aigr/interfaces.py
• modified: castle/aigr/namespaces.py
• modified: castle/aigr/protocols.py
• add: castle/aigr/namednodes.py

差异

diff -r 5e4cf28b8e9a -r 43d9cfa74f23 castle/aigr/__init__.py
--- a/castle/aigr/__init__.py	Fri Oct 20 15:08:54 2023 +0200
+++ b/castle/aigr/__init__.py	Fri Oct 20 15:22:22 2023 +0200
@@ -1,10 +1,9 @@
 # (C) Albert Mietus, 2023. Part of Castle/CCastle project
 
 from __future__ import annotations
+from dataclasses import dataclass
 
-from dataclasses import dataclass, KW_ONLY
-from dataclasses import field as dc_field
-import typing as PTH                                                                                  # Python TypeHints
+
 
 class AIGR: # Abstract Intermediate Graph Representation
     def __new__(cls, *args, **kwargs):
@@ -12,25 +11,14 @@
             raise NotImplementedError(f"Instantiate a subclass of {cls}, not the `Abstract Intermediate Graph Representation`` itself")
         return super().__new__(cls)
 
-@dataclass
-class NamedNode(AIGR):
-    name       :str
-    _: KW_ONLY
-    _ns        :PTH.Optional[NameSpace]=dc_field(init=None, default=None)  #type: ignore[call-overload]
 
-    def register_in_NS(self, ns):
-        self._ns = ns
-
-
-
-class NameError(AttributeError):pass
 
 @dataclass
 class _Marker:
     msg :str=""
 
-
 from .events import *
 from .protocols import *
 from .interfaces import *
 from .namespaces import *
+from .namednodes import *

diff -r 5e4cf28b8e9a -r 43d9cfa74f23 castle/aigr/events.py
--- a/castle/aigr/events.py	Fri Oct 20 15:08:54 2023 +0200
+++ b/castle/aigr/events.py	Fri Oct 20 15:22:22 2023 +0200
@@ -9,8 +9,8 @@
 
 import typing as PTH                                                                                  # Python TypeHints
 from dataclasses import dataclass, KW_ONLY
-from . import NamedNode
 from .aid import TypedParameter                                                                       # Castle/AIGR type
+from .namednodes import *
 
 __all__ = ['Event']
 

diff -r 5e4cf28b8e9a -r 43d9cfa74f23 castle/aigr/interfaces.py
--- a/castle/aigr/interfaces.py	Fri Oct 20 15:08:54 2023 +0200
+++ b/castle/aigr/interfaces.py	Fri Oct 20 15:22:22 2023 +0200
@@ -4,9 +4,10 @@
 from enum import Enum
 from dataclasses import dataclass, KW_ONLY
 from dataclasses import field as dc_field
-from . import AIGR, NamedNode
+from . import AIGR
 from .protocols import Protocol
 from .aid import TypedParameter                                                                      # Castle/AIGR types
+from .namednodes import *
 
 __all__ = ['PortDirection', 'Port', 'ComponentInterface']
 

diff -r 5e4cf28b8e9a -r 43d9cfa74f23 castle/aigr/namednodes.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/castle/aigr/namednodes.py	Fri Oct 20 15:22:22 2023 +0200
@@ -0,0 +1,25 @@
+# (C) Albert Mietus, 2023. Part of Castle/CCastle project
+
+from __future__ import annotations
+
+__all__ = ['NameError', 'NamedNode']
+
+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
+
+@dataclass
+class NamedNode(AIGR):
+    name       :str
+    _: KW_ONLY
+    _ns        :PTH.Optional[NameSpace]=dc_field(init=None, default=None)  #type: ignore[call-overload]
+
+    def register_in_NS(self, ns):
+        self._ns = ns
+

diff -r 5e4cf28b8e9a -r 43d9cfa74f23 castle/aigr/namespaces.py
--- a/castle/aigr/namespaces.py	Fri Oct 20 15:08:54 2023 +0200
+++ b/castle/aigr/namespaces.py	Fri Oct 20 15:22:22 2023 +0200
@@ -13,11 +13,10 @@
 from enum import Enum
 from dataclasses import dataclass, KW_ONLY
 from dataclasses import field as dc_field
-
+from .namednodes import *
 
-from . import AIGR, _Marker, NamedNode, NameError
+from . import AIGR, _Marker
 
-#class GENERATED(_Marker):pass
 GENERATED=_Marker('No Source as it is GENERATED')
 
 

diff -r 5e4cf28b8e9a -r 43d9cfa74f23 castle/aigr/protocols.py
--- a/castle/aigr/protocols.py	Fri Oct 20 15:08:54 2023 +0200
+++ b/castle/aigr/protocols.py	Fri Oct 20 15:22:22 2023 +0200
@@ -7,9 +7,11 @@
 from enum import Enum
 from dataclasses import dataclass, KW_ONLY
 from dataclasses import field as dc_field
-from . import AIGR, NamedNode
+from . import AIGR
 from .events import Event
 from .aid import TypedParameter, Argument                                                            # Castle/AIGR types
+
+from .namednodes import *
 from .namespaces import NameSpace
 
 __all__ = ['ProtocolKind', 'Protocol', 'EventProtocol']