Merge pull request #567 from willow-ahrens/wma/fix565

Wma/fix565
finch-tensor · May 21, 2024 · fb333c0 · fb333c0 · willow-ahrens · May 21, 2024
2 parents 651e613 + d94a446
commit fb333c0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 authors = ["Willow Ahrens"]
 name = "Finch"
 uuid = "9177782c-1635-4eb9-9bfb-d9dfa25e6bce"
-version = "0.6.29"
+version = "0.6.30"
 
 [compat]
 AbstractTrees = "0.3.4, 0.4"

diff --git a/docs/src/guides/interoperability.md b/docs/src/guides/interoperability.md
@@ -30,26 +30,31 @@ julia> v = Vector([1, 0, 2, 3])
  0
  2
  3
+
 julia> obov = PlusOneVector(v)
-4-element PlusOneVector{Int64}:
+4-element PlusOneVector{Int64, Vector{Int64}}:
  2
  1
  3
  4
+
 julia> obov[1] += 8
 10
+
 julia> obov
-4-element PlusOneVector{Int64}:
+4-element PlusOneVector{Int64, Vector{Int64}}:
  10
   1
   3
   4
+
 julia> obov.data
 4-element Vector{Int64}:
  9
  0
  2
  3
+
 ```
 
 ### `CIndex`

diff --git a/src/util/vectors.jl b/src/util/vectors.jl
@@ -1,7 +1,7 @@
 using Base: @propagate_inbounds
 
-struct PlusOneVector{T} <: AbstractVector{T}
-    data::AbstractVector{T}
+struct PlusOneVector{T, A <: AbstractVector{T}} <: AbstractVector{T}
+    data::A
 end
 
 @propagate_inbounds function Base.getindex(vec::PlusOneVector{T},
@@ -36,11 +36,11 @@ function moveto(vec::PlusOneVector{T}, device) where {T}
     return PlusOneVector{T}(data)
 end
 
-struct MinusEpsVector{T, S} <: AbstractVector{T}
-    data::AbstractVector{S}
+struct MinusEpsVector{T, S, A <: AbstractVector{S}} <: AbstractVector{T}
+    data::A
 end
 
-MinusEpsVector(data::AbstractVector{T}) where {T} = MinusEpsVector{Limit{T}, T}(data)
+MinusEpsVector(data::AbstractVector{T}) where {T} = MinusEpsVector{Limit{T}, T, typeof(data)}(data)
 
 @propagate_inbounds function Base.getindex(vec::MinusEpsVector{T},
                                            index::Int) where {T}
@@ -80,11 +80,11 @@ function moveto(vec::MinusEpsVector{T}, device) where {T}
     return MinusEpsVector{T}(data)
 end
 
-struct PlusEpsVector{T, S} <: AbstractVector{T}
-    data::AbstractVector{S}
+struct PlusEpsVector{T, S, A <:AbstractVector{S}} <: AbstractVector{T}
+    data::A
 end
 
-PlusEpsVector(data::AbstractVector{T}) where {T} = PlusEpsVector{Limit{T}, T}(data)
+PlusEpsVector(data::AbstractVector{T}) where {T} = PlusEpsVector{Limit{T}, T, typeof(data)}(data)
 
 @propagate_inbounds function Base.getindex(vec::PlusEpsVector{T},
                                            index::Int) where {T}