Use Milan's reserved words fix from DataTables

Author: andreasnoack

REQUIRE

@@ -4,5 +4,5 @@ StatsBase 0.11.0
 GZip
 SortingAlgorithms
 Reexport
-Compat 0.8.4
+Compat 0.18.0
 FileIO 0.1.2

src/other/utils.jl

@@ -2,11 +2,14 @@ import Base: isidentifier, is_id_start_char, is_id_char
 
 # FixMe! Incomplete list. E.g. `true` is missing
 const RESERVED_WORDS = Set(["local", "global", "export", "let", "bitstype",
-    "typealias", "using", "for", "struct", "while", "const", "immutable",
+    "typealias", "using", "for", "while", "const", "immutable",
     "baremodule", "continue", "import", "function", "macro", "if", "else",
     "finally", "try", "module", "elseif", "end", "begin", "quote", "do", "break",
     "catch", "abstract", "return", "type", "importall"])
 
+VERSION < v"0.6.0-dev.2194" && push!(RESERVED_WORDS, "ccall")
+VERSION >= v"0.6.0-dev.2698" && push!(RESERVED_WORDS, "struct")
+
 function identifier(s::AbstractString)
     s = normalize_string(s)
     if !isidentifier(s)

src/statsmodels/contrasts.jl

@@ -72,7 +72,7 @@ termnames(C::MyCoding, levels, baseind) = ...
 ```
 
 """
-abstract type AbstractContrasts end
+@compat abstract type AbstractContrasts end
 
 # Contrasts + Levels (usually from data) = ContrastsMatrix
 type ContrastsMatrix{C <: AbstractContrasts, T}

src/subdataframe/subdataframe.jl

@@ -51,14 +51,14 @@ immutable SubDataFrame{T <: AbstractVector{Int}} <: AbstractDataFrame
     parent::DataFrame
     rows::T # maps from subdf row indexes to parent row indexes
 
-    @compat function SubDataFrame{T}(parent::DataFrame, rows::T) where T
+    function (::Type{SubDataFrame{T}}){T}(parent::DataFrame, rows::T)
         if length(rows) > 0
             rmin, rmax = extrema(rows)
             if rmin < 1 || rmax > size(parent, 1)
                 throw(BoundsError())
             end
         end
-        new(parent, rows)
+        new{T}(parent, rows)
     end
 end
 

test/utils.jl

@@ -18,15 +18,6 @@ module TestUtils
 
     # Check that reserved words are up to date
 
-    function _remove_comments(s::AbstractString)
-        idx = search(s, ";;")
-        if isempty(idx)
-           return s
-        else
-            return s[1:(first(idx) - 1)]
-        end
-    end
-
     f = "$JULIA_HOME/../../src/julia-parser.scm"
     if isfile(f)
         r1 = r"define initial-reserved-words '\(([^)]+)"
@@ -36,7 +27,8 @@ module TestUtils
         if m1 == nothing || m2 == nothing
             error("Unable to extract keywords from 'julia-parser.scm'.")
         else
-            rw = Set(mapreduce(t -> split(_remove_comments(t)), vcat, split(m1.captures[1]*"\n"*m2.captures[1], '\n')))
+            s = replace(m1.captures[1]*" "*m2.captures[1], r";;.*?\n", "")
+            rw = Set(split(s, r"\W+"))
             @test rw == DataFrames.RESERVED_WORDS
         end
     else