Update for new iteration protocol

Author: ScottPJones

src/StrFormat.jl

@@ -8,7 +8,6 @@ Licensed under MIT License, see LICENSE.md
 module StrFormat
 
 using APITools, Format
-@api init
 
 @api extend StrAPI, CharSetEncodings, Chars, StrBase, StrLiterals
 
@@ -25,7 +24,7 @@ end
 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)
+    c, k = str_next(s, k)
     check_done(s, k, "Incomplete % expression")
     # Handle interpolation
     isempty(s[i:j-1]) || push!(sx, unescape(s[i:j-1]))
@@ -36,7 +35,7 @@ function _parse_fmt(sx::Vector{Any}, s::AbstractString, unescape::Function,
         # Move past %, c should point to letter
         beg = k
         while true
-            c, k = next(s, k)
+            c, k = str_next(s, k)
             check_done(s, k, "Incomplete % expression")
             s[k] == '(' && break
         end
@@ -50,18 +49,18 @@ end
 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)
+    c, k = str_next(s, k)
     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)
+    c, k = str_next(s, k)
     while c != '}'
         check_done(s, k, string("\\{ missing closing } in ", c))
-        c, k = next(s, k)
+        c, k = str_next(s, k)
     end
     check_done(s, k, "Missing (expr) in Python format expression")
-    c, k = next(s, k)
+    c, k = str_next(s, k)
     c == '(' || parse_error(string("Missing (expr) in Python format expression: ", c))
     # Need to find end to parse to
     ex, j = _parse_format(s, k-1, Format.pyfmt)