Merge pull request #48 from jmkuhn/0.7

0.7 compat

Author: jmkuhn

REQUIRE

@@ -1 +1,2 @@
 julia 0.6
+Compat 0.62.0

src/Formatting.jl

@@ -3,6 +3,8 @@ __precompile__()
 module Formatting
 
     import Base.show
+    using Compat
+    using Compat.Printf
 
     export
         FormatSpec, FormatExpr,

src/cformat.jl

@@ -13,7 +13,7 @@ function generate_formatter( fmt::String )
 
     haskey( formatters, fmt ) && return formatters[fmt]
 
-    if !contains( fmt, "'" )
+    if !occursin("'", fmt)
         checkfmt(fmt)
         return (formatters[ fmt ] = @eval(x->@sprintf( $fmt, x )))
     end
@@ -22,7 +22,7 @@ function generate_formatter( fmt::String )
     conversion in "sduifF" ||
         error( string("thousand separator not defined for ", conversion, " conversion") )
 
-    fmtactual = replace( fmt, "'", "", 1 )
+    fmtactual = replace( fmt, "'" => "", count=1 )
     checkfmt( fmtactual )
     conversion in "sfF" ||
         return (formatters[ fmt ] = @eval(x->checkcommas(@sprintf( $fmtactual, x ))))
@@ -38,8 +38,8 @@ function generate_formatter( fmt::String )
 end
 
 function addcommasreal(s)
-    dpos = findfirst( s, '.' )
-    dpos != 0 && return string(addcommas( s[1:dpos-1] ), s[ dpos:end ])
+    dpos = Compat.findfirst( isequal('.'), s )
+    dpos !== nothing && 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])
@@ -49,7 +49,7 @@ end
 
 function addcommasrat(s)
     # commas are added to only the numerator
-    spos = findfirst( s, '/' )
+    spos = Compat.findfirst( isequal('/'), s )
     string(addcommas( s[1:spos-1] ), s[spos:end])
 end
 
