diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-17 05:21:10 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-17 05:21:10 +0000 |
commit | 05737c35002d482382b72910d9bd792b794c8121 (patch) | |
tree | bc809c74612a8b37dd0f438b42701d8f5eaaaf57 /re.c | |
parent | 2d1d6c470563375ec4d71353fdf8de3aa4c40ef2 (diff) | |
download | ruby-05737c35002d482382b72910d9bd792b794c8121.tar.gz |
* re.c (rb_reg_s_union): the last check was not complete.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13733 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r-- | re.c | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -1783,7 +1783,8 @@ rb_reg_s_union(VALUE self, VALUE args0) else { int i; VALUE source = rb_str_buf_new(0); - VALUE enc0 = rb_obj_encoding(rb_ary_entry(args0, 0)); + int mbs = Qfalse; + rb_encoding *enc = 0; for (i = 0; i < argc; i++) { volatile VALUE v; @@ -1792,12 +1793,17 @@ rb_reg_s_union(VALUE self, VALUE args0) rb_str_buf_cat2(source, "|"); v = rb_check_regexp_type(e); if (!NIL_P(v)) { - rb_enc_check(enc0, v); v = rb_reg_to_s(v); } else { v = rb_reg_s_quote(Qnil, e); - rb_enc_check(enc0, rb_obj_encoding(v)); + } + if (mbs || rb_enc_str_coderange(v) != ENC_CODERANGE_SINGLE) { + if (!enc) enc = rb_enc_get(v); + else if (mbs && enc != rb_enc_get(v)) { + rb_raise(rb_eArgError, "regexp encodings differ"); + } + mbs = Qtrue; } rb_str_append(source, v); } |