From d685a643efc35b4a31a0fcd14bd9f3de683a70e9 Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 18 Nov 2008 16:47:42 +0000 Subject: 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 --- re.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 're.c') diff --git a/re.c b/re.c index 465e12c8c2..186e11aadd 100644 --- a/re.c +++ b/re.c @@ -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); -- cgit v1.2.3