Merge pull request #57 from yuyichao/0.7

Fix most of 0.7 depwarns and test errors

REQUIRE

@@ -1 +1,2 @@
 julia 0.6
+Compat 0.30.0

src/MacroTools.jl

@@ -1,6 +1,7 @@
 __precompile__(true)
 module MacroTools
 
+using Compat
 export @match, @capture
 
 include("match.jl")

src/macro.jl

@@ -1,21 +1,22 @@
-allbindings(pat, bs) =
-  isbinding(pat) || (isslurp(pat) && pat ≠ :__) ? push!(bs, bname(pat)) :
+function allbindings(pat, bs)
+  if isa(pat, QuoteNode)
+    return allbindings(pat.value, bs)
+  end
+  return isbinding(pat) || (isslurp(pat) && pat ≠ :__) ? push!(bs, bname(pat)) :
   isa(pat, TypeBind) ? push!(bs, pat.name) :
   isa(pat, OrBind) ? (allbindings(pat.pat1, bs); allbindings(pat.pat2, bs)) :
   istb(pat) ? push!(bs, tbname(pat)) :
   isexpr(pat, :$) ? bs :
   isa(pat, Expr) ? map(pat -> allbindings(pat, bs), [pat.head, pat.args...]) :
   bs
+end
 
 allbindings(pat) = (bs = Any[]; allbindings(pat, bs); bs)
 
 function bindinglet(bs, body)
-  ex = :(let $(esc(:env)) = env
+  ex = :(let $(esc(:env)) = env, $((:($(esc(b)) = get(env, $(Expr(:quote, b)), nothing)) for b in bs)...)
            $body
          end)
-  for b in bs
-    push!(ex.args, :($(esc(b)) = get(env, $(Expr(:quote, b)), nothing)))
-  end
   return ex
 end
 

src/utils.jl

@@ -120,7 +120,7 @@ function inexpr(ex, x)
   return result
 end
 
-global const animals = split(readstring(joinpath(dirname(@__FILE__), "..", "animals.txt")))
+const animals = split(read(joinpath(dirname(@__FILE__), "..", "animals.txt"), String))
 
 isgensym(s::Symbol) = contains(string(s), "#")
 isgensym(s) = false
@@ -140,7 +140,7 @@ function alias_gensyms(ex)
 end
 
 # Helper function, from Compat. Use Base.macroexpand in 0.7
-macroexpandmodule(mod::Module, x::ANY) = eval(mod, :(macroexpand($(QuoteNode(x)))))
+macroexpandmodule(mod::Module, @nospecialize(x)) = eval(mod, :(macroexpand($(QuoteNode(x)))))
 
 """
 More convenient macro expansion, e.g.