code quality improvements from JET analysis

Project.toml

@@ -1,6 +1,6 @@
 name = "MacroTools"
 uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
-version = "0.5.6"
+version = "0.5.7"
 
 [deps]
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"

src/match/match.jl

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

src/structdef.jl

@@ -10,23 +10,23 @@ function splitstructdef(ex)
     elseif @capture(ex, mutable struct header_ body__ end)
         d[:mutable] = true
     else
-        parse_error(ex)
+        throw(ArgumentError("can't split $(repr(ex))"))
     end
 
     if @capture header nameparam_ <: super_
         nothing
     elseif @capture header nameparam_
         super = :Any
     else
-        parse_error(ex)
+        throw(ArgumentError("can't split $(repr(ex))"))
     end
     d[:supertype] = super
     if @capture nameparam name_{param__}
         nothing
     elseif @capture nameparam name_
         param = []
     else
-        parse_error(ex)
+        throw(ArgumentError("can't split $(repr(ex))"))
     end
     d[:name] = name
     d[:params] = param

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
+            x_ => (x, :Any) # capture every pattern
+        end)::NTuple{2,Any}
     (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