From c2e4f4f6bdd3e7f44f10399b235c013f7b5516cc Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 22 May 2009 09:49:28 +0000 Subject: merges r23474 from trunk into ruby_1_9_1. -- * 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. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index 7be492a69..6596bf8af 100644 --- a/parse.y +++ b/parse.y @@ -765,14 +765,15 @@ static void token_info_pop(struct parser_params*, const char *token); program : { lex_state = EXPR_BEG; /*%%%*/ - local_push(compile_for_eval); + $$ = compile_for_eval || rb_parse_in_main(); + local_push($$); /*% %*/ } top_compstmt { /*%%%*/ - if ($2 && !compile_for_eval) { + if ($2 && !$1) { /* last expression should not be void */ if (nd_type($2) != NODE_BLOCK) void_expr($2); else { @@ -5024,7 +5025,7 @@ yycompile0(VALUE arg, int tracing) 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(); -- cgit