diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:47:42 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:47:42 +0000 |
commit | d685a643efc35b4a31a0fcd14bd9f3de683a70e9 (patch) | |
tree | 976d3708435b027d018be6ae70da9f37d7340021 | |
parent | 57afae07a90c38d5d478157727da1b94767d3edc (diff) |
merges r20237 from trunk into ruby_1_9_1.
* re.c (rb_reg_regsub): returns -1 unless ascii as well as
rb_enc_ascget(). [ruby-dev:37097]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20265 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | re.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Nov 15 22:46:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * re.c (rb_reg_regsub): returns -1 unless ascii as well as + rb_enc_ascget(). [ruby-dev:37097] + Sat Nov 15 22:23:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (LDSHARED): do not suppress debug info if higher debug @@ -3141,7 +3141,7 @@ rb_reg_regsub(VALUE str, VALUE src, struct re_registers *regs, VALUE regexp) rb_encoding *str_enc = rb_enc_get(str); rb_encoding *src_enc = rb_enc_get(src); int acompat = rb_enc_asciicompat(str_enc); -#define ASCGET(s,e,cl) (acompat ? (*cl=1,s[0]) : rb_enc_ascget(s, e, cl, str_enc)) +#define ASCGET(s,e,cl) (acompat ? (*cl=1,ISASCII(s[0])?s[0]:-1) : rb_enc_ascget(s, e, cl, str_enc)) p = s = RSTRING_PTR(str); e = s + RSTRING_LEN(str); |