ruby-changes:11819
From: nobu <ko1@a...>
Date: Sun, 17 May 2009 14:23:25 +0900 (JST)
Subject: [ruby-changes:11819] Ruby:r23474 (trunk): * compile.c (rb_parse_in_eval): returns true in true eval, not in
nobu 2009-05-17 14:23:10 +0900 (Sun, 17 May 2009) New Revision: 23474 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23474 Log: * compile.c (rb_parse_in_eval): returns true in true eval, not in main. [ruby-dev:38382] * parse.y (program): inherits dvars in eval or main. Modified files: trunk/ChangeLog trunk/compile.c trunk/parse.y Index: ChangeLog =================================================================== --- ChangeLog (revision 23473) +++ ChangeLog (revision 23474) @@ -1,3 +1,10 @@ +Sun May 17 14:23:08 2009 Nobuyoshi Nakada <nobu@r...> + + * compile.c (rb_parse_in_eval): returns true in true eval, not in + main. [ruby-dev:38382] + + * parse.y (program): inherits dvars in eval or main. + Sun May 17 14:02:56 2009 Nobuyoshi Nakada <nobu@r...> * ruby.c (ruby_script): sets also VM toplevel program name. Index: compile.c =================================================================== --- compile.c (revision 23473) +++ compile.c (revision 23474) @@ -5416,7 +5416,7 @@ int rb_parse_in_eval(void) { - return GET_THREAD()->parse_in_eval != 0; + return GET_THREAD()->parse_in_eval > 0; } int Index: parse.y =================================================================== --- parse.y (revision 23473) +++ parse.y (revision 23474) @@ -760,14 +760,15 @@ program : { lex_state = EXPR_BEG; /*%%%*/ - local_push(compile_for_eval); + $<num>$ = compile_for_eval || rb_parse_in_main(); + local_push($<num>$); /*% %*/ } compstmt { /*%%%*/ - if ($2 && !compile_for_eval) { + if ($2 && !$<num>1) { /* last expression should not be void */ if (nd_type($2) != NODE_BLOCK) void_expr($2); else { @@ -4993,7 +4994,7 @@ NODE *tree; struct parser_params *parser = (struct parser_params *)arg; - if ((!compile_for_eval || rb_parse_in_main()) && rb_safe_level() == 0) { + if (!compile_for_eval && rb_safe_level() == 0) { ruby_debug_lines = debug_lines(ruby_sourcefile); if (ruby_debug_lines && ruby_sourceline > 0) { VALUE str = STR_NEW0(); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/