Allow more general macro calls (#104)

Fixes #103

Author: timholy

src/utils.jl

@@ -28,8 +28,8 @@ checkname(fname::QuoteNode, name) = checkname(fname.value, name)
 
 function isfuncexpr(ex, name=nothing)
     # Strip any macros that wrap the method definition
-    while ex isa Expr && ex.head === :macrocall && length(ex.args) == 3
-        ex = ex.args[3]
+    while ex isa Expr && ex.head === :macrocall && length(ex.args) >= 3
+        ex = ex.args[end]
     end
     isa(ex, Expr) || return false
     if ex.head === :function || ex.head === :(=)

test/runtests.jl

@@ -169,6 +169,14 @@ isdefined(Main, :Revise) ? Main.Revise.includet("script.jl") : include("script.j
     @test occursin("x^3", src)
     @test line == 52
 
+    # Issue #103
+    if isdefined(Base, Symbol("@assume_effects"))
+        m = only(methods(pow103))
+        src, line = definition(String, m)
+        @test occursin("res *= x", src)
+        @test line == 57
+    end
+
     # Invalidation-insulating methods used by Revise and perhaps others
     d = IdDict{Union{String,Symbol},Union{Function,Vector{Function}}}()
     CodeTracking.invoked_setindex!(d, sin, "sin")

test/script.jl

@@ -50,3 +50,19 @@ end
 
 # Issue #80
 f80 = x -> 2 * x^3 + 1
+
+# Issue #103
+if isdefined(Base, Symbol("@assume_effects"))
+    @eval begin
+        Base.@assume_effects :terminates_locally  function pow103(x)
+            # this :terminates_locally allows `pow` to be constant-folded
+            res = 1
+            1 < x < 20 || error("bad pow")
+            while x > 1
+                res *= x
+                x -= 1
+            end
+            return res
+        end
+    end
+end