@@ -123,7 +123,7 @@ function generate_format_string(;
     s * conversion
 end
 
-function format{T<:Real}( x::T;
+function format( x::T;
         width::Int=-1,
         precision::Int= -1,
         leftjustified::Bool=false,
@@ -142,7 +142,7 @@ function format{T<:Real}( x::T;
         suffix::AbstractString="", # useful for units/%
         autoscale::Symbol=:none, # :metric, :binary or :finance
         conversion::String=""
-        )
+        ) where {T<:Real}
     checkwidth = commas
     if conversion == ""
         if T <: AbstractFloat || T <: Rational && precision != -1
@@ -275,18 +275,18 @@ function format{T<:Real}( x::T;
             end
             checkwidth = true
         elseif !mixedfraction
-            s = replace( s, "//", fractionsep )
+            s = replace( s, "//" => fractionsep )
             checkwidth = true
         end
     elseif stripzeros && in( actualconv[1], "fFeEs" )
-        dpos = findfirst( s, '.')
+        dpos = Compat.findfirst( isequal('.'), s )
         if in( actualconv[1], "eEs" )
             if in( actualconv[1], "es" )
-                epos = findfirst( s, 'e' )
+                epos = Compat.findfirst( isequal('e'), s )
             else
-                epos = findfirst( s, 'E' )
+                epos = Compat.findfirst( isequal('E'), s )
             end
-            if epos == 0
+            if epos === nothing
                 rpos = length( s )
             else
                 rpos = epos-1
@@ -330,12 +330,12 @@ function format{T<:Real}( x::T;
 
     if checkwidth && width != -1
         if length(s) > width
-            s = replace( s, " ", "", length(s)-width )
+            s = replace( s, " " => "", count=length(s)-width )
             if length(s) > width && endswith( s, " " )
-                s = reverse( replace( reverse(s), " ", "", length(s)-width ) )
+                s = reverse( replace( reverse(s), " " => "", count=length(s)-width ) )
             end
             if length(s) > width
-                s = replace( s, ",", "", length(s)-width )
+                s = replace( s, "," => "", count=length(s)-width )
             end
         elseif length(s) < width
             if leftjustified

src/fmtcore.jl

@@ -67,7 +67,7 @@ _signchar(x::Real, s::Char) = signbit(x) ? '-' :
                                 s == '+' ? '+' :
                                 s == ' ' ? ' ' : '\0'
 
-function _pfmt_int{Op}(out::IO, sch::Char, ip::String, zs::Integer, ax::Integer, op::Op)
+function _pfmt_int(out::IO, sch::Char, ip::String, zs::Integer, ax::Integer, op::Op) where {Op}
     # print sign
     if sch != '\0'
         write(out, sch)
@@ -88,8 +88,8 @@ function _pfmt_int{Op}(out::IO, sch::Char, ip::String, zs::Integer, ax::Integer,
     end
 end
 
-function _pfmt_intdigits{Op,T<:Integer}(out::IO, ax::T, op::Op)
-    b_lb = _div(ax, op)   
+function _pfmt_intdigits(out::IO, ax::T, op::Op) where {Op, T<:Integer}
+    b_lb = _div(ax, op)
     b = one(T)
     while b <= b_lb
         b = _mul(b, op)
@@ -102,7 +102,7 @@ function _pfmt_intdigits{Op,T<:Integer}(out::IO, ax::T, op::Op)
     end
 end
 
-function _pfmt_i{Op}(out::IO, fs::FormatSpec, x::Integer, op::Op)
+function _pfmt_i(out::IO, fs::FormatSpec, x::Integer, op::Op) where {Op}
     # calculate actual length
     ax = abs(x)
     xlen = _ndigits(abs(x), op)
@@ -239,7 +239,7 @@ function _pfmt_e(out::IO, fs::FormatSpec, x::AbstractFloat)
     end
 
     # print
-    ec = isupper(fs.typ) ? 'E' : 'e'
+    ec = isuppercase(fs.typ) ? 'E' : 'e'
     wid = fs.width
     if wid <= xlen
         _pfmt_floate(out, sch, 0, u, fs.prec, e, ec)

src/fmtspec.jl

@@ -26,7 +26,7 @@ _tycls(c::Char) =
     (c == 's') ? 's' :
     error("Invalid type char $(c)")
 
-immutable FormatSpec
+struct FormatSpec
     cls::Char    # category: 'i' | 'f' | 'c' | 's'
     typ::Char
     fill::Char
@@ -158,19 +158,16 @@ end
 
 ## formatted printing using a format spec
 
-type _Dec end
-type _Oct end
-type _Hex end
-type _HEX end
-type _Bin end
+mutable struct _Dec end
+mutable struct _Oct end
+mutable struct _Hex end
+mutable struct _HEX end
+mutable struct _Bin end
 
 _srepr(x) = repr(x)
 _srepr(x::AbstractString) = x
 _srepr(x::Char) = string(x)
-
-if isdefined(:Enum)
-    _srepr(x::Enum) = string(x)
-end
+_srepr(x::Enum) = string(x)
 
 function printfmt(io::IO, fs::FormatSpec, x)
     cls = fs.cls

src/formatexpr.jl

@@ -2,7 +2,7 @@
 
 ### Argument specification
 
-immutable ArgSpec
+struct ArgSpec
     argidx::Int
     hasfilter::Bool
     filter::Function
@@ -26,10 +26,11 @@ function make_argspec(s::AbstractString, pos::Int)
     ff::Function = Base.identity
 
     if !isempty(s)
-        ifil = searchindex(s, "|>")
-        if ifil == 0
+        filrange = Compat.findfirst("|>", s)
+        if filrange === nothing
             iarg = parse(Int,s)
         else
+            ifil = first(filrange)
             iarg = ifil > 1 ? parse(Int,s[1:prevind(s, ifil)]) : -1
             hasfil = true
             ff = eval(Symbol(s[ifil+2:end]))
@@ -55,16 +56,16 @@ end
 
 ### Format entry
 
-immutable FormatEntry
+struct FormatEntry
     argspec::ArgSpec
     spec::FormatSpec
 end
 
 function make_formatentry(s::AbstractString, pos::Int)
     @assert s[1] == '{' && s[end] == '}'
-    sc = s[2:prevind(s, endof(s))]
-    icolon = search(sc, ':')
-    if icolon == 0  # no colon
+    sc = s[2:prevind(s, lastindex(s))]
+    icolon = Compat.findfirst(isequal(':'), sc)
+    if icolon === nothing  # no colon
         (argspec, pos) = make_argspec(sc, pos)
         spec = FormatSpec('s')
     else
@@ -77,7 +78,7 @@ end
 
 ### Format expression
 
-type FormatExpr
+mutable struct FormatExpr
     prefix::String
     suffix::String
     entries::Vector{FormatEntry}
@@ -87,25 +88,25 @@ end
 _raise_unmatched_lbrace() = error("Unmatched { in format expression.")
 
 function find_next_entry_open(s::AbstractString, si::Int)
-    slen = endof(s)
-    p = search(s, '{', si)
-    p < slen || _raise_unmatched_lbrace()
-    while p > 0 && s[p+1] == '{'  # escape `{{`
-        p = search(s, '{', p+2)
-        p < slen || _raise_unmatched_lbrace()
+    slen = lastindex(s)
+    p = Compat.findnext(isequal('{'), s, si)
+    (p === nothing || p < slen) || _raise_unmatched_lbrace()
+    while p !== nothing && s[p+1] == '{'  # escape `{{`
+        p = Compat.findnext(isequal('{'), s, p+2)
+        (p === nothing || p < slen) || _raise_unmatched_lbrace()
     end
     # println("open at $p")
-    pre = p > 0 ? s[si:prevind(s, p)] : s[si:end]
+    pre = p !== nothing ? s[si:prevind(s, p)] : s[si:end]
     if !isempty(pre)
-        pre = replace(pre, "{{", '{')
-        pre = replace(pre, "}}", '}')
+        pre = replace(pre, "{{" => '{')
+        pre = replace(pre, "}}" => '}')
     end
     return (p, convert(String, pre))
 end
 
 function find_next_entry_close(s::AbstractString, si::Int)
-    p = search(s, '}', si)
-    p > 0 || _raise_unmatched_lbrace()
+    p = Compat.findnext(isequal('}'), s, si)
+    p !== nothing || _raise_unmatched_lbrace()
     # println("close at $p")
     return p
 end
@@ -118,12 +119,12 @@ function FormatExpr(s::AbstractString)
     inter = String[]
     # scan
     (p, prefix) = find_next_entry_open(s, 1)
-    if p > 0
+    if p !== nothing
         q = find_next_entry_close(s, p+1)
         (e, pos) = make_formatentry(s[p:q], 0)
         push!(entries, e)
         (p, pre) = find_next_entry_open(s, q+1)
-        while p > 0
+        while p !== nothing
             push!(inter, pre)
             q = find_next_entry_close(s, p+1)
             (e, pos) = make_formatentry(s[p:q], pos)

test/cformat.jl

@@ -1,5 +1,7 @@
 using Formatting
-using Base.Test
+using Compat.Test
+using Compat.Printf
+using Compat.Random
 
 _erfinv(z) = sqrt(π) * Base.Math.@horner(z, 0, 1, 0, π/12, 0, 7π^2/480, 0, 127π^3/40320, 0,
                                          4369π^4/5806080, 0, 34807π^5/182476800) / 2

test/fmtspec.jl

@@ -1,7 +1,7 @@
 # test format spec parsing
 
 using Formatting
-using Base.Test
+using Compat.Test
 
 
 # default spec

test/formatexpr.jl

@@ -1,5 +1,5 @@
 using Formatting
-using Base.Test
+using Compat.Test
 
 # with positional arguments
 

test/runtests.jl

@@ -1,5 +1,5 @@
 using Formatting
-using Base.Test
+using Compat.Test
 
 include( "cformat.jl" )
 include( "fmtspec.jl" )