Merge pull request #168 from aviatesk/avi/inf

use `===` and `!==` in more places to improve inferrabilities

Author: cstjean

Project.toml

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

src/match/macro.jl

@@ -2,7 +2,7 @@ function allbindings(pat, bs)
   if isa(pat, QuoteNode)
     return allbindings(pat.value, bs)
   end
-  return isbinding(pat) || (isslurp(pat) && pat ≠ :__) ? push!(bs, bname(pat)) :
+  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)) :
@@ -25,7 +25,7 @@ function makeclause(pat, yes, els = nothing)
   pat = subtb(subor(pat))
   quote
     env = trymatch($(Expr(:quote, pat)), ex)
-    if env != nothing
+    if env !== nothing
       $(bindinglet(bs, esc(yes)))
     else
       $els

src/match/match.jl

@@ -36,7 +36,7 @@ match_inner(pat::QuoteNode, ex::QuoteNode, env) =
   match(pat.value, ex.value, env)
 
 isslurp(s) = false
-isslurp(s::Symbol) = s == :__ || occursin(r"[^_]__$", string(s))
+isslurp(s::Symbol) = s === :__ || occursin(r"[^_]__$", string(s))
 
 function slurprange(pat)
   slurps = length(filter(isslurp, pat))
@@ -68,7 +68,7 @@ function match_inner(pat::Expr, ex::Expr, env)
     end
 
     if isslurp(p)
-      p ≠ :__ && @trymatch store!(env, bname(p), slurp)
+      p !== :__ && @trymatch store!(env, bname(p), slurp)
     else
       @trymatch match(p, ex.args[i], env)
       i += 1
@@ -101,7 +101,7 @@ function match(pat, ex, env)
   ex = normalise(ex)
   pat, ex = blockunify(pat, ex)
   isslurp(pat) && return store!(env, bname(pat), Any[ex])
-  return match_inner(pat, ex, env)
+  return match_inner(pat, ex, env)::Union{typeof(env),MatchError,Nothing}
 end
 
 match(pat, ex) = match(pat, ex, Dict())

src/utils.jl

@@ -77,7 +77,7 @@ rmlines(x) = x
 function rmlines(x::Expr)
   # Do not strip the first argument to a macrocall, which is
   # required.
-  if x.head == :macrocall && length(x.args) >= 2
+  if x.head === :macrocall && length(x.args) >= 2
     Expr(x.head, x.args[1], nothing, filter(x->!isline(x), x.args[3:end])...)
   else
     Expr(x.head, filter(x->!isline(x), x.args)...)
@@ -161,9 +161,9 @@ isgensym(s) = false
 
 function gensymname(x::Symbol)
   m = Base.match(r"##(.+)#\d+", String(x))
-  m == nothing || return m.captures[1]
+  m === nothing || return m.captures[1]
   m = Base.match(r"#\d+#(.+)", String(x))
-  m == nothing || return m.captures[1]
+  m === nothing || return m.captures[1]
   return "x"
 end