Merge pull request #43 from jmkuhn/pull-request/4f33e042

Fix #39 Unicode String indexing

Author: kmsquire

src/fmtspec.jl

@@ -102,7 +102,7 @@ function FormatSpec(s::AbstractString)
                 _align = a1[1]
             else
                 _fill = a1[1]
-                _align = a1[2]
+                _align = a1[nextind(a1, 1)]
             end
         end
 

src/formatexpr.jl

@@ -30,7 +30,7 @@ function make_argspec(s::AbstractString, pos::Int)
         if ifil == 0
             iarg = parse(Int,s)
         else
-            iarg = ifil > 1 ? parse(Int,s[1:ifil-1]) : -1
+            iarg = ifil > 1 ? parse(Int,s[1:prevind(s, ifil)]) : -1
             hasfil = true
             ff = eval(Symbol(s[ifil+2:end]))
         end
@@ -62,14 +62,14 @@ end
 
 function make_formatentry(s::AbstractString, pos::Int)
     @assert s[1] == '{' && s[end] == '}'
-    sc = s[2:end-1]
+    sc = s[2:prevind(s, endof(s))]
     icolon = search(sc, ':')
     if icolon == 0  # no colon
         (argspec, pos) = make_argspec(sc, pos)
         spec = FormatSpec('s')
     else
-        (argspec, pos) = make_argspec(sc[1:icolon-1], pos)
-        spec = FormatSpec(sc[icolon+1:end])
+        (argspec, pos) = make_argspec(sc[1:prevind(sc, icolon)], pos)
+        spec = FormatSpec(sc[nextind(sc, icolon):end])
     end
     return (FormatEntry(argspec, spec), pos)
 end
@@ -87,15 +87,15 @@ end
 _raise_unmatched_lbrace() = error("Unmatched { in format expression.")
 
 function find_next_entry_open(s::AbstractString, si::Int)
-    slen = length(s)
+    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()
     end
     # println("open at $p")
-    pre = p > 0 ? s[si:p-1] : s[si:end]
+    pre = p > 0 ? s[si:prevind(s, p)] : s[si:end]
     if !isempty(pre)
         pre = replace(pre, "{{", '{')
         pre = replace(pre, "}}", '}')
@@ -104,15 +104,15 @@ function find_next_entry_open(s::AbstractString, si::Int)
 end
 
 function find_next_entry_close(s::AbstractString, si::Int)
-    slen = length(s)
+    slen = endof(s)
     p = search(s, '}', si)
     p > 0 || _raise_unmatched_lbrace()
     # println("close at $p")
     return p
 end
 
 function FormatExpr(s::AbstractString)
-    slen = length(s)
+    slen = endof(s)
 
     # init
     prefix = ""

test/fmtspec.jl

@@ -32,26 +32,40 @@ fs = FormatSpec("d")
 @test FormatSpec(".6f") == FormatSpec('f'; prec=6)
 @test FormatSpec("<8d") == FormatSpec('d'; width=8, align='<')
 @test FormatSpec("#<8d") == FormatSpec('d'; width=8, fill='#', align='<')
+@test FormatSpec("⋆<8d") == FormatSpec('d'; width=8, fill='⋆', align='<')
 @test FormatSpec("#8,d") == FormatSpec('d'; width=8, ipre=true, tsep=true)
 
 # format string
 
 @test fmt("", "abc") == "abc"
+@test fmt("", "αβγ") == "αβγ"
 @test fmt("s", "abc") == "abc"
+@test fmt("s", "αβγ") == "αβγ"
 @test fmt("2s", "abc") == "abc"
+@test fmt("2s", "αβγ") == "αβγ"
 @test fmt("5s", "abc") == "abc  "
+@test fmt("5s", "αβγ") == "αβγ  "
 @test fmt(">5s", "abc") == "  abc"
+@test fmt(">5s", "αβγ") == "  αβγ"
 @test fmt("*>5s", "abc") == "**abc"
+@test fmt("⋆>5s", "αβγ") == "⋆⋆αβγ"
 @test fmt("*<5s", "abc") == "abc**"
+@test fmt("⋆<5s", "αβγ") == "αβγ⋆⋆"
 
 # format char
 
 @test fmt("", 'c') == "c"
+@test fmt("", 'γ') == "γ"
 @test fmt("c", 'c') == "c"
+@test fmt("c", 'γ') == "γ"
 @test fmt("3c", 'c') == "c  "
+@test fmt("3c", 'γ') == "γ  "
 @test fmt(">3c", 'c') == "  c"
+@test fmt(">3c", 'γ') == "  γ"
 @test fmt("*>3c", 'c') == "**c"
+@test fmt("⋆>3c", 'γ') == "⋆⋆γ"
 @test fmt("*<3c", 'c') == "c**"
+@test fmt("⋆<3c", 'γ') == "γ⋆⋆"
 
 # format integer
 
@@ -78,7 +92,9 @@ fs = FormatSpec("d")
 @test fmt("<6d", 123) == "123   "
 @test fmt(">6d", 123) == "   123"
 @test fmt("*<6d", 123) == "123***"
+@test fmt("⋆<6d", 123) == "123⋆⋆⋆"
 @test fmt("*>6d", 123) == "***123"
