merges r21571 from trunk into ruby_1_9_1.

* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 21 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 49fd56fdbf..6cd7449faa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Fri Jan 16 01:09:37 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* 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]
+
 Fri Jan 16 00:57:34 2009  Koichi Sasada  <ko1@atdot.net>
 
 	* lib/debug.rb: as wanabe-san pointed out,
diff --git a/compile.c b/compile.c
index f459eb3cdc..205ebafa5c 100644
--- a/compile.c
+++ b/compile.c
@@ -5350,3 +5350,9 @@ rb_parse_in_eval(void)
 {
     return GET_THREAD()->parse_in_eval != 0;
 }
+
+int
+rb_parse_in_main(void)
+{
+    return GET_THREAD()->parse_in_eval < 0;
+}
diff --git a/parse.y b/parse.y
index c166fdd649..b014a46c1d 100644
--- a/parse.y
+++ b/parse.y
@@ -437,6 +437,7 @@ static void fixup_nodes(NODE **);
 extern int rb_dvar_defined(ID);
 extern int rb_local_defined(ID);
 extern int rb_parse_in_eval(void);
+extern int rb_prase_in_main(void);
 
 static VALUE reg_compile_gen(struct parser_params*, VALUE, int);
 #define reg_compile(str,options) reg_compile_gen(parser, str, options)
@@ -4977,7 +4978,7 @@ yycompile0(VALUE arg, int tracing)
     NODE *tree;
     struct parser_params *parser = (struct parser_params *)arg;
 
-    if (!compile_for_eval && rb_safe_level() == 0) {
+    if ((!compile_for_eval || rb_parse_in_main()) && rb_safe_level() == 0) {
 	ruby_debug_lines = debug_lines(ruby_sourcefile);
 	if (ruby_debug_lines && ruby_sourceline > 0) {
 	    VALUE str = STR_NEW0();
diff --git a/ruby.c b/ruby.c
index 92d2a6217f..03daaf5c6f 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1319,10 +1319,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)