summaryrefslogtreecommitdiffstats
path: root/ruby.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 16:14:43 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 16:14:43 +0000
commite17e71c37f8cf5fef8ff56d354c7f81357a6dce1 (patch)
treefb97ed29bb2bc99c6a23ddd9f7599ea410453190 /ruby.c
parent4decaa2678de2ac9c0de10565f62fe6063d7cc57 (diff)
downloadruby-e17e71c37f8cf5fef8ff56d354c7f81357a6dce1.tar.gz
ruby-e17e71c37f8cf5fef8ff56d354c7f81357a6dce1.tar.xz
ruby-e17e71c37f8cf5fef8ff56d354c7f81357a6dce1.zip
* ruby.c (process_options): decrement parse_in_eval to recognize
parsing main or normal eval script. * compile.c (rb_parse_in_main): return 1 if parsing main script. (if parse_in_eval is negative value, it means main script) * parse.y (yycompile0): check rb_parse_in_main() to accumulate script text. Bug #848 [ruby-core:20450] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21571 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r--ruby.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ruby.c b/ruby.c
index 461a4f2db..c64a7608e 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1343,10 +1343,10 @@ process_options(VALUE arg)
}
#define PREPARE_PARSE_MAIN(expr) do { \
- th->parse_in_eval++; \
+ th->parse_in_eval--; \
th->base_block = &env->block; \
expr; \
- th->parse_in_eval--; \
+ th->parse_in_eval++; \
th->base_block = 0; \
} while (0)