add cendof, cget, cset! functions

rfourquet · Oct 10, 2014 · 8e53174 · 8e53174
1 parent 4dc1679
commit 8e53174
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/base/abstractarray.jl b/base/abstractarray.jl
@@ -22,6 +22,7 @@ ndims{T,n}(::Type{AbstractArray{T,n}}) = n
 ndims{T<:AbstractArray}(::Type{T}) = ndims(super(T))
 length(t::AbstractArray) = prod(size(t))::Int
 endof(a::AbstractArray) = length(a)
+cendof(a::AbstractArray) = unsigned(length(a) - 1)
 first(a::AbstractArray) = a[1]
 first(a) = next(a,start(a))[1]
 last(a) = a[end]
@@ -374,6 +375,8 @@ imag{T<:Real}(x::AbstractArray{T}) = zero(x)
 
 getindex(t::AbstractArray, i::Real) = error("indexing not defined for ", typeof(t))
 
+cget(t::AbstractArray, i::Real) = @inbounds return t[i+1]
+
 # linear indexing with a single multi-dimensional index
 function getindex(A::AbstractArray, I::AbstractArray)
     x = similar(A, size(I))
@@ -440,6 +443,8 @@ setindex!(t::AbstractArray, x, i::Real) =
     error("setindex! not defined for ",typeof(t))
 setindex!(t::AbstractArray, x) = throw(MethodError(setindex!, (t, x)))
 
+cset!(t::AbstractArray, x, i::Real) = @inbounds return t[i+1] = x
+
 ## Indexing: handle more indices than dimensions if "extra" indices are 1
 
 # Don't require vector/matrix subclasses to implement more than 1/2 indices,

diff --git a/base/int.jl b/base/int.jl
@@ -1,8 +1,5 @@
 ## integer arithmetic ##
 
-const IntTypes = (Int8, Uint8, Int16, Uint16, Int32, Uint32,
-                  Int64, Uint64, Int128, Uint128)
-
 +(x::Int, y::Int) = box(Int,add_int(unbox(Int,x),unbox(Int,y)))
 <(x::Int, y::Int) = slt_int(unbox(Int,x),unbox(Int,y))
 

diff --git a/base/range.jl b/base/range.jl
@@ -213,6 +213,22 @@ let smallint = (Int === Int64 ?
     length{T <: smallint}(r::UnitRange{T}) = int(r.stop) - int(r.start) + 1
 end
 
+# fallback
+cendof(r::StepRange) = unsigned(endof(r) - 1)
+
+const IntTypes = (Int8, Uint8, Int16, Uint16, Int32, Uint32,
+                  Int64, Uint64, Int128, Uint128)
+
+function cendof{T<:Union(IntTypes...),S<:Union(IntTypes...)}(r::StepRange{T,S})
+    if r.step > 0
+        div(unsigned(r.stop - r.start), r.step)
+    else
+        div(unsigned(r.start - r.stop), r.step)
+    end
+end
+
+cendof{T<:Union(IntTypes...)}(r::UnitRange{T}) = unsigned(r.stop - r.start)
+
 first{T}(r::OrdinalRange{T}) = oftype(T, r.start)
 first(r::FloatRange) = r.start/r.divisor
 
@@ -263,6 +279,8 @@ function getindex{T}(r::FloatRange{T}, i::Integer)
     oftype(T, (r.start + (i-1)*r.step)/r.divisor)
 end
 
+cget{T<:Union(IntTypes...)}(r::Range{T}, i::Integer) = itrunc(T, unsigned(first(r)) +  unsigned(i)*unsigned(step(r)))
+
 function check_indexingrange(s, r)
     sl = length(s)
     rl = length(r)