Merge pull request #15 from JuliaString/spj/usedef

Use default

Author: ScottPJones

deps/build.jl

@@ -18,7 +18,7 @@ function process_line(vec::Vector{T}) where {T<:AbstractString}
     num = vec[1]
     str = vec[2]
     alias = vec[11]
-    ch = parse(UInt32, num, 16)
+    ch = parse_hex(UInt32, num)
     str[1] == '<' &&
         return str == "<control>" ? (alias != "", ch, _empty_string, alias) : _empty_val
     # Don't save names that simply contain hex representation

test/runtests.jl

@@ -1,17 +1,11 @@
-using Unicode_Entities
+using StrTables, Unicode_Entities
 
 @static VERSION < v"0.7.0-DEV" ? (using Base.Test) : (using Test)
 
 # Test the functions lookupname, matches, longestmatches, completions
 # Check that characters from all 3 tables (BMP, non-BMP, 2 character) are tested
 
-UE = Unicode_Entities
-
-ue_matchchar(ch)       = UE.matchchar(UE.default, ch)
-ue_lookupname(nam)     = UE.lookupname(UE.default, nam)
-ue_longestmatches(str) = UE.longestmatches(UE.default, str)
-ue_matches(str)        = UE.matches(UE.default, str)
-ue_completions(str)    = UE.completions(UE.default, str)
+const def = Unicode_Entities.default
 
 const datapath = joinpath(Pkg.dir(), "Unicode_Entities", "data")
 const dpath = "ftp://ftp.unicode.org/Public/UNIDATA/"
@@ -31,7 +25,7 @@ function load_unicode_data()
             flds = split(l, ";")
             str = flds[2]
             alias = flds[11]
-            ch = Char(parse(UInt32, flds[1], 16))
+            ch = Char(parse_hex(UInt32, flds[1]))
             if str[1] == '<'
                 str != "<control>" && continue
                 str = ""
@@ -62,60 +56,60 @@ load_unicode_data()
 
     @testset "matches data file" begin
         for (i, ch) in enumerate(symval)
-            list = ue_matchchar(ch)
+            list = matchchar(def, ch)
             if !isempty(list)
                 @test symnam[i] in list
             end
         end
         for (i, nam) in enumerate(symnam)
-            str = ue_lookupname(nam)
+            str = lookupname(def, nam)
             if str != ""
                 @test symval[i] == str[1]
             end
         end
     end
 
 @testset "lookupname" begin
-    @test ue_lookupname("foobar")   == ""
-    @test ue_lookupname(SubString("My name is Spock", 12)) == ""
-    @test ue_lookupname("end of text") == "\x03" # \3
-    @test ue_lookupname("TIBETAN LETTER -A") == "\u0f60"
-    @test ue_lookupname("LESS-THAN OR SLANTED EQUAL TO") == "\u2a7d"
-    @test ue_lookupname("REVERSED HAND WITH MIDDLE FINGER EXTENDED") == "\U1f595"
+    @test lookupname(def, "foobar")   == ""
+    @test lookupname(def, SubString("My name is Spock", 12)) == ""
+    @test lookupname(def, "end of text") == "\x03" # \3
+    @test lookupname(def, "TIBETAN LETTER -A") == "\u0f60"
+    @test lookupname(def, "LESS-THAN OR SLANTED EQUAL TO") == "\u2a7d"
+    @test lookupname(def, "REVERSED HAND WITH MIDDLE FINGER EXTENDED") == "\U1f595"
 end
 
 @testset "matches" begin
-    @test isempty(ue_matches(""))
-    @test isempty(ue_matches("\uf900"))
-    @test isempty(ue_matches(SubString("This is \uf900", 9)))
+    @test isempty(matches(def, ""))
+    @test isempty(matches(def, "\uf900"))
+    @test isempty(matches(def, SubString("This is \uf900", 9)))
     for (chrs, exp) in (("\U1f596", ["RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS"]),
                         ("\u0f4a", ["TIBETAN LETTER REVERSED TA"]),
                         (".", ["FULL STOP", "PERIOD"]))
-        res = ue_matches(chrs)
+        res = matches(def, chrs)
         @test length(res) >= length(exp)
         @test intersect(res, exp) == exp
     end
 end
 
 @testset "longestmatches" begin
-    @test isempty(ue_longestmatches("\uf900 abcd"))
-    @test isempty(ue_longestmatches(SubString("This is \uf900 abcd", 9)))
+    @test isempty(longestmatches(def, "\uf900 abcd"))
+    @test isempty(longestmatches(def, SubString("This is \uf900 abcd", 9)))
     for (chrs, exp) in (("\U1f596 abcd", ["RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS"]),
                         (".abcd", ["FULL STOP", "PERIOD"]),
                         ("\u0f4a#123", ["TIBETAN LETTER REVERSED TA", "TIBETAN LETTER TTA"]))
-        res = ue_longestmatches(chrs)
+        res = longestmatches(def, chrs)
         @test length(res) >= length(exp)
         @test intersect(res, exp) == exp
     end
 end
 
 @testset "completions" begin
-    @test isempty(ue_completions("ScottPaulJones"))
-    @test isempty(ue_completions(SubString("My name is Scott", 12)))
+    @test isempty(completions(def, "ScottPaulJones"))
+    @test isempty(completions(def, SubString("My name is Scott", 12)))
     for (chrs, exp) in (("ZERO", ["ZERO WIDTH JOINER", "ZERO WIDTH NO-BREAK SPACE",
                                   "ZERO WIDTH NON-JOINER", "ZERO WIDTH SPACE"]),
                         ("BACK OF", ["BACK OF ENVELOPE"]))
-        res = ue_completions(chrs)
+        res = completions(def, chrs)
         @test length(res) >= length(exp)
         @test intersect(res, exp) == exp
     end