diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-02 04:39:44 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-02 04:39:44 +0000 |
commit | 31fe0c9f84789493de9b7d5f5294acae8dfa216c (patch) | |
tree | 44af7c3cce6e6197bf7a15fd3c8ab323fb8a343a /ext | |
parent | 05d563a4946aef1027a97e1bd853dcb200ef4e60 (diff) | |
download | ruby-31fe0c9f84789493de9b7d5f5294acae8dfa216c.tar.gz |
* re.c: Introduce RREGEXP_PTR.
patch by dbussink.
partially merge https://github.com/ruby/ruby/pull/497
* include/ruby/ruby.h: ditto.
* gc.c: ditto.
* ext/strscan/strscan.c: ditto.
* parse.y: ditto.
* string.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/strscan/strscan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c index f7592c9249..e75bf6639c 100644 --- a/ext/strscan/strscan.c +++ b/ext/strscan/strscan.c @@ -460,7 +460,7 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly) p->regex = regex; re = rb_reg_prepare_re(regex, p->str); - tmpreg = re != RREGEXP(regex)->ptr; + tmpreg = re != RREGEXP_PTR(regex); if (!tmpreg) RREGEXP(regex)->usecnt++; if (headonly) { @@ -480,8 +480,8 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly) onig_free(re); } else { - onig_free(RREGEXP(regex)->ptr); - RREGEXP(regex)->ptr = re; + onig_free(RREGEXP_PTR(regex)); + RREGEXP_PTR(regex) = re; } } @@ -978,7 +978,7 @@ name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name { int num; - num = onig_name_to_backref_number(RREGEXP(regexp)->ptr, + num = onig_name_to_backref_number(RREGEXP_PTR(regexp), (const unsigned char* )name, (const unsigned char* )name_end, regs); if (num >= 1) { return num; |