Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix warnings about get/parse when using ICU, fix some of the finalizers #24

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix warnings about get/parse when using ICU, fix some of the finalizers #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7e50c3
Fix finalization issues
ScottPJones Nov 4, 2015
942e476
Fix import/export of get, parse
ScottPJones Nov 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 19 additions & 33 deletions src/ICU.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ module ICU

using Compat

import Base: close, parse, get
export close, parse, get

export set_locale

export U_FAILURE,
Expand Down Expand Up @@ -155,8 +158,9 @@ end

## utext ##

immutable UText
type UText
p::Ptr{Void}
UText(p::Ptr) = (self = new(p); finalizer(self, utext_close); self)
end

function utext_open(str::UTF8String)
Expand All @@ -177,12 +181,8 @@ function utext_open(str::UTF16String)
UText(p)
end

function utext_close(t::UText)
if (t.p != C_NULL)
ccall((_utext_close, iculib), Void, (Ptr{Void},), t.p)
t.p = C_NULL
end
end
utext_close(t::UText) =
t.p == C_NULL || (ccall((_utext_close, iculib), Void, (Ptr{Void},), t.p) ; t.p = C_NULL)

## ustring ##

Expand Down Expand Up @@ -294,7 +294,7 @@ const UBRK_TITLE = @compat Int32(4)

type UBreakIterator
p::Ptr{Void}
UBreakIterator(p::Ptr) = (self = new(p); finalizer(self, close); self)
UBreakIterator(p::Ptr) = (self = new(p); finalizer(self, ubrk_close); self)
end

function ubrk_open(kind::Integer, loc::LocaleString, s::Vector{UInt16})
Expand All @@ -315,12 +315,8 @@ function ubrk_open(kind::Integer, loc::LocaleString)
UBreakIterator(p)
end

function ubrk_close(bi::UBreakIterator)
if bi.p != C_NULL
ccall((_ubrk_close, iculib), Void, (Ptr{Void},), bi.p)
bi.p = C_NULL
end
end
ubrk_close(bi::UBreakIterator) =
bi.p == C_NULL || (ccall((_ubrk_close, iculib), Void, (Ptr{Void},), bi.p) ; bi.p = C_NULL)

ubrk_next(bi::UBreakIterator) =
ccall((_ubrk_next, iculib), Int32, (Ptr{Void},), bi.p)
Expand All @@ -338,11 +334,11 @@ end

type UConverter
p::Ptr{Void}
UConverter(p::Ptr) = (self = new(p); finalizer(self, close); self)
UConverter(p::Ptr) = (self = new(p); finalizer(self, ucnv_close); self)
end

ucnv_close(c::UConverter) =
ccall((_ucnv_close, iculibi18n), Void, (Ptr{Void},), c.p)
c.p == C_NULL || (ccall((_ucnv_close, iculibi18n), Void, (Ptr{Void},), c.p) ; c.p = C_NULL)

type UConverterPivot
buf::Vector{UChar}
Expand Down Expand Up @@ -406,15 +402,11 @@ end

type UCollator
p::Ptr{Void}
UCollator(p::Ptr) = (self = new(p); finalizer(self, close); self)
UCollator(p::Ptr) = (self = new(p); finalizer(self, ucol_close); self)
end

function ucol_close(c::UCollator)
if c.p != C_NULL
ccall((_ucol_close, iculibi18n), Void, (Ptr{Void},), c.p)
c.p = C_NULL
end
end
ucol_close(c::UCollator) =
c.p == C_NULL || (ccall((_ucol_close, iculibi18n), Void, (Ptr{Void},), c.p) ; c.p = C_NULL)

function ucol_open(loc::LocaleString)
err = UErrorCode[0]
Expand Down Expand Up @@ -533,12 +525,8 @@ function ICUCalendar()
ICUCalendar(p)
end

function close(cal::ICUCalendar)
if cal.ptr != C_NULL
ccall((_ucal_close, iculibi18n), Void, (Ptr{Void},), cal.ptr)
cal.ptr = C_NULL
end
end
close(c::ICUCalendar) =
c.ptr == C_NULL || (ccall((_ucal_close, iculibi18n), Void, (Ptr{Void},), c.ptr) ; c.ptr = C_NULL)

getNow() = ccall((_ucal_getNow, iculibi18n), UDate, ())

Expand Down Expand Up @@ -616,9 +604,7 @@ function getDefaultTimeZone()
UTF16String(buf[1:len+1])
end

export ICUDateFormat,
format,
parse
export ICUDateFormat, format

export UDAT_NONE,
UDAT_FULL,
Expand Down Expand Up @@ -661,7 +647,7 @@ function ICUDateFormat(tstyle::Integer, dstyle::Integer, tz::UTF16String)
end

close(df::ICUDateFormat) =
ccall((_udat_close, iculibi18n), Void, (Ptr{Void},), df.ptr)
df.ptr == C_NULL || (ccall((_udat_close, iculibi18n), Void, (Ptr{Void},), df.ptr) ; df.ptr = C_NULL)

function format(df::ICUDateFormat, millis::Float64)
err = UErrorCode[0]
Expand Down