diff options
author | kosako <kosako@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-17 14:43:38 +0000 |
---|---|---|
committer | kosako <kosako@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-17 14:43:38 +0000 |
commit | be27088cfc7813a0350b174fb6faad412917dd44 (patch) | |
tree | 20becb3f9928aa9573509dc3f6ad1bf0171e9706 /ext/strscan | |
parent | 18fdf525ca9ca3d483860417711ec817d4b8dcee (diff) | |
download | ruby-be27088cfc7813a0350b174fb6faad412917dd44.tar.gz ruby-be27088cfc7813a0350b174fb6faad412917dd44.tar.xz ruby-be27088cfc7813a0350b174fb6faad412917dd44.zip |
remove GNU regex API
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7993 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/strscan')
-rw-r--r-- | ext/strscan/strscan.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c index db1a9c64e..158fab321 100644 --- a/ext/strscan/strscan.c +++ b/ext/strscan/strscan.c @@ -171,7 +171,7 @@ static void strscan_free(p) struct strscanner *p; { - re_free_registers(&(p->regs)); + onig_region_free(&(p->regs), 0); memset(p, sizeof(struct strscanner), 0); free(p); } @@ -440,17 +440,15 @@ strscan_do_scan(self, regex, succptr, getstr, headonly) } strscan_prepare_re(regex); if (headonly) { - ret = re_match(RREGEXP(regex)->ptr, - CURPTR(p), S_RESTLEN(p), - 0, - &(p->regs)); + ret = onig_match(RREGEXP(regex)->ptr, (UChar* )CURPTR(p), + (UChar* )(CURPTR(p) + S_RESTLEN(p)), + (UChar* )CURPTR(p), &(p->regs), ONIG_OPTION_NONE); } else { - ret = re_search(RREGEXP(regex)->ptr, - CURPTR(p), S_RESTLEN(p), - 0, - S_RESTLEN(p), - &(p->regs)); + ret = onig_search(RREGEXP(regex)->ptr, + (UChar* )CURPTR(p), (UChar* )(CURPTR(p) + S_RESTLEN(p)), + (UChar* )CURPTR(p), (UChar* )(CURPTR(p) + S_RESTLEN(p)), + &(p->regs), ONIG_OPTION_NONE); } if (ret == -2) rb_raise(ScanError, "regexp buffer overflow"); |