* vm_core.h (struct rb_vm_struct): moved ruby_debug, ruby_verbose, and

  rb_progname.

* ruby.c (rb_argv0): no longer used.

* vm.c: getters/setters for ruby_{debug,verbose}.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 7 deletions

diff --git a/ruby.c b/ruby.c
index 5544dc2b75..121ddc6432 100644
--- a/ruby.c
+++ b/ruby.c
@@ -57,9 +57,6 @@
 char *getenv();
 #endif
 
-/* TODO: move to VM */
-VALUE ruby_debug = Qfalse;
-VALUE ruby_verbose = Qfalse;
 VALUE rb_parser_get_yydebug(VALUE);
 VALUE rb_parser_set_yydebug(VALUE, VALUE);
 
@@ -956,8 +953,7 @@ opt_enc_index(VALUE enc_name)
     return i;
 }
 
-VALUE rb_progname;
-VALUE rb_argv0;
+#define rb_progname (GET_VM()->progname)
 
 static VALUE
 process_options(VALUE arg)
@@ -1473,7 +1469,6 @@ ruby_prog_init(void)
     rb_define_hooked_variable("$PROGRAM_NAME", &rb_progname, 0, set_arg0);
 
     rb_define_global_const("ARGV", rb_argv);
-    rb_global_variable(&rb_argv0);
 
 #ifdef MSDOS
     /*
@@ -1529,7 +1524,6 @@ ruby_process_options(int argc, char **argv)
     NODE *tree;
 
     ruby_script(argv[0]);	/* for the time being */
-    rb_argv0 = rb_progname;
     args.argc = argc;
     args.argv = argv;
     args.opt = cmdline_options_init(&opt);