change finalizer argument order to allow for do finalizer functions

Author: jakebolewski

base/REPL.jl

@@ -682,7 +682,7 @@ function setup_interface(repl::LineEditREPL; hascolor = repl.hascolor, extra_rep
     if !repl.no_history_file
         try
             f = open(find_hist_file(), true, true, true, false, false)
-            finalizer(replc, replc->close(f))
+            finalizer(_->close(f), replc)
             hist_from_file(hp, f)
         catch e
             print_response(repl, e, catch_backtrace(), true, Base.have_color)

base/base.jl

@@ -140,10 +140,10 @@ const (:) = Colon()
 ==(w::WeakRef, v) = isequal(w.value, v)
 ==(w, v::WeakRef) = isequal(w, v.value)
 
-function finalizer(o::ANY, f::Union(Function,Ptr))
-    if isimmutable(o)
-        error("objects of type ", typeof(o), " cannot be finalized")
-    end
+finalizer(o::Function, f::Function) = error("invalid finalizer(f::Function, o::Function)")
+finalizer(o::Ptr, f::Ptr) = error("invalid finalizer(f::Ptr, o::Ptr)")
+finalizer(f::Union(Function,Ptr), o::ANY) = begin
+    isimmutable(o) && error("objects of type ", typeof(o), " cannot be finalized")
     ccall(:jl_gc_add_finalizer, Void, (Any,Any), o, f)
 end
 

base/base64.jl

@@ -21,7 +21,7 @@ type Base64Pipe <: IO
 
     function Base64Pipe(io::IO)
         b = new(io,0,0,0)
-        finalizer(b, close)
+        finalizer(close, b)
         return b
     end
 end

base/deprecated.jl

@@ -205,3 +205,9 @@ end
 @deprecate itrunc{T<:Integer}(::Type{T}, n::Integer) (n % T)
 
 @deprecate oftype{T}(::Type{T},c)  convert(T,c)
+
+function finalizer(o::Any, f::Union(Function,Ptr))
+    depwarn("finalizer(o::Any, f::Union(Function,Ptr)) is deprecated, " *
+            "use finalizer(f::Union(Function,Ptr), o::Any) instead", :finalizer)
+    finalizer(f, o)
+end

base/dict.jl

@@ -717,7 +717,7 @@ function add_weak_key(t::Dict, k, v)
     # TODO: it might be better to avoid the finalizer, allow
     # wiped WeakRefs to remain in the table, and delete them as
     # they are discovered by getindex and setindex!.
-    finalizer(k, t.deleter)
+    finalizer(t.deleter, k)
     return t
 end
 
@@ -731,7 +731,7 @@ end
 
 function add_weak_value(t::Dict, k, v)
     t[k] = WeakRef(v)
-    finalizer(v, x->weak_value_delete!(t, k, x))
+    finalizer(x->weak_value_delete!(t, k, x), v)
     return t
 end
 

base/fftw.jl

@@ -222,7 +222,7 @@ type Plan{T<:fftwNumber}
     ialign::Int32 # alignment mod 16 of input
     function Plan(plan::Ptr{Void}, sz::Dims, istride::Dims, ialign::Int32)
         p = new(plan,sz,istride,ialign)
-        finalizer(p, p -> destroy_plan(T, p.plan))
+        finalizer(p -> destroy_plan(T, p.plan), p)
         return p
     end
 end

base/gmp.jl

@@ -25,7 +25,7 @@ type BigInt <: Integer
     function BigInt()
         b = new(zero(Cint), zero(Cint), C_NULL)
         ccall((:__gmpz_init,:libgmp), Void, (Ptr{BigInt},), &b)
-        finalizer(b, _gmp_clear_func)
+        finalizer(_gmp_clear_func, b)
         return b
     end
 end

base/iostream.jl

@@ -16,7 +16,7 @@ function IOStream(name::String, finalize::Bool)
     buf = zeros(Uint8,sizeof_ios_t)
     x = IOStream(name, buf)
     if finalize
-        finalizer(x, close)
+        finalizer(close, x)
     end
     return x
 end

base/linalg/umfpack.jl

@@ -114,7 +114,7 @@ function lufact{Tv<:UMFVTypes,Ti<:UMFITypes}(S::SparseMatrixCSC{Tv,Ti})
                     zerobased ? copy(S.colptr) : decrement(S.colptr),
                     zerobased ? copy(S.rowval) : decrement(S.rowval),
                     copy(S.nzval))
-    finalizer(res, umfpack_free_symbolic)
+    finalizer(umfpack_free_symbolic, res)
     umfpack_numeric!(res)
 end
 
@@ -126,7 +126,7 @@ function lufact!{Tv<:UMFVTypes,Ti<:UMFITypes}(S::SparseMatrixCSC{Tv,Ti})
                     zerobased ? S.colptr : decrement!(S.colptr),
                     zerobased ? S.rowval : decrement!(S.rowval),
                     S.nzval)
-    finalizer(res, umfpack_free_symbolic)
+    finalizer(umfpack_free_symbolic, res)
     umfpack_numeric!(res)
 end
 

base/mmap.jl

@@ -110,7 +110,7 @@ function mmap_array{T,N}(::Type{T}, dims::NTuple{N,Integer}, s::IO, offset::File
         pmap, delta = mmap(len, prot, flags, fd(s), offset)
     end
     A = pointer_to_array(convert(Ptr{T}, uint(pmap)+delta), dims)
-    finalizer(A,x->munmap(pmap,len+delta))
+    finalizer(x->munmap(pmap,len+delta), A)
     return A
 end
 
@@ -150,7 +150,7 @@ function mmap_array{T,N}(::Type{T}, dims::NTuple{N,Integer}, s::IO, offset::File
         error("could not create mapping view: $(FormatMessage())")
     end
     A = pointer_to_array(convert(Ptr{T}, viewhandle+offset-offset_page), dims)
-    finalizer(A, x->munmap(viewhandle, mmaphandle))
+    finalizer(x->munmap(viewhandle, mmaphandle), A)
     return A
 end