ruby-changes:11877
From: yugui <ko1@a...>
Date: Fri, 22 May 2009 18:49:53 +0900 (JST)
Subject: [ruby-changes:11877] Ruby:r23536 (ruby_1_9_1): merges r23491 from trunk into ruby_1_9_1.
yugui 2009-05-22 18:49:35 +0900 (Fri, 22 May 2009) New Revision: 23536 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23536 Log: merges r23491 from trunk into ruby_1_9_1. -- * vm_method.c (rb_attr): should preserve encoding info. [ruby-dev:38498] Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/version.h branches/ruby_1_9_1/vm_method.c Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 23535) +++ ruby_1_9_1/ChangeLog (revision 23536) @@ -1,3 +1,8 @@ +Wed May 20 00:05:52 2009 Yukihiro Matsumoto <matz@r...> + + * vm_method.c (rb_attr): should preserve encoding info. + [ruby-dev:38498] + Sun May 17 14:23:08 2009 Nobuyoshi Nakada <nobu@r...> * compile.c (rb_parse_in_eval): returns true in true eval, not in Index: ruby_1_9_1/vm_method.c =================================================================== --- ruby_1_9_1/vm_method.c (revision 23535) +++ ruby_1_9_1/vm_method.c (revision 23536) @@ -432,6 +432,7 @@ { const char *name; ID attriv; + VALUE aname; int noex; if (!ex) { @@ -459,7 +460,9 @@ if (!name) { rb_raise(rb_eArgError, "argument needs to be symbol or string"); } - attriv = rb_intern_str(rb_sprintf("@%s", name)); + aname = rb_sprintf("@%s", name); + rb_enc_copy(aname, rb_id2str(id)); + attriv = rb_intern_str(aname); if (read) { rb_add_method(klass, id, NEW_IVAR(attriv), noex); } Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 23535) +++ ruby_1_9_1/version.h (revision 23536) @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-05-12" -#define RUBY_PATCHLEVEL 150 +#define RUBY_PATCHLEVEL 151 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/