jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify thin wrapper

Browse source
This commit is contained in:
Flaviu Tamas 2015-01-10 13:31:13 -05:00
commit 613d12c7bf
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/nre.nim
View file

@ -78,6 +78,7 @@ type
StudyError* = ref object of Exception StudyError* = ref object of Exception
# Creation & Destruction {{{
proc destroyRegex(self: Regex) = proc destroyRegex(self: Regex) =
pcre.free_substring(cast[cstring](self.pcreObj)) pcre.free_substring(cast[cstring](self.pcreObj))
self.pcreObj = nil self.pcreObj = nil
@ -106,11 +107,13 @@ proc initRegex*(pattern: string, options = "Sx"): Regex =
result.pcreExtra = pcre.study(result.pcreObj, 0x0, addr errorMsg) result.pcreExtra = pcre.study(result.pcreObj, 0x0, addr errorMsg)
if result.pcreExtra == nil: if result.pcreExtra == nil:
raise StudyError(msg: $errorMsg) raise StudyError(msg: $errorMsg)
# }}}
proc getinfo[T](self: Regex, opt: cint): T = proc getinfo[T](self: Regex, opt: cint): T =
let retcode = pcre.fullinfo(self.pcreObj, self.pcreExtra, opt, addr result) let retcode = pcre.fullinfo(self.pcreObj, self.pcreExtra, opt, addr result)
if retcode < 0: if retcode < 0:
# XXX Error message that doesn't expose implementation details
raise newException(FieldError, "Invalid getinfo for $1, errno $2" % [$opt, $retcode]) raise newException(FieldError, "Invalid getinfo for $1, errno $2" % [$opt, $retcode])
proc getCaptureCount(self: Regex): int = proc getCaptureCount(self: Regex): int =

14
src/private/pcre.nim
View file

@ -309,14 +309,6 @@ type
jit_stack16* = object jit_stack16* = object
jit_stack32* = object jit_stack32* = object
# When Pcre is compiled as a C++ library, the subject pointer type can be
#replaced with a custom type. For conventional use, the public interface is a
#const char *.
type
SPTR* = cstring
# The structure for passing additional data to pcre_exec(). This is defined in # The structure for passing additional data to pcre_exec(). This is defined in
#such as way as to be extensible. Always add new fields at the end, in order to #such as way as to be extensible. Always add new fields at the end, in order to
#remain compatible. #remain compatible.
@ -344,7 +336,7 @@ type
# ------------------------ Version 0 ------------------------------- # ------------------------ Version 0 -------------------------------
callout_number* {.importc: "callout_number".}: cint # Number compiled into pattern callout_number* {.importc: "callout_number".}: cint # Number compiled into pattern
offset_vector* {.importc: "offset_vector".}: ptr cint # The offset vector offset_vector* {.importc: "offset_vector".}: ptr cint # The offset vector
subject* {.importc: "subject".}: SPTR # The subject being matched subject* {.importc: "subject".}: cstring # The subject being matched
subject_length* {.importc: "subject_length".}: cint # The length of the subject subject_length* {.importc: "subject_length".}: cint # The length of the subject
start_match* {.importc: "start_match".}: cint # Offset to start of this match attempt start_match* {.importc: "start_match".}: cint # Offset to start of this match attempt
current_position* {.importc: "current_position".}: cint # Where we currently are in the subject current_position* {.importc: "current_position".}: cint # Where we currently are in the subject
@ -398,10 +390,10 @@ proc copy_substring*(a2: cstring; a3: ptr cint; a4: cint; a5: cint; a6: cstring;
proc dfa_exec*(a2: ptr Pcre; a3: ptr ExtraData; a4: cstring; a5: cint; a6: cint; proc dfa_exec*(a2: ptr Pcre; a3: ptr ExtraData; a4: cstring; a5: cint; a6: cint;
a7: cint; a8: ptr cint; a9: cint; a10: ptr cint; a11: cint): cint {. a7: cint; a8: ptr cint; a9: cint; a10: ptr cint; a11: cint): cint {.
cdecl, importc: "pcre_dfa_exec", pcreImport.} cdecl, importc: "pcre_dfa_exec", pcreImport.}
proc exec*(a2: ptr Pcre; a3: ptr ExtraData; a4: SPTR; a5: cint; a6: cint; a7: cint; proc exec*(a2: ptr Pcre; a3: ptr ExtraData; a4: cstring; a5: cint; a6: cint; a7: cint;
a8: ptr cint; a9: cint): cint {.cdecl, importc: "pcre_exec", a8: ptr cint; a9: cint): cint {.cdecl, importc: "pcre_exec",
pcreImport.} pcreImport.}
proc jit_exec*(a2: ptr Pcre; a3: ptr ExtraData; a4: SPTR; a5: cint; a6: cint; proc jit_exec*(a2: ptr Pcre; a3: ptr ExtraData; a4: cstring; a5: cint; a6: cint;
a7: cint; a8: ptr cint; a9: cint; a10: ptr jit_stack): cint {. a7: cint; a8: ptr cint; a9: cint; a10: ptr jit_stack): cint {.
cdecl, importc: "pcre_jit_exec", pcreImport.} cdecl, importc: "pcre_jit_exec", pcreImport.}
proc free_substring*(a2: cstring) {.cdecl, importc: "pcre_free_substring", proc free_substring*(a2: cstring) {.cdecl, importc: "pcre_free_substring",