Merge pull request #13 from JuliaLang/yyc/0.4-binding

Fix 0.4 deprecated bindings

Author: yuyichao

.travis.yml

@@ -1,17 +1,10 @@
-language: cpp
-compiler:
-  - clang
+language: julia
+os:
+    - linux
+    - osx
+julia:
+    - 0.3
+    - 0.4
+    - nightly
 notifications:
   email: false
-env:
-  matrix: 
-    - JULIAVERSION="juliareleases" 
-    - JULIAVERSION="julianightlies" 
-before_install:
-  - sudo add-apt-repository ppa:staticfloat/julia-deps -y
-  - sudo add-apt-repository ppa:staticfloat/${JULIAVERSION} -y
-  - sudo apt-get update -qq -y
-  - sudo apt-get install libpcre3-dev julia -y
-  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-script:
-  - julia -e 'versioninfo(); Pkg.init(); Pkg.clone(pwd()); Pkg.test("Formatting")'

README.md

@@ -89,7 +89,7 @@ One can use ``printfmt`` and ``printfmtln`` for formatted printing:
     printfmt(FormatExpr("{1:d}", 10)) # OK
     ```
 
-    
+
 - **printfmtln**(io, fe, args...)
 
 - **printfmtln**(fe, args...)
@@ -103,7 +103,7 @@ One can use ``fmt`` to format a single value into a string, or ``format`` to for
 - **fmt**(fspec, a)
 
     Format a single value using a format specification given by ``fspec``, where ``fspec`` can be either a string or an instance of ``FormatSpec``.
-    
+
 - **format**(fe, args...)
 
     Format arguments using a format expression given by ``fe``, where ``fe`` can be either a string or an instance of ``FormatSpec``.

src/cformat.jl

@@ -6,10 +6,6 @@ function sprintf1( fmt::ASCIIString, x )
     f( x )
 end
 
-if VERSION < v"0.4-"
-    const base64encode = base64
-end
-
 function generate_formatter( fmt::ASCIIString )
     global formatters
     if haskey( formatters, fmt )
@@ -153,17 +149,17 @@ function format{T<:Real}( x::T;
         parens::Bool=false, # use (1.00) instead of -1.00. Used in finance
         alternative::Bool=false, # usually for hex
         mixedfraction::Bool=false,
-        mixedfractionsep::String="_",
-        fractionsep::String="/", # num / den
+        mixedfractionsep::AbstractString="_",
+        fractionsep::AbstractString="/", # num / den
         fractionwidth::Int = 0,
         tryden::Int = 0, # if 2 or higher, try to use this denominator, without losing precision
-        suffix::String="", # useful for units/%
+        suffix::AbstractString="", # useful for units/%
         autoscale::Symbol=:none, # :metric, :binary or :finance
         conversion::ASCIIString=""
         )
     checkwidth = commas
     if conversion == ""
-        if T <: FloatingPoint || T <: Rational && precision != -1
+        if T <: AbstractFloat || T <: Rational && precision != -1
             actualconv = "f"
         elseif T <: Unsigned
             actualconv = "x"
@@ -182,7 +178,7 @@ function format{T<:Real}( x::T;
     if T <: Rational && conversion == "s"
         stripzeros = false
     end
-    if ( T <: FloatingPoint && actualconv == "f" || T <: Integer ) && autoscale != :none
+    if ( T <: AbstractFloat && actualconv == "f" || T <: Integer ) && autoscale != :none
         actualconv = "f"
         if autoscale == :metric
             scales = [
@@ -202,7 +198,7 @@ function format{T<:Real}( x::T;
                         break
                     end
                 end
-            elseif T <: FloatingPoint
+            elseif T <: AbstractFloat
                 smallscales = [
                     ( 1e-12, "p" ),
                     ( 1e-9,  "n" ),

src/fmtcore.jl

@@ -12,7 +12,7 @@ end
 
 ### print string or char
 
-function _pfmt_s(out::IO, fs::FormatSpec, s::Union(String,Char))
+@compat function _pfmt_s(out::IO, fs::FormatSpec, s::Union{AbstractString,Char})
     wid = fs.width
     slen = length(s)
     if wid <= slen
@@ -35,12 +35,12 @@ end
 _mul(x::Integer, ::_Dec) = x * 10
 _mul(x::Integer, ::_Bin) = x << 1
 _mul(x::Integer, ::_Oct) = x << 3
-_mul(x::Integer, ::Union(_Hex, _HEX)) = x << 4
+@compat _mul(x::Integer, ::Union{_Hex, _HEX}) = x << 4
 
 _div(x::Integer, ::_Dec) = div(x, 10)
 _div(x::Integer, ::_Bin) = x >> 1
 _div(x::Integer, ::_Oct) = x >> 3
-_div(x::Integer, ::Union(_Hex, _HEX)) = x >> 4
+@compat _div(x::Integer, ::Union{_Hex, _HEX}) = x >> 4
 
 function _ndigits(x::Integer, op)  # suppose x is non-negative
     m = 1
@@ -53,7 +53,7 @@ function _ndigits(x::Integer, op)  # suppose x is non-negative
 end
 
 _ipre(op) = ""
-_ipre(::Union(_Hex, _HEX)) = "0x"
+@compat _ipre(::Union{_Hex, _HEX}) = "0x"
 _ipre(::_Oct) = "0o"
 _ipre(::_Bin) = "0b"
 
@@ -171,7 +171,7 @@ function _pfmt_float(out::IO, sch::Char, zs::Integer, intv::Real, decv::Real, pr
     end
 end
 
-function _pfmt_f(out::IO, fs::FormatSpec, x::FloatingPoint)
+function _pfmt_f(out::IO, fs::FormatSpec, x::AbstractFloat)
     # separate sign, integer, and decimal part
     ax = abs(x)
     sch = _signchar(x, fs.sign)
@@ -227,7 +227,7 @@ function _pfmt_floate(out::IO, sch::Char, zs::Integer, u::Real, prec::Int, e::In
 end
 
 
-function _pfmt_e(out::IO, fs::FormatSpec, x::FloatingPoint)
+function _pfmt_e(out::IO, fs::FormatSpec, x::AbstractFloat)
     # extract sign, significand, and exponent
     ax = abs(x)
     sch = _signchar(x, fs.sign)
@@ -265,7 +265,7 @@ function _pfmt_e(out::IO, fs::FormatSpec, x::FloatingPoint)
 end
 
 
-function _pfmt_g(out::IO, fs::FormatSpec, x::FloatingPoint)
+function _pfmt_g(out::IO, fs::FormatSpec, x::AbstractFloat)
     # number decomposition
     ax = abs(x)
     if 1.0e-4 <= ax < 1.0e6
@@ -275,7 +275,7 @@ function _pfmt_g(out::IO, fs::FormatSpec, x::FloatingPoint)
     end
 end
 
-function _pfmt_specialf(out::IO, fs::FormatSpec, x::FloatingPoint)
+function _pfmt_specialf(out::IO, fs::FormatSpec, x::AbstractFloat)
     if isinf(x) 
         if x > 0
             _pfmt_s(out, fs, "Inf")

src/fmtspec.jl

@@ -77,7 +77,7 @@ end
 
 const _spec_regex = r"^(.?[<>])?([ +-])?(#)?(\d+)?(,)?(.\d+)?([bcdeEfFgGnosxX])?$"
 
-function FormatSpec(s::String)
+function FormatSpec(s::AbstractString)
     # default spec
     _fill = ' '
     _align = '\0'
@@ -165,7 +165,7 @@ type _HEX end
 type _Bin end
 
 _srepr(x) = repr(x)
-_srepr(x::String) = x
+_srepr(x::AbstractString) = x
 _srepr(x::Char) = string(x)
 
 function printfmt(io::IO, fs::FormatSpec, x)
@@ -197,4 +197,4 @@ end
 printfmt(fs::FormatSpec, x) = printfmt(STDOUT, fs, x)
 
 fmt(fs::FormatSpec, x) = (buf = IOBuffer(); printfmt(buf, fs, x); bytestring(buf))
-fmt(spec::String, x) = fmt(FormatSpec(spec), x)
+fmt(spec::AbstractString, x) = fmt(FormatSpec(spec), x)

src/formatexpr.jl

@@ -13,13 +13,13 @@ immutable ArgSpec
     end
 end
 
-getarg(args, sp::ArgSpec) = 
+getarg(args, sp::ArgSpec) =
     (a = args[sp.argidx]; sp.hasfilter ? sp.filter(a) : a)
 
 # pos > 0: must not have iarg in expression (use pos+1), return (entry, pos + 1)
 # pos < 0: must have iarg in expression, return (entry, -1)
 # pos = 0: no positional argument before, can be either, return (entry, 1) or (entry, -1)
-function make_argspec(s::String, pos::Int)
+function make_argspec(s::AbstractString, pos::Int)
     # for argument position
     iarg::Int = -1
     hasfil::Bool = false
@@ -60,7 +60,7 @@ immutable FormatEntry
     spec::FormatSpec
 end
 
-function make_formatentry(s::String, pos::Int)
+function make_formatentry(s::AbstractString, pos::Int)
     @assert s[1] == '{' && s[end] == '}'
     sc = s[2:end-1]
     icolon = search(sc, ':')
@@ -86,7 +86,7 @@ end
 
 _raise_unmatched_lbrace() = error("Unmatched { in format expression.")
 
-function find_next_entry_open(s::String, si::Int)
+function find_next_entry_open(s::AbstractString, si::Int)
     slen = length(s)
     p = search(s, '{', si)
     p < slen || _raise_unmatched_lbrace()
@@ -103,15 +103,15 @@ function find_next_entry_open(s::String, si::Int)
     return (p, utf8(pre))
 end
 
-function find_next_entry_close(s::String, si::Int)
+function find_next_entry_close(s::AbstractString, si::Int)
     slen = length(s)
     p = search(s, '}', si)
     p > 0 || _raise_unmatched_lbrace()
     # println("close at $p")
     return p
 end
 
-function FormatExpr(s::String)
+function FormatExpr(s::AbstractString)
     slen = length(s)
 
     # init
@@ -159,12 +159,11 @@ function printfmt(io::IO, fe::FormatExpr, args...)
     end
 end
 
-printfmt(io::IO, fe::String, args...) = printfmt(io, FormatExpr(fe), args...)
-printfmt(fe::Union(String,FormatExpr), args...) = printfmt(STDOUT, fe, args...)
+printfmt(io::IO, fe::AbstractString, args...) = printfmt(io, FormatExpr(fe), args...)
+@compat printfmt(fe::Union{AbstractString,FormatExpr}, args...) = printfmt(STDOUT, fe, args...)
 
-printfmtln(io::IO, fe::Union(String,FormatExpr), args...) = (printfmt(io, fe, args...); println(io))
-printfmtln(fe::Union(String,FormatExpr), args...) = printfmtln(STDOUT, fe, args...)
+@compat printfmtln(io::IO, fe::Union{AbstractString,FormatExpr}, args...) = (printfmt(io, fe, args...); println(io))
+@compat printfmtln(fe::Union{AbstractString,FormatExpr}, args...) = printfmtln(STDOUT, fe, args...)
 
-format(fe::Union(String,FormatExpr), args...) = 
+@compat format(fe::Union{AbstractString,FormatExpr}, args...) =
     (buf = IOBuffer(); printfmt(buf, fe, args...); bytestring(buf))
-