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

* parse.y (yycompile): should inherit "in_single" if eval happened

Browse Source 
in a singleton method.

* eval.c (rb_eval): class variables from singleton methods defined
  within singleton class statement should work like ones defined
  by sington def statements.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2002-02-08 05:20:34 +00:00
parent ffc3c4b401
commit 0a396e3ebb
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -5,6 +5,15 @@ Fri Feb 8 05:31:48 2002 Minero Aoki <aamine@loveruby.net>
* lib/net/http.rb: initialize HTTP.proxy_port by HTTP.port. * lib/net/http.rb: initialize HTTP.proxy_port by HTTP.port.
Fri Feb 8 01:27:33 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (yycompile): should inherit "in_single" if eval happened
in a singleton method.
* eval.c (rb_eval): class variables from singleton methods defined
within singleton class statement should work like ones defined
by sington def statements.
Thu Feb 07 13:44:08 2002 akira yamada <akira@arika.org> Thu Feb 07 13:44:08 2002 akira yamada <akira@arika.org>
* uri/common.rb (URI::join): new method. * uri/common.rb (URI::join): new method.

1
eval.c
View File

@ -2909,7 +2909,6 @@ rb_eval(self, n)
result = rb_cvar_get(ruby_cbase, node->nd_vid); result = rb_cvar_get(ruby_cbase, node->nd_vid);
break; break;
} }
self = rb_iv_get(ruby_cbase, "__attached__");
/* fall through */ /* fall through */
case NODE_CVAR2: /* singleton method */ case NODE_CVAR2: /* singleton method */
result = rb_cvar_get(rb_cvar_singleton(self), node->nd_vid); result = rb_cvar_get(rb_cvar_singleton(self), node->nd_vid);

4
parse.y
View File

@ -2145,6 +2145,10 @@ yycompile(f, line)
heredoc_end = 0; heredoc_end = 0;
ruby_sourcefile = strdup(f); ruby_sourcefile = strdup(f);
ruby_in_compile = 1; ruby_in_compile = 1;
if (ruby_frame && ruby_frame->last_class &&
FL_TEST(ruby_frame->last_class, FL_SINGLETON)) {
in_single = 1;
}
n = yyparse(); n = yyparse();
ruby_debug_lines = 0; ruby_debug_lines = 0;
compile_for_eval = 0; compile_for_eval = 0;