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 (reg_enc_error): raise EncodingCompatibilityError for

Browse source 
encoding incompatibility.  [ruby-core:18600]

* re.c (rb_reg_prepare_enc): more consistent error message.
  [ruby-core:18611]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20626 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-12-11 04:40:08 +00:00
parent 28d1621d10
commit 3060c7438d
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Thu Dec 11 13:09:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* re.c (reg_enc_error): raise EncodingCompatibilityError for
encoding incompatibility. [ruby-core:18600]
* re.c (rb_reg_prepare_enc): more consistent error message.
[ruby-core:18611]
Thu Dec 11 13:36:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Dec 11 13:36:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (enc_set_default_encoding): allowed to set default * encoding.c (enc_set_default_encoding): allowed to set default

4
re.c
View file

@ -1168,7 +1168,7 @@ rb_reg_preprocess(const char *p, const char *end, rb_encoding *enc,
static void static void
reg_enc_error(VALUE re, VALUE str) reg_enc_error(VALUE re, VALUE str)
{ {
rb_raise(rb_eArgError, rb_raise(rb_eEncCompatError,
"incompatible encoding regexp match (%s regexp with %s string)", "incompatible encoding regexp match (%s regexp with %s string)",
rb_enc_name(RREGEXP(re)->ptr->enc), rb_enc_name(RREGEXP(re)->ptr->enc),
rb_enc_name(rb_enc_get(str))); rb_enc_name(rb_enc_get(str)));
@ -1181,7 +1181,7 @@ rb_reg_prepare_enc(VALUE re, VALUE str, int warn)
if (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN) { if (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN) {
rb_raise(rb_eArgError, rb_raise(rb_eArgError,
"broken %s string", "invalid byte sequence in %s",
rb_enc_name(rb_enc_get(str))); rb_enc_name(rb_enc_get(str)));
} }