fixes for 0.7 (#3)

* fixes for 0.7

* Fix deprecations

* updates for 0.7

Author: SimonDanisch

.travis.yml

@@ -5,8 +5,7 @@ os:
   - osx
 
 julia:
-  - 0.5
-  - 0.6
+  - 0.7
   - nightly
 
 notifications:

REQUIRE

@@ -1,2 +1,2 @@
-julia 0.5
+julia 0.7-alpha
 GeometryTypes

src/rectangle.jl

@@ -1,30 +1,30 @@
-type BinaryNode{T}
-    left::Nullable{T}
-    right::Nullable{T}
+mutable struct BinaryNode{T}
+    left::Union{Nothing, T}
+    right::Union{Nothing, T}
 
-    (::Type{BinaryNode{T}}){T}() = new{T}(Nullable{T}(), Nullable{T}())
-    (::Type{BinaryNode}){T}(left::T, right::T) = new{T}(Nullable{T}(a), Nullable{T}(b))
-    (::Type{BinaryNode{T}}){T}(left::T, right::T) = new{T}(Nullable{T}(a), Nullable{T}(b))
+    BinaryNode{T}() where {T} = new{T}(nothing, nothing)
+    BinaryNode(left::T, right::T) where {T} = new{T}(nothing, nothing)
+    BinaryNode{T}(left::T, right::T) where {T} = new{T}(nothing, nothing)
 end
-type RectanglePacker{T}
+mutable struct RectanglePacker{T}
     children::BinaryNode{RectanglePacker{T}}
     area::SimpleRectangle{T}
 end
 
-left(a::RectanglePacker)                                = get(a.children.left)
-left{T}(a::RectanglePacker{T}, r::RectanglePacker{T})   = (a.children.left = Nullable(r))
-right(a::RectanglePacker)                               = get(a.children.right)
-right{T}(a::RectanglePacker{T}, r::RectanglePacker{T})  = (a.children.right = Nullable(r))
-RectanglePacker{T}(area::SimpleRectangle{T})            = RectanglePacker{T}(BinaryNode{RectanglePacker{T}}(), area)
-isleaf(a::RectanglePacker)                              = isnull(a.children.left) && isnull(a.children.right)
+left(a::RectanglePacker)                                = a.children.left
+left(a::RectanglePacker{T}, r::RectanglePacker{T}) where {T}   = (a.children.left = r)
+right(a::RectanglePacker)                               = a.children.right
+right(a::RectanglePacker{T}, r::RectanglePacker{T}) where {T}  = (a.children.right = r)
+RectanglePacker(area::SimpleRectangle{T}) where {T}            = RectanglePacker{T}(BinaryNode{RectanglePacker{T}}(), area)
+isleaf(a::RectanglePacker)                              = (a.children.left) == nothing && (a.children.right == nothing)
 
 # This is rather append, but it seems odd to use another function here.
 # Maybe its a bad idea, to call it push regardless!?
-function Base.push!{T}(node::RectanglePacker{T}, areas::Vector{SimpleRectangle{T}})
+function Base.push!(node::RectanglePacker{T}, areas::Vector{SimpleRectangle{T}}) where T
     sort!(areas)
     RectanglePacker{T}[push!(node, area) for area in areas]
 end
-function Base.push!{T}(node::RectanglePacker{T}, area::SimpleRectangle{T})
+function Base.push!(node::RectanglePacker{T}, area::SimpleRectangle{T}) where T
     if !isleaf(node)
         l = push!(left(node), area)
         l == nothing && return push!(right(node), area) # if left does not have space, try right

test/runtests.jl

@@ -1,5 +1,5 @@
 using Packing, GeometryTypes
-using Base.Test
+using Test
 
 # write your own tests here
 include("test_rectangle.jl")