[WIP] Update for Julia 0.7 and 1.0

.travis.yml

@@ -2,8 +2,8 @@ language: julia
 os:
   - linux
 julia:
-  - 0.5
-  - 0.6
+  - 0.7
+  - 1.0
   - nightly
 notifications:
   email: false

REQUIRE

@@ -1,4 +1,4 @@
-julia 0.5
+julia 0.7
 Gtk
 GtkReactive 0.0.3
 Cairo 0.5.1

src/ProfileView.jl

@@ -14,13 +14,13 @@ using .PVTree
 
 include("svgwriter.jl")
 
-immutable TagData
+struct TagData
     ip::UInt
     status::Int
 end
 const TAGNONE = TagData(UInt(0), -1)
 
-type ProfileData
+mutable struct ProfileData
     img
     lidict
     imgtags
@@ -33,11 +33,11 @@ const gccolor = colorant"red"
 const colors = distinguishable_colors(13, [bkg,fontcolor,gccolor],
                                       lchoices=Float64[65, 70, 75, 80],
                                       cchoices=Float64[0, 50, 60, 70],
-                                      hchoices=linspace(0, 330, 24))[4:end]
+                                      hchoices=range(0, stop=330, length=24))[4:end]
 
 function have_display()
-    !is_unix() && return true
-    is_apple() && return true
+    !Sys.isunix() && return true
+    Sys.isapple() && return true
     return haskey(ENV, "DISPLAY")
 end
 
@@ -53,12 +53,12 @@ function __init__()
         @eval begin
             view(data = Profile.fetch(); C = false, lidict = nothing, colorgc = true, fontsize = 12, combine = true, pruned = []) = ProfileViewGtk.view(data; C=C, lidict=lidict, colorgc=colorgc, fontsize=fontsize, combine=combine, pruned=pruned)
 
-            closeall() = ProfileViewGtk.closeall()
             @doc """
     closeall()
 
 Closes all windows opened by ProfileView.
-""" -> closeall
+"""
+            closeall() = ProfileViewGtk.closeall()
         end
     end
     pop!(LOAD_PATH)
@@ -105,7 +105,7 @@ function prepare_data(data, lidict)
     bt, uip, counts, lidict, lkup
 end
 
-prepare_data(::Void, ::Void) = nothing, nothing, nothing, nothing, nothing
+prepare_data(::Nothing, ::Nothing) = nothing, nothing, nothing, nothing, nothing
 
 function prepare_image(bt, uip, counts, lidict, lkup, C, colorgc, combine,
                        pruned)

src/ProfileViewGtk.jl

@@ -8,7 +8,7 @@ using Graphics
 
 using Gtk.GConstants.GdkModifierType: SHIFT, CONTROL, MOD1
 
-type ZoomCanvas
+mutable struct ZoomCanvas
     bb::BoundingBox  # in user-coordinates
     c::Canvas
 end

src/pvtree.jl

@@ -5,7 +5,7 @@ using ..Tree
 export PVData, buildgraph!, prunegraph!
 
 # ProfileView data we need attached to each node of the graph:
-type PVData
+mutable struct PVData
     ip::UInt           # the instruction pointer
     hspan::UnitRange{Int} # horizontal span (used as the x-axis in display)
     status::Int        # nonzero for special handling, (e.g., gc events)

src/tree.jl

@@ -1,6 +1,6 @@
 module Tree
 
-import Base: start, done, next, show
+import Base: iterate, show
 
 export Node,
     addchild,
@@ -16,30 +16,30 @@ export Node,
 #     Any missing links (e.g., "c" does not have a sibling) link back to itself (c.sibling == c)
 # With this organization, no arrays need to be allocated.
 
-type Node{T}
+mutable struct Node{T}
     data::T
     parent::Node{T}
     child::Node{T}
     sibling::Node{T}
 
     # Constructor for the root of the tree
-    function (::Type{Node{T}}){T}(data::T)
+    function (::Type{Node{T}})(data::T) where T
         n = new{T}(data)
         n.parent = n
         n.child = n
         n.sibling = n
         n
     end
     # Constructor for all others
-    function (::Type{Node{T}}){T}(data::T, parent::Node)
+    function (::Type{Node{T}})(data::T, parent::Node) where T
         n = new{T}(data, parent)
         n.child = n
         n.sibling = n
         n
     end
 end
-Node{T}(data::T) = Node{T}(data)
-Node{T}(data::T, parent::Node{T}) = Node{T}(data, parent)
+Node(data::T) where {T} = Node{T}(data)
+Node(data::T, parent::Node{T}) where {T} = Node{T}(data, parent)
 
 function lastsibling(sib::Node)
     newsib = sib.sibling
@@ -50,7 +50,7 @@ function lastsibling(sib::Node)
     sib
 end
 
-function addsibling{T}(oldersib::Node{T}, data::T)
+function addsibling(oldersib::Node{T}, data::T) where T
     if oldersib.sibling != oldersib
         error("Truncation of sibling list")
     end
@@ -59,7 +59,7 @@ function addsibling{T}(oldersib::Node{T}, data::T)
     youngersib
 end
 
-function addchild{T}(parent::Node{T}, data::T)
+function addchild(parent::Node{T}, data::T) where T
     newc = Node(data, parent)
     prevc = parent.child
     if prevc == parent
@@ -80,9 +80,10 @@ show(io::IO, n::Node) = print(io, n.data)
 # for c in parent
 #     # do something
 # end
-start(n::Node) = n.child
-done(n::Node, state::Node) = n == state
-next(n::Node, state::Node) = state, state == state.sibling ? n : state.sibling
+function iterate(n::Node, state = n.child)
+    n == state && return nothing
+    return state, state == state.sibling ? n : state.sibling
+end
 
 function showedges(io::IO, parent::Node, printfunc = identity)
     str = printfunc(parent.data)

test/test.jl

@@ -4,10 +4,10 @@ function profile_test(n)
     for i = 1:n
         A = randn(100,100,20)
         m = maximum(A)
-        Afft = fft(A)
-        Am = mapslices(sum, A, 2)
+        # Afft = fft(A)
+        Am = mapslices(sum, A, dims = 2)
         B = A[:,:,5]
-        Bsort = mapslices(sort, B, 1)
+        Bsort = mapslices(sort, B, dims = 1)
         b = rand(100)
         C = B.*b
     end

test/tree.jl

@@ -3,7 +3,7 @@ root = Tree.Node(0)
 @assert Tree.isleaf(root)
 nchildren = 0
 for c in root
-    nchildren += 1
+    global nchildren += 1
 end
 @assert nchildren == 0
 c1 = Tree.addchild(root, 1)
@@ -17,7 +17,7 @@ c22 = Tree.addchild(c2, 5)
 nchildren = 0
 for c in root
     @assert !Tree.isroot(c)
-    nchildren += 1
+    global nchildren += 1
 end
 @assert nchildren == 3
 @assert Tree.isleaf(c1)
@@ -30,5 +30,6 @@ end
 children2 = [c21,c22]
 i = 0
 for c in c2
+    global i
     @assert c == children2[i+=1]
 end