Timerix/utf8proc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix deprecated warnings with Julia 0.4

Browse Source
This commit is contained in:
Peter Colberg 2015-10-31 13:59:38 -04:00
parent a930086323
commit b10b64dc10
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
data/charwidths.jl
View File

@ -8,8 +8,14 @@
############################################################################# #############################################################################
# Julia 0.3/0.4 compatibility (taken from Compat package) # Julia 0.3/0.4 compatibility (taken from Compat package)
if VERSION < v"0.4.0-dev+1387"
typealias AbstractString String
end
if VERSION < v"0.4.0-dev+1419" if VERSION < v"0.4.0-dev+1419"
const UInt16 = Uint16 const UInt32 = Uint32
end
if VERSION < v"0.4.0-dev+3874"
Base.parse{T<:Integer}(::Type{T}, s::AbstractString) = parseint(T, s)
end end
CharWidths = Dict{Int,Int}() CharWidths = Dict{Int,Int}()
@ -52,7 +58,7 @@ end
# Widths from GNU Unifont # Widths from GNU Unifont
#Read sfdfile for character widths #Read sfdfile for character widths
function parsesfd(filename::String, CharWidths::Dict{Int,Int}=Dict{Int,Int}()) function parsesfd(filename::AbstractString, CharWidths::Dict{Int,Int}=Dict{Int,Int}())
state=:seekchar state=:seekchar
lineno = 0 lineno = 0
codepoint = width = nothing codepoint = width = nothing
@ -65,8 +71,8 @@ function parsesfd(filename::String, CharWidths::Dict{Int,Int}=Dict{Int,Int}())
state = :readdata state = :readdata
end end
elseif state==:readdata #Encoding: 65538 -1 2, Width: 1024 elseif state==:readdata #Encoding: 65538 -1 2, Width: 1024
contains(line, "Encoding:") && (codepoint = int(split(line)[3])) contains(line, "Encoding:") && (codepoint = parse(Int, split(line)[3]))
contains(line, "Width:") && (width = int(split(line)[2])) contains(line, "Width:") && (width = parse(Int, split(line)[2]))
if codepoint!=nothing && width!=nothing && codepoint >= 0 if codepoint!=nothing && width!=nothing && codepoint >= 0
w=div(width, 512) # 512 units to the en w=div(width, 512) # 512 units to the en
if w > 0 if w > 0
@ -100,8 +106,8 @@ for line in readlines(open("EastAsianWidth.txt"))
width = strip(tokens[2]) width = strip(tokens[2])
#Parse code point range into Julia UnitRange #Parse code point range into Julia UnitRange
rangetokens = split(charrange, "..") rangetokens = split(charrange, "..")
charstart = uint32("0x"*rangetokens[1]) charstart = parse(UInt32, "0x"*rangetokens[1])
charend = uint32("0x"*rangetokens[length(rangetokens)>1 ? 2 : 1]) charend = parse(UInt32, "0x"*rangetokens[length(rangetokens)>1 ? 2 : 1])
#Assign widths #Assign widths
for c in charstart:charend for c in charstart:charend