invariance

Author: ducky64

edg/core/Array.py

@@ -19,7 +19,7 @@
 
 
 class MapExtractBinding(Binding):
-  def __init__(self, container: Vector, elt: ConstraintExpr):
+  def __init__(self, container: BaseVector, elt: ConstraintExpr):
     super().__init__()
     self.container = container
     self.elt = elt
@@ -28,7 +28,7 @@ def get_subexprs(self) -> Iterable[Union[ConstraintExpr, BasePort]]:
     return [self.container]
 
   def expr_to_proto(self, expr: ConstraintExpr, ref_map: Refable.RefMapType) -> edgir.ValueExpr:
-    contained_map = self.container._elt_sample._create_ref_map(edgir.LocalPath())
+    contained_map = self.container._get_elt_sample()._create_ref_map(edgir.LocalPath())
 
     pb = edgir.ValueExpr()
     pb.map_extract.container.ref.CopyFrom(ref_map[self.container])  # TODO support arbitrary refs
@@ -59,7 +59,7 @@ def _get_elt_sample(self) -> BasePort:
 
 
 # A 'fake'/'intermediate'/'view' vector object used as a return in map_extract operations.
-VectorType = TypeVar('VectorType', covariant=True, bound=Port, default=Port)
+VectorType = TypeVar('VectorType', bound=Port, default=Port)
 @non_library
 class DerivedVector(BaseVector, Generic[VectorType]):
   # TODO: Library types need to be removed from the type hierarchy, because this does not generate into a library elt

edg/core/Binding.py

@@ -12,7 +12,7 @@
 
 if TYPE_CHECKING:
   from .Ports import BasePort, Port
-  from .Array import Vector
+  from .Array import Vector, BaseVector
   from .Blocks import BaseBlock
   from .ConstraintExpr import ConstraintExpr, FloatExpr, BoolExpr
 
@@ -449,7 +449,7 @@ class LengthBinding(Binding):
   def __repr__(self) -> str:
     return f"Length"
 
-  def __init__(self, src: Vector):
+  def __init__(self, src: BaseVector):
     super().__init__()
     self.src = src
 
@@ -467,7 +467,7 @@ class AllocatedBinding(Binding):
   def __repr__(self) -> str:
     return f"Allocated"
 
-  def __init__(self, src: Vector):
+  def __init__(self, src: BaseVector):
     super().__init__()
     self.src = src