1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

marshal.c: preserve encoding

Browse Source 
* marshal.c (must_not_be_anonymous, class2path): preserve encoding
  in the exception messages.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44837 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-02-05 08:24:37 +00:00
parent e10e309dce
commit 17a47a3358
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
marshal.c
View File

@ -189,31 +189,31 @@ static const rb_data_type_t dump_arg_data = {
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
}; };
static const char * static VALUE
must_not_be_anonymous(const char *type, VALUE path) must_not_be_anonymous(const char *type, VALUE path)
{ {
char *n = RSTRING_PTR(path); char *n = RSTRING_PTR(path);
if (!rb_enc_asciicompat(rb_enc_get(path))) { if (!rb_enc_asciicompat(rb_enc_get(path))) {
/* cannot occur? */ /* cannot occur? */
rb_raise(rb_eTypeError, "can't dump non-ascii %s name", type); rb_raise(rb_eTypeError, "can't dump non-ascii %s name % "PRIsVALUE,
type, path);
} }
if (n[0] == '#') { if (n[0] == '#') {
rb_raise(rb_eTypeError, "can't dump anonymous %s %.*s", type, rb_raise(rb_eTypeError, "can't dump anonymous %s % "PRIsVALUE,
(int)RSTRING_LEN(path), n); type, path);
} }
return n; return path;
} }
static VALUE static VALUE
class2path(VALUE klass) class2path(VALUE klass)
{ {
VALUE path = rb_class_path(klass); VALUE path = rb_class_path(klass);
const char *n;
n = must_not_be_anonymous((RB_TYPE_P(klass, T_CLASS) ? "class" : "module"), path); must_not_be_anonymous((RB_TYPE_P(klass, T_CLASS) ? "class" : "module"), path);
if (rb_path_to_class(path) != rb_class_real(klass)) { if (rb_path_to_class(path) != rb_class_real(klass)) {
rb_raise(rb_eTypeError, "%s can't be referred to", n); rb_raise(rb_eTypeError, "% "PRIsVALUE" can't be referred to", path);
} }
return path; return path;
} }