diff options
| author | Pavel Roschin <roshin@scriptumplus.ru> | 2016-09-22 00:13:01 +0300 |
|---|---|---|
| committer | Pavel Roschin <roshin@scriptumplus.ru> | 2016-09-23 01:13:06 +0300 |
| commit | 61755945d2267f0406973d6359ef7a4fe4a79731 (patch) | |
| tree | 89df945f33ab08b38022c261af2f2c66c1b0a530 /lib/impure | |
| parent | 4b0ba5e3f1b78b3c45a3f1576ed3d60f9a8b6d80 (diff) | |
| download | Nim-61755945d2267f0406973d6359ef7a4fe4a79731.tar.gz | |
Enable JIT in PCRE to improve regular expressions performance
Diffstat (limited to 'lib/impure')
| -rw-r--r-- | lib/impure/nre.nim | 7 | ||||
| -rw-r--r-- | lib/impure/re.nim | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/lib/impure/nre.nim b/lib/impure/nre.nim index 76a0f3db6..5d62cb0b9 100644 --- a/lib/impure/nre.nim +++ b/lib/impure/nre.nim @@ -432,7 +432,12 @@ proc initRegex(pattern: string, flags: int, study = true): Regex = if study: # XXX investigate JIT - result.pcreExtra = pcre.study(result.pcreObj, 0x0, addr errorMsg) + var options: cint = 0 + var hasJit: cint + if pcre.config(pcre.CONFIG_JIT, addr hasJit) == 0: + if hasJit == 1'i32: + options = pcre.STUDY_JIT_COMPILE + result.pcreExtra = pcre.study(result.pcreObj, options, addr errorMsg) if errorMsg != nil: raise StudyError(msg: $errorMsg) diff --git a/lib/impure/re.nim b/lib/impure/re.nim index bf397550a..f73f9547a 100644 --- a/lib/impure/re.nim +++ b/lib/impure/re.nim @@ -87,7 +87,12 @@ proc re*(s: string, flags = {reExtended, reStudy}): Regex = result.h = rawCompile(s, cast[cint](flags - {reStudy})) if reStudy in flags: var msg: cstring - result.e = pcre.study(result.h, 0, addr msg) + var options: cint = 0 + var hasJit: cint + if pcre.config(pcre.CONFIG_JIT, addr hasJit) == 0: + if hasJit == 1'i32: + options = pcre.STUDY_JIT_COMPILE + result.e = pcre.study(result.h, options, addr msg) if not isNil(msg): raiseInvalidRegex($msg) proc matchOrFind(s: string, pattern: Regex, matches: var openArray[string], @@ -214,7 +219,7 @@ proc find*(s: string, pattern: Regex, start = 0): int = var rtarray = initRtArray[cint](3) rawMatches = rtarray.getRawData - res = pcre.exec(pattern.h, nil, s, len(s).cint, start.cint, 0'i32, + res = pcre.exec(pattern.h, pattern.e, s, len(s).cint, start.cint, 0'i32, cast[ptr cint](rawMatches), 3) if res < 0'i32: return res return rawMatches[0] |