Fix problems with world age of generated functions in v0.6

JuliaString · Jan 26, 2017 · 611e00f · 611e00f
1 parent 8b74630
commit 611e00f
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 73 deletions.
diff --git a/src/Format.jl b/src/Format.jl
@@ -7,7 +7,7 @@ export pyfmt, cfmt, fmt
 export fmt_default, fmt_default!, reset!, default_spec, default_spec!
 
 # Deal with mess from #16058
-if VERSION >= v"0.5.0"
+@static if VERSION >= v"0.5.0"
     const ASCIIStr = String
     const UTF8Str = String
     const ByteStr = String

diff --git a/src/cformat.jl b/src/cformat.jl
@@ -1,81 +1,70 @@
 formatters = Dict{ ASCIIStr, Function }()
 
-function cfmt( fmt::ASCIIStr, x )
-    global formatters
-    f = generate_formatter( fmt )
-    f( x )
+if VERSION >= v"0.5.0"
+    cfmt( fmt::ASCIIStr, x ) = eval(Expr(:call, generate_formatter( fmt ), x))
+else
+    cfmt( fmt::ASCIIStr, x ) = (generate_formatter( fmt ))(x)
 end
 
+function checkfmt(fmt)
+    test = Base.Printf.parse( fmt )
+    (length( test ) == 1 && typeof( test[1] ) <: Tuple) ||
+        error( "Only one AND undecorated format string is allowed")
+end
+
 function generate_formatter( fmt::ASCIIStr )
     global formatters
-    if haskey( formatters, fmt )
-        return formatters[fmt]
-    end
-    func = Symbol( "sprintf_", replace( base64encode( fmt ), "=", "!" ) )
+
+    haskey( formatters, fmt ) && return formatters[fmt]
 
     if !contains( fmt, "'" )
-        test = Base.Printf.parse( fmt )
-        if length( test ) != 1 || !( typeof( test[1] ) <: Tuple )
-            error( "Only one AND undecorated format string is allowed")
-        end
+        checkfmt(fmt)
+        return (formatters[ fmt ] = @eval(x->@sprintf( $fmt, x )))
+    end
 
-        code = quote
-            function $func( x )
-                @sprintf( $fmt, x )
-            end
-        end
-    else
-        conversion = fmt[end]
-        if !in( conversion, "sduifF" )
-            error( string("thousand separator not defined for ", conversion, " conversion") )
-        end
-        fmtactual = replace( fmt, "'", "", 1 )
-        test = Base.Printf.parse( fmtactual )
-        if length( test ) != 1 || !( typeof( test[1] ) <: Tuple )
-            error( "Only one AND undecorated format string is allowed")
-        end
-        if in( conversion, "sfF" )
-            code = quote
-                function $func{T<:Real}( x::T )
-                    s = @sprintf( $fmtactual, x )
-                    # commas are added to only the numerator
-                    if T <: Rational && endswith( $fmtactual, "s" )
-                        spos = findfirst( s, '/' )
-                        s = string(addcommas( s[1:spos-1] ), s[spos:end])
-                    else
-                        dpos = findfirst( s, '.' )
-                        if dpos != 0
-                            s = string(addcommas( s[1:dpos-1] ), s[ dpos:end ])
-                        else # find the rightmost digit
-                            for i in length( s ):-1:1
-                                if isdigit( s[i] )
-                                    s = string(addcommas( s[1:i] ), s[i+1:end])
-                                    break
-                                end
-                            end
-                        end
-                    end
-                    s
-                end
-            end
+    conversion = fmt[end]
+    conversion in "sduifF" ||
+        error( string("thousand separator not defined for ", conversion, " conversion") )
+
+    fmtactual = replace( fmt, "'", "", 1 )
+    checkfmt( fmtactual )
+    conversion in "sfF" ||
+        return (formatters[ fmt ] = @eval(x->checkcommas(@sprintf( $fmtactual, x ))))
+
+    formatters[ fmt ] =
+        if endswith( fmtactual, 's')
+            @eval((x::Real)->((eltype(x) <: Rational)
+                              ? addcommasrat(@sprintf( $fmtactual, x ))
+                              : addcommasreal(@sprintf( $fmtactual, x ))))
         else
-            code = quote
-                function $func( x )
-                    s = @sprintf( $fmtactual, x )
-                    for i in length( s ):-1:1
-                        if isdigit( s[i] )
-                            s = string(addcommas( s[1:i] ), s[i+1:end])
-                            break
-                        end
-                    end
-                    s
-                end
-            end
+            @eval((x::Real)->addcommasreal(@sprintf( $fmtactual, x )))
+        end
+end
+
+function addcommasreal(s)
+    dpos = findfirst( s, '.' )
+    dpos != 0 && return string(addcommas( s[1:dpos-1] ), s[ dpos:end ])
+    # find the rightmost digit
+    for i in length( s ):-1:1
+        isdigit( s[i] ) && return string(addcommas( s[1:i] ), s[i+1:end])
+    end
+    s
+end
+
+function addcommasrat(s)
+    # commas are added to only the numerator
+    spos = findfirst( s, '/' )
+    string(addcommas( s[1:spos-1] ), s[spos:end])
+end
+
+function checkcommas(s)
+    for i in length( s ):-1:1
+        if isdigit( s[i] )
+            s = string(addcommas( s[1:i] ), s[i+1:end])
+            break
         end
     end
-    f = eval( code )
-    formatters[ fmt ] = f
-    f
+    s
 end
 
 function addcommas( s::ASCIIStr )
@@ -85,15 +74,13 @@ function addcommas( s::ASCIIStr )
         subs = s[max(1,len-i-1):len-i+1]
         if i == 1
             t = subs
+        elseif match( r"[0-9]", subs ) != nothing
+            t = string(subs, ',', t)
         else
-            if match( r"[0-9]", subs ) != nothing
-                t = string(subs, ',', t)
-            else
-                t = string(subs, t)
-            end
+            t = string(subs, t)
         end
     end
-    return t
+    t
 end
 
 function generate_format_string(;