Merge pull request #20 from JuliaLang/yyc/0.6-depwarn

Fix depwarn on 0.5 and 0.6

Author: yuyichao

REQUIRE

@@ -1,2 +1,2 @@
 julia 0.3
-Compat
+Compat 0.8.0

src/cformat.jl

@@ -1,17 +1,17 @@
-formatters = Dict{ ASCIIString, Function }()
+formatters = Dict{ Compat.ASCIIString, Function }()
 
-function sprintf1( fmt::ASCIIString, x )
+function sprintf1( fmt::Compat.ASCIIString, x )
     global formatters
     f = generate_formatter( fmt )
     f( x )
 end
 
-function generate_formatter( fmt::ASCIIString )
+function generate_formatter( fmt::Compat.ASCIIString )
     global formatters
     if haskey( formatters, fmt )
         return formatters[fmt]
     end
-    func = symbol( "sprintf_" * replace( base64encode( fmt ), "=", "!" ) )
+    func = @compat Symbol("sprintf_", replace(base64encode(fmt), "=", "!"))
 
     if !contains( fmt, "'" )
         test = Base.Printf.parse( fmt )
@@ -78,7 +78,7 @@ function generate_formatter( fmt::ASCIIString )
     f
 end
 
-function addcommas( s::ASCIIString )
+function addcommas( s::Compat.ASCIIString )
     len = length(s)
     t = ""
     for i in 1:3:len
@@ -105,7 +105,7 @@ function generate_format_string(;
         signed::Bool=false,
         positivespace::Bool=false,
         alternative::Bool=false,
-        conversion::ASCIIString="f" #aAdecEfFiosxX
+        conversion::Compat.ASCIIString="f" #aAdecEfFiosxX
         )
     s = "%"
     if commas
@@ -155,7 +155,7 @@ function format{T<:Real}( x::T;
         tryden::Int = 0, # if 2 or higher, try to use this denominator, without losing precision
         suffix::AbstractString="", # useful for units/%
         autoscale::Symbol=:none, # :metric, :binary or :finance
-        conversion::ASCIIString=""
+        conversion::Compat.ASCIIString=""
         )
     checkwidth = commas
     if conversion == ""

src/fmtcore.jl

@@ -67,7 +67,7 @@ _signchar(x::Number, s::Char) = x < 0 ? '-' :
                                 s == '+' ? '+' :
                                 s == ' ' ? ' ' : '\0'
 
-function _pfmt_int{Op}(out::IO, sch::Char, ip::ASCIIString, zs::Integer, ax::Integer, op::Op)
+function _pfmt_int{Op}(out::IO, sch::Char, ip::Compat.ASCIIString, zs::Integer, ax::Integer, op::Op)
     # print sign
     if sch != '\0'
         write(out, sch)

src/fmtspec.jl

@@ -200,5 +200,5 @@ end
 
 printfmt(fs::FormatSpec, x) = printfmt(STDOUT, fs, x)
 
-fmt(fs::FormatSpec, x) = (buf = IOBuffer(); printfmt(buf, fs, x); bytestring(buf))
+fmt(fs::FormatSpec, x) = sprint(printfmt, fs, x)
 fmt(spec::AbstractString, x) = fmt(FormatSpec(spec), x)

src/formatexpr.jl

@@ -32,7 +32,7 @@ function make_argspec(s::AbstractString, pos::Int)
         else
             iarg = ifil > 1 ? parse(Int,s[1:ifil-1]) : -1
             hasfil = true
-            ff = eval(symbol(s[ifil+2:end]))
+            ff = eval(@compat Symbol(s[ifil+2:end]))
         end
     end
 
@@ -47,7 +47,7 @@ function make_argspec(s::AbstractString, pos::Int)
         else
             pos = -1
         end
-    end 
+    end
 
     return (ArgSpec(iarg, hasfil, ff), pos)
 end
@@ -78,10 +78,10 @@ end
 ### Format expression
 
 type FormatExpr
-    prefix::UTF8String
-    suffix::UTF8String
+    prefix::Compat.UTF8String
+    suffix::Compat.UTF8String
     entries::Vector{FormatEntry}
-    inter::Vector{UTF8String}
+    inter::Vector{Compat.UTF8String}
 end
 
 _raise_unmatched_lbrace() = error("Unmatched { in format expression.")
@@ -100,7 +100,7 @@ function find_next_entry_open(s::AbstractString, si::Int)
         pre = replace(pre, "{{", '{')
         pre = replace(pre, "}}", '}')
     end
-    return (p, utf8(pre))
+    return (p, convert(Compat.UTF8String, pre))
 end
 
 function find_next_entry_close(s::AbstractString, si::Int)
@@ -113,12 +113,12 @@ end
 
 function FormatExpr(s::AbstractString)
     slen = length(s)
-    
+
     # init
-    prefix = utf8("")
-    suffix = utf8("")
+    prefix = convert(Compat.UTF8String, "")
+    suffix = convert(Compat.UTF8String, "")
     entries = FormatEntry[]
-    inter = UTF8String[]
+    inter = Compat.UTF8String[]
 
     # scan
     (p, prefix) = find_next_entry_open(s, 1)
@@ -166,4 +166,4 @@ printfmt(io::IO, fe::AbstractString, args...) = printfmt(io, FormatExpr(fe), arg
 @compat printfmtln(fe::Union{AbstractString,FormatExpr}, args...) = printfmtln(STDOUT, fe, args...)
 
 @compat format(fe::Union{AbstractString,FormatExpr}, args...) =
-    (buf = IOBuffer(); printfmt(buf, fe, args...); bytestring(buf))
+    sprint(printfmt, fe, args...)

test/cformat.jl

@@ -1,13 +1,14 @@
 using Formatting
+using Compat
 using Base.Test
 
 function test_equality()
     println( "test cformat equality...")
     srand(10)
-    fmts = ASCIIString[ "%10.4f", "%f", "%e", "%10f", "%.3f", "%.3e" ]
+    fmts = Compat.ASCIIString[ "%10.4f", "%f", "%e", "%10f", "%.3f", "%.3e" ]
     for fmt in fmts
         l = :( x-> x )
-        l.args[2].args[2] = Expr( :macrocall, symbol( "@sprintf" ), fmt, :x )
+        l.args[2].args[2] = @compat Expr(:macrocall, Symbol("@sprintf"), fmt, :x)
         mfmtr = eval( l )
         for i in 1:10000
             n = erfinv( rand() * 1.99 - 1.99/2.0 )
@@ -17,10 +18,10 @@ function test_equality()
         end
     end
 
-    fmts = ASCIIString[ "%d", "%10d", "%010d", "%-10d" ]
+    fmts = Compat.ASCIIString[ "%d", "%10d", "%010d", "%-10d" ]
     for fmt in fmts
         l = :( x-> x )
-        l.args[2].args[2] = Expr( :macrocall, symbol( "@sprintf" ), fmt, :x )
+        l.args[2].args[2] = @compat Expr(:macrocall, Symbol("@sprintf"), fmt, :x)
         mfmtr = eval( l )
         for i in 1:10000
             j = round(Int, erfinv( rand() * 1.99 - 1.99/2.0 ) * 100000 )