diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-27 01:15:56 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-27 01:15:56 +0000 |
commit | 597220ef0c694a74663e064b73605bd48ad7250b (patch) | |
tree | 48abc9258dc50b91ca614b16aec5f20c8acd483b /ruby.c | |
parent | 57363127157b6a697b61f04a3ba205152135538e (diff) | |
download | ruby-597220ef0c694a74663e064b73605bd48ad7250b.tar.gz |
* vm.c (Init_VM): create and define TOPLEVEL_BINDING at first.
* vm.c (vm_set_main_stack, rb_iseq_eval_main): added.
* parse.y (rb_parser_compile_file): fix to check parse_in_eval flag.
* eval.c (ruby_exec_node): use rb_iseq_eval_main()
instead of rb_iseq_eval().
* iseq.c (rb_iseq_new_main), vm_core.h: added.
main script (specified by -e or script name) should be run
under TOPLEVEL_BINDING using Kernel#eval. Above changes
simulate Kernel#eval behaviour. [ruby-dev:37240]
* compile.c (make_name_for_block): skip iseq except block type.
this fix is needed for [ruby-dev:37240], and also fixes
[ruby-dev:35392].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r-- | ruby.c | 24 |
1 files changed, 22 insertions, 2 deletions
@@ -1211,6 +1211,8 @@ process_options(VALUE arg) const char *s; char fbuf[MAXPATHLEN]; int i = proc_options(argc, argv, opt, 0); + rb_thread_t *th = GET_THREAD(); + rb_env_t *env = 0; argc -= i; argv += i; @@ -1327,6 +1329,18 @@ process_options(VALUE arg) ruby_set_argv(argc, argv); process_sflag(opt); + { + /* set eval context */ + VALUE toplevel_binding = rb_const_get(rb_cObject, rb_intern("TOPLEVEL_BINDING")); + rb_binding_t *bind; + + GetBindingPtr(toplevel_binding, bind); + GetEnvPtr(bind->env, env); + + th->parse_in_eval++; + th->mild_compile_error++; + } + if (opt->e_script) { rb_encoding *eenc; if (opt->src.enc.index >= 0) { @@ -1337,12 +1351,16 @@ process_options(VALUE arg) } rb_enc_associate(opt->e_script, eenc); require_libraries(opt); + + th->base_block = &env->block; tree = rb_parser_compile_string(parser, opt->script, opt->e_script, 1); } else { if (opt->script[0] == '-' && !opt->script[1]) { forbid_setid("program input from stdin"); } + + th->base_block = &env->block; tree = load_file(parser, opt->script, 1, opt); } if (opt->dump & DUMP_BIT(yydebug)) return Qtrue; @@ -1382,8 +1400,10 @@ process_options(VALUE arg) rb_define_global_function("chomp", rb_f_chomp, -1); } - iseq = rb_iseq_new_top(tree, rb_str_new2("<main>"), - opt->script_name, Qfalse); + 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)) { rb_io_write(rb_stdout, ruby_iseq_disasm(iseq)); |