diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-17 05:23:10 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-17 05:23:10 +0000 |
commit | f91b0dc811d709b260451809c5e35397e75f6d2d (patch) | |
tree | 81594e8cd8736d46a9a3350511929756e48287f2 /parse.y | |
parent | 589ec2beb565ffae7e387e951539da03a1d0b255 (diff) |
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@23474 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -760,14 +760,15 @@ static void token_info_pop(struct parser_params*, const char *token); 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 @@ 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(); |