Merge pull request #199 from FluxML/fix-isdef

Fix isdef

Author: cstjean

Project.toml

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

src/utils.jl

@@ -224,8 +224,10 @@ macro expand(ex)
 end
 
 
-"Test for function definition expressions."
-isdef(ex) = isshortdef(ex) || longdef1(ex) !== nothing
+"Test for function definition expressions. `function f end` and anonymous functions are considered
+as function definitions and return true."
+isdef(ex::Expr) = isshortdef(ex) || ex.head == :function || ex.head == :->
+isdef(ex) = false
 
 isshortdef(ex) = (@capture(ex, (fcall_ = body_)) &&
                   (@capture(gatherwheres(fcall)[1],

test/utils.jl

@@ -14,14 +14,20 @@ using MacroTools: isdef, flatten, striplines
 
     ex6 = :(f(a) = a)
     @test isdef(ex6)
-    ex7 = :(f(a)::Int == 1)
+    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)
+    @test !isdef(:(f()))
+    @test !isdef(:ix)
+    @test isdef(:(function f end))  # This is an arbitrary decision. Arguably it could be called a
+                                    # function declaration, and have `isdef` return false.
+    @test isdef(:(x -> x+2))
+    @test isdef(:(function (y) y - 4 end))
 end
 
 @testset "flatten" begin