reorder sysimg to fix #5885

JuliaLang · Mar 18, 2014 · f611868 · f611868
1 parent ba71cc8
commit f611868
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/base/range.jl b/base/range.jl
@@ -157,6 +157,12 @@ function frange{T<:FloatingPoint}(start::T, step::T, stop::T)
     start, step, floor(r)+1, one(step)
 end
 
+colon{T<:FloatingPoint}(start::T, step::T, stop::T) =
+          step == 0              ? error("step cannot be zero in colon syntax") :
+         start == stop           ? FloatRange{T}(start,step,1,1) :
+    (0 < step) != (start < stop) ? FloatRange{T}(start,step,0,1) :
+                                   FloatRange{T}(frange(start,step,stop)...)
+
 similar(r::Ranges, T::Type, dims::Dims) = Array(T, dims)
 
 length(r::Ranges) = integer(r.len)

diff --git a/base/sysimg.jl b/base/sysimg.jl
@@ -112,24 +112,18 @@ import .Grisu.print_shortest
 include("file.jl")
 include("methodshow.jl")
 
+# core math functions
+include("floatfuncs.jl")
+include("math.jl")
+importall .Math
+include("float16.jl")
+
 # multidimensional arrays
 include("cartesian.jl")
 using .Cartesian
 include("multidimensional.jl")
 
-# FIXME: #5885
-colon{T<:FloatingPoint}(start::T, step::T, stop::T) =
-          step == 0              ? error("step cannot be zero in colon syntax") :
-         start == stop           ? FloatRange{T}(start,step,1,1) :
-    (0 < step) != (start < stop) ? FloatRange{T}(start,step,0,1) :
-                                   FloatRange{T}(frange(start,step,stop)...)
-
-# core math functions
-include("floatfuncs.jl")
-include("math.jl")
-importall .Math
 include("primes.jl")
-include("float16.jl")
 
 # concurrency and parallelism
 include("serialize.jl")