Merge pull request #162 from aviatesk/juliacon

improve code quality and type instabilities

Author: cstjean

src/match/match.jl

@@ -24,7 +24,7 @@ isbinding(s) = false
 isbinding(s::Symbol) = occursin(r"[^_]_(_str)?$", string(s))
 
 function bname(s::Symbol)
-  Symbol(Base.match(r"^@?(.*?)_+(_str)?$", string(s)).captures[1])
+  Symbol(something(Base.match(r"^@?(.*?)_+(_str)?$", string(s))).captures[1])
 end
 
 function match_inner(pat, ex, env)

src/match/types.jl

@@ -17,7 +17,7 @@ function tbnew(s::Symbol)
   istb(s) || return s
   ts = map(Symbol, split(string(s), "_"))
   name = popfirst!(ts)
-  ts = map(totype, ts)
+  ts = (totype(t) for t in ts)
   Expr(:$, :(MacroTools.TypeBind($(Expr(:quote, name)), Set{Any}([$(ts...)]))))
 end
 

src/structdef.jl

@@ -12,7 +12,7 @@ function splitstructdef(ex)
     else
         parse_error(ex)
     end
-    
+
     if @capture header nameparam_ <: super_
         nothing
     elseif @capture header nameparam_
@@ -44,6 +44,8 @@ function splitstructdef(ex)
     d
 end
 
+parse_error(ex) = throw(ArgumentError("failed to split $(repr(ex))"))
+
 function combinestructdef(d)::Expr
     name = d[:name]
     parameters = d[:params]

src/utils.jl

@@ -417,13 +417,6 @@ function combinearg(arg_name, arg_type, is_splat, default)
     return default === nothing ? a2 : Expr(:kw, a2, default)
 end
 
-
-macro splitcombine(fundef)
-    dict = splitdef(fundef)
-    esc(rebuilddef(striplines(dict)))
-end
-
-
 """
     splitarg(arg)
 
@@ -444,11 +437,11 @@ See also: [`combinearg`](@ref)
 """
 function splitarg(arg_expr)
     splitvar(arg) =
-        @match arg begin
+        (@match arg begin
             ::T_ => (nothing, T)
             name_::T_ => (name, T)
             x_ => (x, :Any)
-        end
+        end)::NTuple{2,Any} # the pattern `x_` matches any expression
     (is_splat = @capture(arg_expr, arg_expr2_...)) || (arg_expr2 = arg_expr)
     if @capture(arg_expr2, arg_ = default_)
         @assert default !== nothing "splitarg cannot handle `nothing` as a default. Use a quoted `nothing` if possible. (MacroTools#35)"

test/split.jl

@@ -112,4 +112,5 @@ end
     @test first(constructors) ==
         :((S(a::A) where A) = new{A}()) |> MacroTools.flatten
 
+    @test_throws ArgumentError splitstructdef(:(call_ex(arg)))
 end