Merge pull request #32 from timholy/teh/fix0.4

Fix deprecations, removal of Range1 from Base on 0.4

Author: timholy

src/ProfileView.jl

@@ -42,7 +42,7 @@ immutable TagData
     ip::Uint
     status::Int
 end
-const TAGNONE = TagData(uint(0), -1)
+const TAGNONE = TagData(@compat(UInt(0)), -1)
 
 type ProfileData
     img
@@ -91,8 +91,8 @@ function prepare(data; C = false, lidict = nothing, colorgc = true, combine = tr
     end
     isjl = builddict(uip, [!lkup[i].fromC for i = 1:nuip])
     isgc = builddict(uip, [lkup[i].func == "jl_gc_collect" for i = 1:nuip])
-    isjl[uint(0)] = false  # needed for root below
-    isgc[uint(0)] = false
+    isjl[@compat(UInt(0))] = false  # needed for root below
+    isgc[@compat(UInt(0))] = false
     p = Profile.liperm(lkup)
     rank = similar(p)
     rank[p] = 1:length(p)
@@ -359,7 +359,7 @@ function buildimg(imgtags, colors, bkg, gccolor, colorgc::Bool, combine::Bool, l
     w = size(imgtags,1)
     h = size(imgtags,2)
     img = fill(bkg, w, h)
-    colorlen = int(length(colors)/2)
+    colorlen = round(Int, length(colors)/2)
     for j = 1:h
         coloroffset = colorlen*iseven(j)
         colorindex = 1
@@ -399,7 +399,7 @@ function buildimg(imgtags, colors, bkg, gccolor, colorgc::Bool, combine::Bool, l
     img
 end
 
-function fillrow!(img, j, rng::Range1{Int}, colorindex, colorlen, regcolor, gccolor, status)
+function fillrow!(img, j, rng::UnitRange{Int}, colorindex, colorlen, regcolor, gccolor, status)
     if status > 0
         img[rng,j] = gccolor
         return colorindex

src/pvtree.jl

@@ -1,17 +1,18 @@
 module PVTree
 
 using ..Tree
+using Compat
 
 export PVData, buildgraph!, prunegraph!
 
 # ProfileView data we need attached to each node of the graph:
 type PVData
     ip::Uint           # the instruction pointer
-    hspan::Range1{Int} # horizontal span (used as the x-axis in display)
+    hspan::UnitRange{Int} # horizontal span (used as the x-axis in display)
     status::Int        # nonzero for special handling, (e.g., gc events)
 end
-PVData(hspan::Range1{Int}) = PVData(uint(0), hspan, 0)
-PVData(ip::Uint, hspan::Range1{Int}) = PVData(ip, hspan, 0)
+PVData(hspan::UnitRange{Int}) = PVData(@compat(UInt(0)), hspan, 0)
+PVData(ip::Uint, hspan::UnitRange{Int}) = PVData(ip, hspan, 0)
 
 # Suppose we have several dicts:
 #    isjl[ip]: true/false depending on whether it's a Julia function rather than C/Fortran

test/pvtree.jl

@@ -1,3 +1,5 @@
+using Compat
+
 # First do the following from src/
 #  include("tree.jl")
 #  include("pvtree.jl")
@@ -12,14 +14,14 @@
 # 0J
 # 2J   5J   6J   4J
 
-node(ip::Integer) = PVTree.PVData(uint(ip), 1:0)
+node(ip::Integer) = PVTree.PVData(@compat(UInt(ip)), 1:0)
 
 if VERSION < v"0.4.0-dev+980"
     isjl = Dict(uint(0:7),[true,false,true,false,true,true,true,false])
     isgc = Dict(uint(0:7),[falses(7);true])
 else
-    isjl = Dict(zip(uint(0:7),[true,false,true,false,true,true,true,false]))
-    isgc = Dict(zip(uint(0:7),[falses(7);true]))
+    isjl = Dict(zip(@compat(map(UInt, 0:7)),[true,false,true,false,true,true,true,false]))
+    isgc = Dict(zip(@compat(map(UInt, 0:7)),[falses(7);true]))
 end
 
 function buildraw()