kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* re.c (rb_reg_s_union): show encodings in error message.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2007-12-27 07:38:23 +00:00
parent ce2b982cd2
commit fd640aec82
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Thu Dec 27 16:37:06 2007 Tanaka Akira <akr@fsij.org>
* re.c (rb_reg_s_union): show encodings in error message.
Thu Dec 27 15:25:16 2007 Tanaka Akira <akr@fsij.org> Thu Dec 27 15:25:16 2007 Tanaka Akira <akr@fsij.org>
* encoding.c (rb_enc_codelen): show codepoint in error message. * encoding.c (rb_enc_codelen): show codepoint in error message.

23
re.c
View file

@ -2631,13 +2631,15 @@ rb_reg_s_union(VALUE self, VALUE args0)
if (!has_ascii_incompat) if (!has_ascii_incompat)
has_ascii_incompat = enc; has_ascii_incompat = enc;
else if (has_ascii_incompat != enc) else if (has_ascii_incompat != enc)
rb_raise(rb_eArgError, "regexp encodings differ"); rb_raise(rb_eArgError, "incompatible encodings: %s and %s",
rb_enc_name(has_ascii_incompat), rb_enc_name(enc));
} }
else if (rb_reg_fixed_encoding_p(v)) { else if (rb_reg_fixed_encoding_p(v)) {
if (!has_ascii_compat_fixed) if (!has_ascii_compat_fixed)
has_ascii_compat_fixed = enc; has_ascii_compat_fixed = enc;
else if (has_ascii_compat_fixed != enc) else if (has_ascii_compat_fixed != enc)
rb_raise(rb_eArgError, "regexp encodings differ"); rb_raise(rb_eArgError, "incompatible encodings: %s and %s",
rb_enc_name(has_ascii_compat_fixed), rb_enc_name(enc));
} }
else { else {
has_asciionly = 1; has_asciionly = 1;
@ -2652,7 +2654,8 @@ rb_reg_s_union(VALUE self, VALUE args0)
if (!has_ascii_incompat) if (!has_ascii_incompat)
has_ascii_incompat = enc; has_ascii_incompat = enc;
else if (has_ascii_incompat != enc) else if (has_ascii_incompat != enc)
rb_raise(rb_eArgError, "regexp encodings differ"); rb_raise(rb_eArgError, "incompatible encodings: %s and %s",
rb_enc_name(has_ascii_incompat), rb_enc_name(enc));
} }
else if (rb_enc_str_asciionly_p(e)) { else if (rb_enc_str_asciionly_p(e)) {
has_asciionly = 1; has_asciionly = 1;
@ -2661,12 +2664,20 @@ rb_reg_s_union(VALUE self, VALUE args0)
if (!has_ascii_compat_fixed) if (!has_ascii_compat_fixed)
has_ascii_compat_fixed = enc; has_ascii_compat_fixed = enc;
else if (has_ascii_compat_fixed != enc) else if (has_ascii_compat_fixed != enc)
rb_raise(rb_eArgError, "regexp encodings differ"); rb_raise(rb_eArgError, "incompatible encodings: %s and %s",
rb_enc_name(has_ascii_compat_fixed), rb_enc_name(enc));
} }
v = rb_reg_s_quote(Qnil, e); v = rb_reg_s_quote(Qnil, e);
} }
if (has_ascii_incompat && (has_asciionly || has_ascii_compat_fixed)) { if (has_ascii_incompat) {
rb_raise(rb_eArgError, "regexp encodings differ"); if (has_asciionly) {
rb_raise(rb_eArgError, "ASCII incompatible encoding: %s",
rb_enc_name(has_ascii_incompat));
}
if (has_ascii_compat_fixed) {
rb_raise(rb_eArgError, "incompatible encodings: %s and %s",
rb_enc_name(has_ascii_incompat), rb_enc_name(has_ascii_compat_fixed));
}
} }
rb_str_append(source, v); rb_str_append(source, v);