Merge pull request #3 from JuliaString/spj/v7update

Further updates for v0.7

Author: ScottPJones

.travis.yml

@@ -4,10 +4,19 @@ os:
   - linux
   - osx
 julia:
-  - release
+  - 0.6
   - nightly
 notifications:
   email: false
+git:
+  depth: 99999999
+
+## uncomment the following lines to allow failures on nightly julia
+## (tests will run but not make your overall status red)
+#matrix:
+#  allow_failures:
+#  - julia: nightly
+
 # uncomment the following lines to override the default test script
 script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi

REQUIRE

@@ -1,2 +1,2 @@
-julia 0.5
+julia 0.6
 StrTables

appveyor.yml

@@ -1,9 +1,16 @@
 environment:
   matrix:
-  - JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
-  - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
-  - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
-  - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
+  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
+
+## uncomment the following lines to allow failures on nightly julia
+## (tests will run but not make your overall status red)
+#matrix:
+#  allow_failures:
+#  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
+#  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 
 branches:
   only:
@@ -17,9 +24,15 @@ notifications:
     on_build_status_changed: false
 
 install:
+  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
+# If there's a newer build queued for the same PR, cancel this one
+  - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
+        https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
+        Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
+        throw "There are newer queued builds for this pull request, failing early." }
 # Download most recent Julia Windows binary
   - ps: (new-object net.webclient).DownloadFile(
-        $("http://s3.amazonaws.com/"+$env:JULIAVERSION),
+        $env:JULIA_URL,
         "C:\projects\julia-binary.exe")
 # Run installer silently, output to C:\projects\julia
   - C:\projects\julia-binary.exe /S /D=C:\projects\julia

deps/build.jl

@@ -1,4 +1,4 @@
-# License is MIT: https://github.com/JuliaString/LaTeX_Entities/LICENSE.md
+# License is MIT: https://github.com/JuliaString/HTML_Entities/LICENSE.md
 #
 # Mapping from HTML entities to the corresponding Unicode codepoint.
 
@@ -8,7 +8,9 @@ using StrTables
 
 VER = UInt32(1)
 
-include("htmlnames.jl")
+const inpname = "htmlnames.jl"
+
+include(inpname)
 
 const disp = [false]
 
@@ -17,62 +19,50 @@ const datapath = joinpath(Pkg.dir(), "HTML_Entities", "data")
 
 const empty_str = ""
 
-function sortsplit!{T}(index::Vector{UInt16}, vec::Vector{Tuple{T, UInt16}}, base)
-    sort!(vec)
-    len = length(vec)
-    valvec = Vector{T}(len)
-    indvec = Vector{UInt16}(len)
-    for (i, val) in enumerate(vec)
-        valvec[i], ind = val
-        indvec[i] = ind
-        index[ind] = UInt16(base + i)
-    end
-    base += len
-    valvec, indvec, base
-end
-
 function make_tables()
-    symnam = Vector{String}()
-    symval = Vector{String}()
+    symnam = String[]
+    symval = Vector{UInt32}[]
 
-    for pair in htmlonechar
-        push!(symnam, pair[1])
-        push!(symval, string(Char(pair[2])))
+    for (nam, val) in htmlonechar
+        push!(symnam, nam)
+        push!(symval, [val])
     end
-    for pair in htmlnonbmp
-        push!(symnam, pair[1])
-        push!(symval, string(Char(0x10000+pair[2])))
+    for (nam, val) in htmlnonbmp
+        push!(symnam, nam)
+        push!(symval, [0x10000+val])
     end
-    for pair in htmltwochar
-        push!(symnam, pair[1])
-        p = pair[2]
-        push!(symval, string(Char(p[1]), Char(p[2])))
+    for (nam, val) in htmltwochar
+        push!(symnam, nam)
+        push!(symval, UInt32[val...])
     end
 
     # We want to build a table of all the names, sort them, then create a StrTable out of them
     srtnam = sortperm(symnam)
     srtval = symval[srtnam] # Values, sorted the same as srtnam
 
     # BMP characters
-    l16 = Vector{Tuple{UInt16, UInt16}}()
+    l16 = Tuple{UInt16, UInt16}[]
     # non-BMP characters (in range 0x10000 - 0x1ffff)
-    l32 = Vector{Tuple{UInt16, UInt16}}()
+    l32 = Tuple{UInt16, UInt16}[]
     # two characters packed into UInt32, first character in high 16-bits
-    l2c = Vector{Tuple{UInt32, UInt16}}()
+    l2c = Tuple{UInt32, UInt16}[]
 
     for i in eachindex(srtnam)
-        chrs = convert(Vector{Char}, srtval[i])
-        length(chrs) > 2 && error("Too long sequence of characters $chrs")
-        if length(chrs) == 2
-            (chrs[1] > '\uffff' || chrs[2] > '\uffff') &&
-                error("Character $(chrs[1]) or $(chrs[2]) > 0xffff")
-            push!(l2c, (chrs[1]%UInt32<<16 | chrs[2]%UInt32, i))
-        elseif chrs[1] > '\U1ffff'
-            error("Character $(chrs[1]) too large: $(UInt32(chrs[1]))")
-        elseif chrs[1] > '\uffff'
-            push!(l32, ((chrs[1]-0x10000)%UInt32, i))
+        chrs = srtval[i]
+        len = length(chrs)
+        len > 2 && error("Too long sequence of characters $chrs")
+        ch1 = chrs[1]
+        if len == 2
+            ch2 = chrs[end]
+            (ch1 > 0x0ffff || ch2 > 0x0ffff) &&
+                error("Character $ch1 or $ch2 > 0xffff")
+            push!(l2c, (ch1<<16 | ch2, i))
+        elseif ch1 > 0x1ffff
+            error("Character $ch1 too large")
+        elseif ch1 > 0x0ffff
+            push!(l32, (ch1%UInt16, i))
         else
-            push!(l16, (chrs[1]%UInt16, i))
+            push!(l16, (ch1%UInt16, i))
         end
     end
 
@@ -84,18 +74,24 @@ function make_tables()
     # in each table to the index into the name table (so that we can find multiple names for
     # each character)
 
-    indvec = Vector{UInt16}(length(srtnam))
+    indvec = create_vector(UInt16, length(srtnam))
     vec16, ind16, base32 = sortsplit!(indvec, l16, 0)
     vec32, ind32, base2c = sortsplit!(indvec, l32, base32)
     vec2c, ind2c, basefn = sortsplit!(indvec, l2c, base2c)
 
-    (VER, string(now()), "loaded from htmlnames.jl",
+    (VER, string(now()), "loaded from $inpname",
      base32%UInt32, base2c%UInt32, StrTable(symnam[srtnam]), indvec,
      vec16, ind16, vec32, ind32, vec2c, ind2c)
 end
 
 println("Creating tables")
-tup = make_tables()
+tup = nothing
+try
+    global tup
+    tup = make_tables()
+catch ex
+    println(sprint(showerror, ex, catch_backtrace()))
+end
 savfile = joinpath(datapath, fname)
 println("Saving tables to ", savfile)
 StrTables.save(savfile, tup)