Use APITools

Author: ScottPJones

.travis.yml

@@ -20,9 +20,9 @@ git:
 # uncomment the following lines to override the default test script
 script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-  - julia -e 'p="https://github.com/JuliaString"; s=".jl.git"; Pkg.clone("$p/Strs$s") ; Pkg.clone("$p/Format$s"); Pkg.clone("$p/StrLiterals$s"); Pkg.clone(pwd()); Pkg.test("StrFormat"; coverage=true)'
+  - julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg); d="https://github.com/JuliaString" ; for n in ("APITools", "StrAPI", "CharSetEncodings", "Chars", "StrBase") ; Pkg.clone("$d/$n.jl") ; end ; Pkg.add("Format"); Pkg.clone("$d/StrLiterals.jl"); Pkg.clone(pwd()); Pkg.test("StrFormat"; coverage=true)'
 after_success:
   # push coverage results to Coveralls
-  - julia -e 'cd(Pkg.dir("StrFormat")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
+  - julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg); cd(Pkg.dir("StrFormat")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
   # push coverage results to Codecov
-  - julia -e 'cd(Pkg.dir("StrFormat")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
+  - julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg); cd(Pkg.dir("StrFormat")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'

REQUIRE

@@ -1,4 +1,3 @@
 julia 0.6
 Format
-Strs
 StrLiterals

src/StrFormat.jl

@@ -7,18 +7,16 @@ Licensed under MIT License, see LICENSE.md
 """
 module StrFormat
 
-using Format, StrLiterals
+using APITools, Format
+@api init
 
-parse_error(s) = throw(StrLiterals._ParseError(s))
-
-_check_exp(ex) =
-    isa(ex, Expr) && (ex.head === :continue) && parse_error("Incomplete expression")
+@api extend StrAPI, CharSetEncodings, Chars, StrBase, StrLiterals
 
 function _parse_format(str, pos, fun)
-    ex, j = StrLiterals._parse(str, pos; greedy=false)
-    _check_exp(ex)
-    ex, k = StrLiterals._parse(string("a", str[pos:j-1]), 1, greedy=true)
-    _check_exp(ex)
+    ex, j = parse(Expr, str, pos; greedy=false)
+    check_expr(ex)
+    ex, k = parse(Expr, string("a", str[pos:j-1]), 1, greedy=true)
+    check_expr(ex)
     isa(ex, Symbol) && (println(string("a", str[pos:j-1])) ; dump(ex))
     ex.args[1] = fun
     ex, j
@@ -28,7 +26,7 @@ function _parse_fmt(sx::Vector{Any}, s::AbstractString, unescape::Function,
                     i::Integer, j::Integer, k::Integer)
     # Move past \\, k should point to '%'
     c, k = next(s, k)
-    done(s, k) && parse_error("Incomplete % expression")
+    check_done(s, k, "Incomplete % expression")
     # Handle interpolation
     isempty(s[i:j-1]) || push!(sx, unescape(s[i:j-1]))
     if s[k] == '('
@@ -39,7 +37,7 @@ function _parse_fmt(sx::Vector{Any}, s::AbstractString, unescape::Function,
         beg = k
         while true
             c, k = next(s, k)
-            done(s, k) && parse_error("Incomplete % expression")
+            check_done(s, k, "Incomplete % expression")
             s[k] == '(' && break
         end
         ex, j = _parse_format(s, k, Format.cfmt)
@@ -53,16 +51,16 @@ function _parse_pyfmt(sx::Vector{Any}, s::AbstractString, unescape::Function,
                       i::Integer, j::Integer, k::Integer)
     # Move past \\, k should point to '{'
     c, k = next(s, k)
-    done(s, k) && parse_error("Incomplete {...} Python format expression")
+    check_done(s, k, "Incomplete {...} Python format expression")
     # Handle interpolation
     isempty(s[i:j-1]) || push!(sx, unescape(s[i:j-1]))
     beg = k # start location
     c, k = next(s, k)
     while c != '}'
-        done(s, k) && parse_error(string("\\{ missing closing } in ", c))
+        check_done(s, k, string("\\{ missing closing } in ", c))
         c, k = next(s, k)
     end
-    done(s, k) && parse_error("Missing (expr) in Python format expression")
+    check_done(s, k, "Missing (expr) in Python format expression")
     c, k = next(s, k)
     c == '(' || parse_error(string("Missing (expr) in Python format expression: ", c))
     # Need to find end to parse to
@@ -73,8 +71,10 @@ function _parse_pyfmt(sx::Vector{Any}, s::AbstractString, unescape::Function,
 end
 
 function __init__()
-    StrLiterals.interpolate['%'] = _parse_fmt
-    StrLiterals.interpolate['{'] = _parse_pyfmt
+    interpolate['%'] = _parse_fmt
+    interpolate['{'] = _parse_pyfmt
 end
 
+@api freeze
+
 end # module StrFormat

test/runtests.jl

@@ -1,8 +1,12 @@
 # License is MIT: LICENSE.md
 
-@static VERSION < v"0.7.0-DEV" ? (using Base.Test) : (using Test)
+using APITools, Format
+@api init
 
-using Format, Strs, StrLiterals, StrFormat
+@api test StrAPI, CharSetEncodings, Chars, StrBase
+@api test StrLiterals, StrFormat
+
+@static V6_COMPAT ? (using Base.Test) : (using Test)
 
 @testset "C Formatting" begin
     @testset "int" begin