Update compats and clean up code

Tokazama · May 25, 2020 · 0f3cef0 · 0f3cef0 · Tokazama · May 25, 2020
1 parent 19a7e32
commit 0f3cef0
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 61 deletions.
diff --git a/Project.toml b/Project.toml
@@ -31,6 +31,10 @@ PrettyTables = "0.9"
 StaticArrays = "0.12"
 StaticRanges = "0.6"
 julia = "1"
+TableTraits = "1"
+TableTraitsUtils = "1"
+Tables = "1"
+
 
 [extras]
 IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"

diff --git a/docs/src/compatibility.md b/docs/src/compatibility.md
@@ -16,7 +16,3 @@ In other words, the current version can only support multi-mapping multiple `Abs
 Indexing via named dimensions is supported via the [NamedDims.jl](https://github.com/invenia/NamedDims.jl) package.
 [`NIArray`](@ref) assists in constructing arrays that have both named dimensions and a subtype of `AbstractAxis` along each axis.
 
-## OffsetArrays
-
-Many of the tests used for `OffsetArrays` package have been incorporated into the tests of `AxisIndices` to ensure compatibility.
-
diff --git a/src/AxisCore/AxisCore.jl b/src/AxisCore/AxisCore.jl
@@ -12,7 +12,7 @@ using StaticRanges: can_set_first, can_set_last, can_set_length, same_type,
     checkindexlo, checkindexhi, OneToUnion, grow_first!, grow_last!, resize_last,
     resize_last!, shrink_last!
 
-using StaticRanges: Static, Fixed, Dynamic, Staticness
+using StaticRanges: Static, Fixed, Dynamic, Staticness, Length
 using StaticArrays
 using AxisIndices.PrettyArrays
 

diff --git a/src/AxisCore/abstractaxis.jl b/src/AxisCore/abstractaxis.jl
@@ -324,6 +324,8 @@ function StaticRanges.set_length(x::AbstractSimpleAxis{V,Vs}, len) where {V,Vs}
     return unsafe_reconstruct(x, StaticRanges.set_length(values(x), len))
 end
 
+StaticRanges.Length(::Type{<:AbstractAxis{K,Ks,V,Vs}}) where {K,Ks,V,Vs} = Length(Vs)
+
 ###
 ### step
 ###

diff --git a/src/AxisCore/abstractaxisindices.jl b/src/AxisCore/abstractaxisindices.jl
@@ -133,3 +133,4 @@ function Base.reverse(x::AbstractAxisIndices{T,N}; dims::Integer) where {T,N}
     end
     return unsafe_reconstruct(x, p, axs)
 end
+
diff --git a/src/AxisCore/offsetarray.jl b/src/AxisCore/offsetarray.jl
diff --git a/src/AxisCore/traits.jl b/src/AxisCore/traits.jl
@@ -403,14 +403,11 @@ A subtype of `AxisIndicesStyle` indicating that the axis is a always defaults to
 """
 struct KeyedStyle{S} <: AxisIndicesStyle end
 
+KeyedStyle(x) = KeyedStyle(AxisIndicesStyle(x))
 KeyedStyle(S::AxisIndicesStyle) = KeyedStyle{S}()
 KeyedStyle(S::IndicesCollection) =  KeyedStyle{KeysCollection()}()
 KeyedStyle(S::IndexElement) = KeyedStyle{KeyElement()}()
 
-#function AxisIndicesStyle(::Type{<:AbstractOffsetAxis}, ::Type{T}) where {T}
-#    return KeyedStyle(AxisIndicesStyle(T))
-#end
-
 is_element(::Type{KeyedStyle{T}}) where {T} = is_element(T)
 
 to_index(::KeyedStyle{S}, axis, arg) where {S} = to_index(S, axis, arg)

diff --git a/src/Math/matmul.jl b/src/Math/matmul.jl
@@ -71,3 +71,4 @@ end
 function Base.:*(a::AbstractAxisIndices{T,2,<:CoVector}, b::AbstractAxisIndices{S,1}) where {T,S}
     return *(parent(a), parent(b))
 end
+
-Original file line number
+Diff line change
@@ Expand Up @@
         return unsafe_reconstruct(x, StaticRanges.set_length(values(x), len))
     end
+    StaticRanges.Length(::Type{<:AbstractAxis{K,Ks,V,Vs}}) where {K,Ks,V,Vs} = Length(Vs)
     ###
     ### step
     ###
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -133,3 +133,4 @@ function Base.reverse(x::AbstractAxisIndices{T,N}; dims::Integer) where {T,N}
		end
		return unsafe_reconstruct(x, p, axs)
		end
Original file line number	Diff line number	Diff line change
Expand Up		@@ -71,3 +71,4 @@ end
		function Base.:*(a::AbstractAxisIndices{T,2,<:CoVector}, b::AbstractAxisIndices{S,1}) where {T,S}
		return *(parent(a), parent(b))
		end