+@test fmt("⋆>6d", 123) == "⋆⋆⋆123"
 @test fmt("< 6d", 123) == " 123  "
 @test fmt("<+6d", 123) == "+123  "
 @test fmt("> 6d", 123) == "   123"
@@ -117,9 +133,13 @@ fs = FormatSpec("d")
 @test fmt("<08.2f", -8.376) == "-0008.38"
 @test fmt(">08.2f", -8.376) == "-0008.38"
 @test fmt("*<8.2f", 8.376) == "8.38****"
+@test fmt("⋆<8.2f", 8.376) == "8.38⋆⋆⋆⋆"
 @test fmt("*>8.2f", 8.376) == "****8.38"
+@test fmt("⋆>8.2f", 8.376) == "⋆⋆⋆⋆8.38"
 @test fmt("*<8.2f", -8.376) == "-8.38***"
+@test fmt("⋆<8.2f", -8.376) == "-8.38⋆⋆⋆"
 @test fmt("*>8.2f", -8.376) == "***-8.38"
+@test fmt("⋆>8.2f", -8.376) == "⋆⋆⋆-8.38"
 
 @test fmt(".2f", 0.999) == "1.00"
 @test fmt(".2f", 0.996) == "1.00"
@@ -142,7 +162,9 @@ fs = FormatSpec("d")
 @test fmt("<12.2e", 13.89) == "1.39e+01    "
 @test fmt(">12.2e", 13.89) == "    1.39e+01"
 @test fmt("*<12.2e", 13.89) == "1.39e+01****"
+@test fmt("⋆<12.2e", 13.89) == "1.39e+01⋆⋆⋆⋆"
 @test fmt("*>12.2e", 13.89) == "****1.39e+01"
+@test fmt("⋆>12.2e", 13.89) == "⋆⋆⋆⋆1.39e+01"
 @test fmt("012.2e", 13.89) == "00001.39e+01"
 @test fmt("012.2e", -13.89) == "-0001.39e+01"
 @test fmt("+012.2e", 13.89) == "+0001.39e+01"
@@ -175,5 +197,7 @@ fs = FormatSpec("d")
 @test fmt("<5f", Inf) == "Inf  "
 @test fmt(">5f", Inf) == "  Inf"
 @test fmt("*<5f", Inf) == "Inf**"
+@test fmt("⋆<5f", Inf) == "Inf⋆⋆"
 @test fmt("*>5f", Inf) == "**Inf"
+@test fmt("⋆>5f", Inf) == "⋆⋆Inf"
 

test/formatexpr.jl

@@ -5,17 +5,26 @@ using Base.Test
 
 @test format("{1}", 10) == "10"
 @test format("abc {1}", 10) == "abc 10"
+@test format("αβγ {1}", 10) == "αβγ 10"
 @test format("{1} efg", 10) == "10 efg"
+@test format("{1} ϵζη", 10) == "10 ϵζη"
 @test format("abc {1} efg", 10) == "abc 10 efg"
+@test format("αβγ{1}ϵζη", 10) == "αβγ10ϵζη"
 @test format("{1} + {2}", 10, "xyz") == "10 + xyz"
+@test format("{1} + {2}", 10, "χψω") == "10 + χψω"
 @test format("abc {1} + {2}", 10, "xyz") == "abc 10 + xyz"
+@test format("αβγ {1} + {2}", 10, "χψω") == "αβγ 10 + χψω"
 @test format("{1} + {2} efg", 10, "xyz") == "10 + xyz efg"
+@test format("{1} + {2} ϵζη", 10, "χψω") == "10 + χψω ϵζη"
 @test format("abc {1} + {2} efg", 10, "xyz") == "abc 10 + xyz efg"
-@test format("abc {1}{2} efg", 10, "xyz") == "abc 10xyz efg"
+@test format("αβγ {1} + {2} ϵζη", 10, "χψω") == "αβγ 10 + χψω ϵζη"
+@test format("αβγ {1}{2} ϵζη", 10, "χψω") == "αβγ 10χψω ϵζη"
 
 @test format("{1:d} + {2:s}", 10, "xyz") == "10 + xyz"
+@test format("{1:d} + {2:s}", 10, "χψω") == "10 + χψω"
 @test format("{1:04d} + {2:*>5}", 10, "xyz") == "0010 + **xyz"
-@test format("let {2:<5} := {1:.4f};", 12.3, "var") == "let var   := 12.3000;"
+@test format("{1:04d} + {2:⋆>5}", 10, "χψω") == "0010 + ⋆⋆χψω"
+@test format("let {2:<5} := {1:.4f};", 12.3, "χψω") == "let χψω   := 12.3000;"
 
 @test format("{}", 10) == "10"
 @test format("{} + {}", 10, 20) == "10 + 20"
@@ -30,6 +39,7 @@ using Base.Test
 @test format("{{}}") == "{}"
 @test format("{{{1}}}", 10) == "{10}"
 @test format("v: {{{2}}} = {1:.4f}", 1.2, "ab") == "v: {ab} = 1.2000"
+@test format("χ: {{{2}}} = {1:.4f}", 1.2, "αβ") == "χ: {αβ} = 1.2000"
 
 # with filter
 @test format("{1|>abs2} + {2|>abs2:.2f}", 2, 3) == "4 + 9.00"