Merge pull request #138 from kmsquire/feature/isdef-function-with-return-types

Allow isdef() to match functions with return types

Author: cstjean

src/utils.jl

@@ -215,9 +215,7 @@ end
 
 
 "Test for function definition expressions."
-isdef(ex) = ismatch(or_(:(function _(__) _ end),
-                        :(f_(__) = _)),
-                    ex)
+isdef(ex) = isshortdef(ex) || longdef1(ex) !== nothing
 
 isshortdef(ex) = (@capture(ex, (fcall_ = body_)) &&
                   (@capture(gatherwheres(fcall)[1],

test/runtests.jl

@@ -6,5 +6,6 @@ using Test
 include("match.jl")
 include("split.jl")
 include("destruct.jl")
+include("utils.jl")
 
 end

test/utils.jl

@@ -0,0 +1,25 @@
+using MacroTools: isdef
+
+@testset "utils" begin
+    ex1 = :(function foo(a) return a; end)
+    @test isdef(ex1)
+    ex2 = :(function bar(a)::Int return 1; end)
+    @test isdef(ex2)
+    ex3 = :(function foo(a::T) where T return a; end)
+    @test isdef(ex3)
+    ex4 = :(function bar(a::T)::Int where T return 1; end)
+    @test isdef(ex4)
+    ex5 = :(function bar(a::S, b::T)::Union{S,T} where {S,T} if rand() < 0.5 return a; end; return b; end)
+    @test isdef(ex5)
+
+    ex6 = :(f(a) = a)
+    @test isdef(ex6)
+    ex7 = :(f(a)::Int == 1)
+    @test isdef(ex7)
+    ex8 = :(f(a::T) where T = a)
+    @test isdef(ex8)
+    ex9 = :(f(a::T)::Int where T = 1)
+    @test isdef(ex9)
+    ex10 = :(f(a::S, b::T)::Union{S,T} where {S,T} = rand() < 0.5 ? a : b)
+    @test isdef(ex10)
+end