Merge pull request #66 from stevengj/0.7-compat

fix 0.7 deprecations

Author: MikeInnes

src/MacroTools.jl

@@ -3,7 +3,6 @@ module MacroTools
 
 using Compat
 using Compat.Markdown
-using Compat.Random
 export @match, @capture
 
 include("match.jl")
@@ -16,9 +15,14 @@ include("examples/destruct.jl")
 include("examples/threading.jl")
 include("examples/forward.jl")
 
+const animals = Symbol[]
+
 function __init__()
   animals_file = joinpath(dirname(@__FILE__), "..", "animals.txt")
-  global animals = shuffle(Symbol.(lowercase.(split(read(animals_file, String)))))
+  _animals = split(read(animals_file, String))
+  resize!(animals, length(_animals))
+  animals .= Symbol.(lowercase.(_animals))
+  Compat.Random.shuffle!(animals)
 end
 
 end # module

src/utils.jl

@@ -198,7 +198,7 @@ function gatherwheres(ex)
   end
 end
 
-md"""    splitdef(fdef)
+"""    splitdef(fdef)
 
 Match any function definition
 
@@ -214,9 +214,9 @@ calling `MacroTools.combinedef(dict)`, or explicitly with
 ```
 rtype = get(dict, :rtype, :Any)
 all_params = [get(dict, :params, [])..., get(dict, :whereparams, [])...]
-:(function $(dict[:name]){$(all_params...)}($(dict[:args]...);
-                                            $(dict[:kwargs]...))::$rtype
-      $(dict[:body])
+:(function \$(dict[:name]){\$(all_params...)}(\$(dict[:args]...);
+                                            \$(dict[:kwargs]...))::\$rtype
+      \$(dict[:body])
   end)
 ```
 """

test/runtests.jl

@@ -40,7 +40,7 @@ let
            x::Int
            y
          end)
-  @capture(ex, type T_ fields__ end)
+  @capture(ex, mutable struct T_ fields__ end)
   @test T == :Foo
   @test fields == [:(x::Int), :y]