Commit: ebe02ce214ec506922e504213fd0ba4e9d38981f - CCastle2 (hg)

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

Commit MetaInfo

• Revision: ebe02ce214ec506922e504213fd0ba4e9d38981f (tree)
• Time: 2023-10-21 04:32:07
• Author: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

ASIS, refatored to remove mypy warning; added extra test for sub-NS, to raise coverty

Change Summary

• modified: castle/aigr/namednodes.py
• modified: castle/aigr/namespaces.py
• modified: castle/aigr/protocols.py
• modified: pytst/aigr/test_3_namespaces.py

Incremental Difference

diff -r 8948acb0b11d -r ebe02ce214ec castle/aigr/namednodes.py
--- a/castle/aigr/namednodes.py	Fri Oct 20 15:45:25 2023 +0200
+++ b/castle/aigr/namednodes.py	Fri Oct 20 21:32:07 2023 +0200
@@ -11,16 +11,17 @@
 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]
+    # type(_ns) is NamedNode, but that leads to a cycle in imports, to use te more generic AIGR
+    _ns        :PTH.Optional[AIGR]=dc_field(init=None, default=None)  #type: ignore[call-overload]
 
-    def register_in_NS(self, ns):
+
+    def register_in_NS(self, ns: AIGR): #same: type(ns) is NameSpace, but ...
         self._ns = ns
 
     @property

diff -r 8948acb0b11d -r ebe02ce214ec castle/aigr/namespaces.py
--- a/castle/aigr/namespaces.py	Fri Oct 20 15:45:25 2023 +0200
+++ b/castle/aigr/namespaces.py	Fri Oct 20 21:32:07 2023 +0200
@@ -13,7 +13,8 @@
 from enum import Enum
 from dataclasses import dataclass, KW_ONLY
 from dataclasses import field as dc_field
-from .namednodes import *
+
+from .namednodes import NamedNode, NameError
 
 from . import AIGR, _Marker
 

diff -r 8948acb0b11d -r ebe02ce214ec castle/aigr/protocols.py
--- a/castle/aigr/protocols.py	Fri Oct 20 15:45:25 2023 +0200
+++ b/castle/aigr/protocols.py	Fri Oct 20 21:32:07 2023 +0200
@@ -10,9 +10,9 @@
 from . import AIGR
 from .events import Event
 from .aid import TypedParameter, Argument                                                            # Castle/AIGR types
+from .namednodes import NamedNode
 
-from .namednodes import *
-from .namespaces import NameSpace
+
 
 __all__ = ['ProtocolKind', 'Protocol', 'EventProtocol']
 # DataProtocol, StreamProtocol are added/implemented later
@@ -43,7 +43,6 @@
     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)                     #type: ignore[call-overload]
 
 
 @dataclass                                                                                          # pragma: no mutate

diff -r 8948acb0b11d -r ebe02ce214ec pytst/aigr/test_3_namespaces.py
--- a/pytst/aigr/test_3_namespaces.py	Fri Oct 20 15:45:25 2023 +0200
+++ b/pytst/aigr/test_3_namespaces.py	Fri Oct 20 21:32:07 2023 +0200
@@ -28,6 +28,17 @@
     return ns
 
 @pytest.fixture
+def top():
+    top = NameSpace('top')
+    return top
+
[e-mail]
+def sub(top):
+    sub = NameSpace('sub')
+    top.register(sub)
+    return sub
+
[e-mail]
 def sourceNS(a_node):
     ns = Source_NS("sourceNS", source="dummy")
     ns.register(a_node)
@@ -72,7 +83,7 @@
     assert aNS.getID(name) is two         #The test
 
 
-def test_5b_ns_in_ns():
+def test_5a_ns_in_ns():
     "when we import a NS, we get a NS in a NS ..."
     top = NameSpace('top')
     sub = NameSpace('sub')
@@ -84,6 +95,18 @@
     assert sub.getID('elm') is elm
     assert top.search(dottedName="sub.elm") is elm
 
+
+def test_5b_seach_1level(aNS,a_node):
+    name = a_node.name
+    assert (aNS.search(name) is a_node) and (aNS.getID(name) is a_node), "serach should find that what getID returns"
+
+
+def test_5c_seachNotFound_1(top):
+    assert top.search("Deze bestaat niet") is None
+
+def test_5d_seachNotFound_sub(top, sub):
+    assert top.search("top.Deze.bestaat.niet") is None
+
 def test_6a_registered_is_2ways(aNS, a_node):
     """When a NamedNode is registered in a NameSpace, it should a backlink (`ns property) to the NS again"""
     assert a_node.ns is aNS