aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-09-11 20:36:18 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-09-11 20:36:18 +0000
commitbc8dfdc05960c730c9ade7a336226e5520f11235 (patch)
tree7cd43371ae77d38b7ad71e13f7d17d6f97309a82
parent731c9288dab654a31e7ccbaf57072ff66c00cdf8 (diff)
downloadruby-bc8dfdc05960c730c9ade7a336226e5520f11235.tar.gz
rational.c: preserve encoding in exception
* rational.c (string_to_r_strict): preserve encoding in exception git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--rational.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b80bd4396..21f8d0efd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Sep 12 05:35:24 2015 Eric Wong <e@80x24.org>
+
+ * rational.c (string_to_r_strict): preserve encoding in exception
+
Fri Sep 11 20:23:35 2015 Koichi Sasada <ko1@atdot.net>
* vm_core.h: remove rb_call_info_t::aux.opt_pc.
diff --git a/rational.c b/rational.c
index 2d0daea2e3..0f3167a7e0 100644
--- a/rational.c
+++ b/rational.c
@@ -2327,9 +2327,8 @@ string_to_r_strict(VALUE self)
s = (char *)"";
if (!parse_rat(s, 1, &num)) {
- VALUE ins = f_inspect(self);
- rb_raise(rb_eArgError, "invalid value for convert(): %s",
- StringValuePtr(ins));
+ rb_raise(rb_eArgError, "invalid value for convert(): %+"PRIsVALUE,
+ self);
}
if (RB_TYPE_P(num, T_FLOAT))