diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-27 06:12:19 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-27 06:12:19 +0000 |
| commit | 8bb84c92d4d78d72f9b7faab4fbd6e20f0cef2c1 (patch) | |
| tree | 0e504a6a11a04a9de26b29b26182374dd42c4a25 | |
| parent | 6aef04f33827f18bf3e65eeae8bb2527ef0f4360 (diff) | |
| download | ruby-8bb84c92d4d78d72f9b7faab4fbd6e20f0cef2c1.tar.gz | |
* encoding.c (rb_enc_check): show encodings in error message.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | encoding.c | 4 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Thu Dec 27 15:11:27 2007 Tanaka Akira <akr@fsij.org> + + * encoding.c (rb_enc_check): show encodings in error message. + Thu Dec 27 15:02:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (rb_str_casecmp): fixed using a wrong variable. diff --git a/encoding.c b/encoding.c index ea00deb9e2..a8c04dcebf 100644 --- a/encoding.c +++ b/encoding.c @@ -504,7 +504,9 @@ rb_enc_check(VALUE str1, VALUE str2) { rb_encoding *enc = rb_enc_compatible(str1, str2); if (!enc) - rb_raise(rb_eArgError, "character encodings differ"); + rb_raise(rb_eArgError, "character encodings differ: %s and %s", + rb_enc_name(rb_enc_get(str1)), + rb_enc_name(rb_enc_get(str2))); return enc; } |