From b003bcf976a340dba85120aafcb50ebba179d3ba Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 28 Dec 2008 09:40:56 +0000 Subject: merges r21089 from trunk into ruby_1_9_1. * ruby.c (process_options): fix to untouch th->mild_compile_error. [ruby-dev:37621], [ruby-dev:37620] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21119 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ruby.c | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d6f8c9398..a20310c38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 27 15:02:38 2008 Koichi Sasada + + * ruby.c (process_options): fix to untouch th->mild_compile_error. + [ruby-dev:37621], [ruby-dev:37620] + Sat Dec 27 14:48:26 2008 Koichi Sasada * iseq.h, iseq.c (rb_iseq_new_main): add a type ISEQ_TYPE_MAIN. diff --git a/ruby.c b/ruby.c index 8b6cc4cb9..e9bd38e91 100644 --- a/ruby.c +++ b/ruby.c @@ -1314,7 +1314,6 @@ process_options(VALUE arg) GetEnvPtr(bind->env, env); th->parse_in_eval++; - th->mild_compile_error++; } if (opt->e_script) { @@ -1377,7 +1376,6 @@ process_options(VALUE arg) iseq = rb_iseq_new_main(tree, opt->script_name); th->parse_in_eval--; - th->mild_compile_error--; th->base_block = 0; if (opt->dump & DUMP_BIT(insns)) { -- cgit