Merge pull request #176 from fingolfin/mh/VERSION

Remove code for Julia <= 0.7

Author: cstjean

src/match/macro.jl

@@ -52,13 +52,8 @@ macro match(ex, lines)
     ex = $(esc(ex))
   end
 
-  @static if VERSION < v"0.7.0-"
-    body = foldr((clause, body) -> makeclause(clause..., body),
-                 nothing, clauses(lines))
-  else
-    body = foldr((clause, body) -> makeclause(clause..., body),
-                 clauses(lines); init=nothing)
-  end
+  body = foldr((clause, body) -> makeclause(clause..., body),
+               clauses(lines); init=nothing)
 
   push!(result.args, body)
   return result

src/structdef.jl

@@ -1,5 +1,4 @@
-const STRUCTSYMBOL = VERSION < v"0.7-" ? :type : :struct
-isstructdef(ex) = Meta.isexpr(ex, STRUCTSYMBOL)
+isstructdef(ex) = Meta.isexpr(ex, :struct)
 
 function splitstructdef(ex)
     ex = MacroTools.striplines(ex)
@@ -60,7 +59,7 @@ function combinestructdef(d)::Expr
         $(d[:constructors]...)
     end
 
-    Expr(STRUCTSYMBOL, d[:mutable], header, body)
+    Expr(:struct, d[:mutable], header, body)
 end
 
 function combinefield(x)

src/utils.jl

@@ -219,14 +219,8 @@ More convenient macro expansion, e.g.
 @expand @time foo()
 ```
 """
-@static if VERSION <= v"0.7.0-DEV.484"
-  macro expand(ex)
-    :(alias_gensyms(macroexpand($(current_module()), $(ex,)[1])))
-  end
-else
-  macro expand(ex)
-    :(alias_gensyms(macroexpand($(__module__), $(ex,)[1])))
-  end
+macro expand(ex)
+  :(alias_gensyms(macroexpand($(__module__), $(ex,)[1])))
 end
 
 
@@ -471,11 +465,7 @@ Flatten any redundant blocks into a single block, over the whole expression.
 flatten(ex) = postwalk(flatten1, ex)
 
 function makeif(clauses, els = nothing)
-  @static if VERSION < v"0.7.0-"
-    foldr((c, ex)->:($(c[1]) ? $(c[2]) : $ex), els, clauses)
-  else
-    foldr((c, ex)->:($(c[1]) ? $(c[2]) : $ex), clauses; init=els)
-  end
+  foldr((c, ex)->:($(c[1]) ? $(c[2]) : $ex), clauses; init=els)
 end
 
 unresolve1(x) = x