Merge pull request #422 from JuliaLang/aa/revert-finalizer

Revert function first finalizers due to ambiguities

README.md

@@ -192,8 +192,8 @@ Currently, the `@compat` macro supports the following syntaxes:
 
 * `Uninitialized` and `uninitialized` with corresponding `Array` constructors ([#24652]).
 
-* `finalizer` accepts the finalizer to run as the first argument and the object to be finalized
-  as the second ([#24605])
+* `@compat finalizer(func, obj)` with the finalizer to run as the first argument and the object to be finalized
+  as the second ([#24605]).
 
 ## Renaming
 

src/Compat.jl

@@ -100,6 +100,11 @@ function _compat(ex::Expr)
             end
         end
     end
+    if VERSION < v"0.7.0-DEV.2562"
+        if ex.head == :call && ex.args[1] == :finalizer
+            ex.args[2], ex.args[3] = ex.args[3], ex.args[2]
+        end
+    end
     return Expr(ex.head, map(_compat, ex.args)...)
 end
 
@@ -825,14 +830,6 @@ end
     export Uninitialized, uninitialized
 end
 
-if VERSION < v"0.7.0-DEV.2562"
-    import Base: finalizer
-    finalizer(f::Function, o) = finalizer(o, f)
-    finalizer(f::Ptr{Void}, o) = finalizer(o, f)
-    finalizer(f::Ptr{Void}, o::Ptr{Void}) = invoke(finalizer, Tuple{Ptr{Void}, Any}, f, o)
-    finalizer(f::Ptr{Void}, o::Function) = invoke(finalizer, Tuple{Ptr{Void}, Any}, f, o)
-end
-
 include("deprecated.jl")
 
 end # module Compat

test/runtests.jl

@@ -1,6 +1,8 @@
 using Compat
 using Compat.Test
 
+@test isempty(detect_ambiguities(Base, Core, Compat))
+
 const struct_sym = VERSION < v"0.7.0-DEV.1263" ? :type : :struct
 
 # Issue #291
@@ -916,10 +918,11 @@ module Test24361
     using Compat.Test
     @test String(Compat.Base64.base64decode("SGVsbG8h")) == "Hello!"
 end
+
 # 0.7
 let A = [1]
     local x = 0
-    finalizer(a->(x+=1), A)
+    @compat finalizer(a->(x+=1), A)
     finalize(A)
     @test x == 1
     A = 0