Julia 0.4 compatibility fixes

REQUIRE

@@ -4,3 +4,4 @@ StatsBase 0.3.9+
 GZip
 SortingAlgorithms
 Reexport
+Compat

src/DataFrames.jl

@@ -8,6 +8,7 @@ module DataFrames
 
 using Base.Intrinsics
 using Reexport
+using Compat
 @reexport using StatsBase
 @reexport using DataArrays
 using GZip
@@ -97,7 +98,6 @@ export @~,
 ##
 ##############################################################################
 
-include("compatibility.jl")
 include(joinpath("other", "utils.jl"))
 include(joinpath("other", "index.jl"))
 include(joinpath("abstractdataframe", "abstractdataframe.jl"))

src/RDA.jl

@@ -7,7 +7,7 @@
 ##
 ##############################################################################
 
-const SXPtab = @Dict(      # Defined in Rinternals.h
+const SXPtab = @compat Dict(      # Defined in Rinternals.h
     0x00=>"NULL",
     0x01=>"Symbol",
     0x02=>"Pairlist",

src/dataframe/io.jl

@@ -393,7 +393,7 @@ function bytestotype{N <: Integer,
 
     while index > left
         if '0' <= byte <= '9'
-            value += (byte - '0') * power
+            value += (byte - uint8('0')) * power
             power *= 10
         else
             return value, false, false
@@ -407,7 +407,7 @@ function bytestotype{N <: Integer,
     elseif byte == '+'
         return value, left < right, false
     elseif '0' <= byte <= '9'
-        value += (byte - '0') * power
+        value += (byte - uint8('0')) * power
         return value, true, false
     else
         return value, false, false

src/statsmodels/formula.jl

@@ -89,7 +89,7 @@ end
 dospecials(a::Any) = a
 
 ## Distribution of & over +
-const distributive = [:& => :+]
+const distributive = @compat Dict(:& => :+)
 
 distribute(ex::Expr) = distribute!(copy(ex))
 distribute(a::Any) = a

test/dataframe.jl

@@ -1,6 +1,6 @@
 module TestDataFrame
     using Base.Test
-    using DataFrames, DataFrames.Compatibility
+    using DataFrames, Compat
 
     #test_group("Operations on DataFrames that have column groupings")
 
@@ -133,17 +133,17 @@ module TestDataFrame
     @test typeof(df[:, 1]) == Vector{Float64}
 
     #test_group("Other DataFrame constructors")
-    df = DataFrame([@AnyDict(:a=>1, :b=>'c'),
-                    @AnyDict(:a=>3, :b=>'d'),
-                    @AnyDict(:a=>5)])
+    df = DataFrame([@compat(Dict{Any,Any}(:a=>1, :b=>'c')),
+                    @compat(Dict{Any,Any}(:a=>3, :b=>'d')),
+                    @compat(Dict{Any,Any}(:a=>5))])
     @test size(df, 1) == 3
     @test size(df, 2) == 2
     @test typeof(df[:,:a]) == DataVector{Int}
     @test typeof(df[:,:b]) == DataVector{Char}
 
-    df = DataFrame([@AnyDict(:a=>1, :b=>'c'),
-                    @AnyDict(:a=>3, :b=>'d'),
-                    @AnyDict(:a=>5)],
+    df = DataFrame([@compat(Dict{Any,Any}(:a=>1, :b=>'c')),
+                    @compat(Dict{Any,Any}(:a=>3, :b=>'d')),
+                    @compat(Dict{Any,Any}(:a=>5))],
                    [:a, :b])
     @test size(df, 1) == 3
     @test size(df, 2) == 2
@@ -184,22 +184,22 @@ module TestDataFrame
     @test_throws ArgumentError push!(dfb, ("coconut",22))
 
     dfb= DataFrame( first=[1,2], second=["apple","orange"] )
-    push!(dfb, @Dict(:first=>3, :second=>"pear"))
+    push!(dfb, @compat(Dict(:first=>3, :second=>"pear")))
     @test df==dfb
 
     df=DataFrame( first=[1,2,3], second=["apple","orange","banana"] )
     dfb= DataFrame( first=[1,2], second=["apple","orange"] )
-    push!(dfb, @Dict("first"=>3, "second"=>"banana"))
+    push!(dfb, @compat(Dict("first"=>3, "second"=>"banana")))
     @test df==dfb
 
     df0= DataFrame( first=[1,2], second=["apple","orange"] )
     dfb= DataFrame( first=[1,2], second=["apple","orange"] )
-    @test_throws ArgumentError push!(dfb, @Dict(:first=>true, :second=>false))
+    @test_throws ArgumentError push!(dfb, @compat(Dict(:first=>true, :second=>false)))
     @test df0==dfb
 
     df0= DataFrame( first=[1,2], second=["apple","orange"] )
     dfb= DataFrame( first=[1,2], second=["apple","orange"] )
-    @test_throws ArgumentError push!(dfb, @Dict("first"=>"chicken", "second"=>"stuff"))
+    @test_throws ArgumentError push!(dfb, @compat(Dict("first"=>"chicken", "second"=>"stuff")))
     @test df0==dfb
 
     # delete!

test/index.jl

@@ -1,6 +1,6 @@
 module TestIndex
 using Base.Test
-using DataFrames, DataFrames.Index, DataFrames.Compatibility
+using DataFrames, DataFrames.Index, Compat
 
 i = Index()
 push!(i, :A)
@@ -37,7 +37,7 @@ end
 
 @test names(i) == [:A,:B]
 @test names!(i, [:a,:b]) == Index([:a,:b])
-@test rename(i, @Dict(:a=>:A, :b=>:B)) == Index([:A,:B])
+@test rename(i, @compat(Dict(:a=>:A, :b=>:B))) == Index([:A,:B])
 @test rename(i, :a, :A) == Index([:A,:b])
 @test rename(i, [:a], [:A]) == Index([:A,:b])
 # @test rename(i, uppercase) == Index([:A,:B])

test/io.jl

@@ -1,6 +1,6 @@
 module TestIO
     using Base.Test
-    using DataFrames, DataFrames.Compatibility
+    using DataFrames, Compat
 
     #test_group("We can read various file types.")
 
@@ -141,8 +141,8 @@ module TestIO
     osxpath = "$data/skiplines/complex_osx.csv"
     winpath = "$data/skiplines/complex_windows.csv"
 
-    opts1 = @AnyDict(:allowcomments => true)
-    opts2 = @AnyDict(:skipstart => 4, :skiprows => [6, 7, 12, 14, 17], :skipblanks => false)
+    opts1 = @compat Dict{Any,Any}(:allowcomments => true)
+    opts2 = @compat Dict{Any,Any}(:skipstart => 4, :skiprows => [6, 7, 12, 14, 17], :skipblanks => false)
 
     df1 = readtable(osxpath; opts1...)
     # df2 = readtable(osxpath; opts2...)