Merge branch 'master' into add-docs

Author: Roger-luo

README.md

@@ -13,7 +13,7 @@ have a type definition:
 
 ```julia
 ex = quote
-  type Foo
+  struct Foo
     x::Int
     y
   end
@@ -23,7 +23,7 @@ end
 If you know what you're doing, you can pull out the name and fields via:
 
 ```julia
-julia> if isexpr(ex.args[2], :type)
+julia> if isexpr(ex.args[2], :struct)
          (ex.args[2].args[2], ex.args[2].args[3].args)
        end
 (:Foo,{:( # line 3:),:(x::Int),:( # line 4:),:y})
@@ -40,7 +40,7 @@ Enter MacroTools:
 ```julia
 julia> using MacroTools
 
-julia> @capture(ex, type T_ fields__ end)
+julia> @capture(ex, struct T_ fields__ end)
 true
 
 julia> T, fields
@@ -91,12 +91,12 @@ Another common use case is to catch symbol literals, e.g.
 
 ```julia
 @capture(ex,
-  type T_Symbol
+  struct T_Symbol
     fields__
   end)
 ```
 
-which will match e.g. `type Foo ...` but not `type Foo{V} ...`
+which will match e.g. `struct Foo ...` but not `struct Foo{V} ...`
 
 ### Unions
 

src/MacroTools.jl

@@ -1,14 +1,14 @@
-__precompile__(true)
 module MacroTools
 
 using Compat
 using Compat.Markdown
 export @match, @capture
 
-include("match.jl")
-include("types.jl")
-include("union.jl")
-include("macro.jl")
+include("match/match.jl")
+include("match/types.jl")
+include("match/union.jl")
+include("match/macro.jl")
+
 include("utils.jl")
 include("structdef.jl")
 
@@ -17,7 +17,7 @@ include("examples/threading.jl")
 include("examples/forward.jl")
 
 const animals = Symbol[]
-const animals_file = joinpath(dirname(@__FILE__), "..", "animals.txt")
+const animals_file = joinpath(@__DIR__, "..", "animals.txt")
 
 function __init__()
   _animals = split(read(animals_file, String))

src/examples/forward.jl

@@ -14,7 +14,8 @@ macro forward(ex, fs)
   @capture(ex, T_.field_) || error("Syntax: @forward T.x f, g, h")
   T = esc(T)
   fs = isexpr(fs, :tuple) ? map(esc, fs.args) : [esc(fs)]
-  :($([:($f(x::$T, args...) = (Base.@_inline_meta; $f(x.$field, args...)))
+  :($([:($f(x::$T, args...; kwargs...) =
+         (Base.@_inline_meta; $f(x.$field, args...; kwargs...)))
        for f in fs]...);
     nothing)
 end

src/examples/threading.jl

@@ -22,7 +22,7 @@ macro >(exs...)
     isexpr(ex, :block)            ? thread(x, rmlines(ex).args...) :
     Expr(:call, ex, x)
 
-  thread(x, exs...) = reduce(thread, x, exs)
+  thread(x, exs...) = Compat.reduce(thread, exs, init=x)
 
   esc(thread(exs...))
 end
@@ -42,7 +42,7 @@ macro >>(exs...)
     isexpr(ex, :block)            ? thread(x, rmlines(ex).args...) :
     Expr(:call, ex, x)
 
-  thread(x, exs...) = reduce(thread, x, exs)
+  thread(x, exs...) = Compat.reduce(thread, exs, init=x)
 
   esc(thread(exs...))
 end

src/macro.jl renamed to src/match/macro.jl

@@ -51,8 +51,15 @@ macro match(ex, lines)
   result = quote
     ex = $(esc(ex))
   end
-  body = foldr((clause, body) -> makeclause(clause..., body),
-               nothing, clauses(lines))
+
+  @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
+
   push!(result.args, body)
   return result
 end

src/match.jl renamed to src/match/match.jl

@@ -368,7 +368,11 @@ end
 flatten(ex) = postwalk(flatten1, ex)
 
 function makeif(clauses, els = nothing)
-  foldr((c, ex)->:($(c[1]) ? $(c[2]) : $ex), els, clauses)
+  @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
 end
 
 unresolve1(x) = x
@@ -383,8 +387,7 @@ function resyntax(ex)
       setfield!(x_, :f_, v_) => :($x.$f = $v)
       getindex(x_, i__) => :($x[$(i...)])
       tuple(xs__) => :($(xs...),)
-      ctranspose(x_) => :($x')
-      transpose(x_) => :($x.')
+      adjoint(x_) => :($x')
       _ => x
     end
   end

src/types.jl renamed to src/match/types.jl

@@ -0,0 +1,90 @@
+let
+  x = @match :(2+3) begin
+    (a_+b_) => (a, b)
+    (a_-b_) => (b, a)
+  end
+  @test x == (2, 3)
+end
+
+let
+  x = @match :(2-3) begin
+    (a_+b_) => (a, b)
+    (a_-b_) => (b, a)
+  end
+  @test x == (3, 2)
+end
+
+let
+  x = @match :(2/3) begin
+    (a_+b_) => (a, b)
+    (a_-b_) => (b, a)
+  end
+  @test x == nothing
+end
+
+let
+  x = @match :(2/3) begin
+    (a_+b_) => (a, b)
+    (a_-b_) => (b, a)
+    _ => :default
+  end
+  @test x == :default
+end
+
+let
+  ex = :(mutable struct Foo
+           x::Int
+           y
+         end)
+  @capture(ex, mutable struct T_ fields__ end)
+  @test T == :Foo
+  @test fields == [:(x::Int), :y]
+
+  @capture(ex, mutable struct T_ fields__ end)
+  @test T == :Foo
+  @test fields == [:(x::Int), :y]
+end
+
+let
+  ex = :(f(x))
+  @capture(ex, f_(xs__))
+  @test f == :f
+  @test xs == [:x]
+end
+
+let
+  ex = :(f(x, y, z))
+  @capture(ex, f_(x_, xs__))
+  @test f == :f
+  @test x == :x
+  @test xs == [:y, :z]
+end
+
+let
+  ex = quote
+    function foo(a, b)
+      return a+b
+    end
+  end
+  @assert @capture(shortdef(ex), f_(args__) = body_)
+end
+
+let
+  ex = :(a = b)
+  @capture(ex, a_ = b_)
+  @test (a, b) == (:a, :b)
+end
+
+let
+  ex = :(f(a = b))
+  @capture(ex, f(a_ = b_))
+  @test (a, b) == (:a, :b)
+  @capture(ex, f(x_))
+  @test isexpr(x, :kw)
+end
+
+let
+  ex = :(@foo(a,b))
+  @capture(ex, @foo(a_,b_))
+  @test (a, b) == (:a, :b)
+end