From d990d38aac9e12795458528b287c05f0e1fcabd5 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 21 Jun 2009 14:41:36 +0000 Subject: merges r23809 from trunk into ruby_1_9_1. -- * load.c (Init_load): $: must be readonly. [ruby-dev:38690] * ruby.c (ruby_prog_init): $-W must be readonly. [ruby-dev:38691] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ load.c | 2 +- ruby.c | 2 +- version.h | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5fcf562ed0..2602f6b18b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jun 21 22:33:05 2009 Yusuke Endoh + + * load.c (Init_load): $: must be readonly. [ruby-dev:38690] + + * ruby.c (ruby_prog_init): $-W must be readonly. [ruby-dev:38691] + Sun Jun 21 10:47:21 2009 Nobuyoshi Nakada * lib/fileutils.rb (FileUtils::Entry_#copy_file): open with diff --git a/load.c b/load.c index 516e3b8bff..a588a5c1fa 100644 --- a/load.c +++ b/load.c @@ -704,7 +704,7 @@ Init_load() static const char var_load_path[] = "$:"; ID id_load_path = rb_intern2(var_load_path, sizeof(var_load_path)-1); - rb_define_hooked_variable(var_load_path, (VALUE*)vm, load_path_getter, 0); + rb_define_hooked_variable(var_load_path, (VALUE*)vm, load_path_getter, rb_gvar_readonly_setter); rb_alias_variable(rb_intern("$-I"), id_load_path); rb_alias_variable(rb_intern("$LOAD_PATH"), id_load_path); vm->load_path = rb_ary_new(); diff --git a/ruby.c b/ruby.c index 3392c74685..c6cfdf7e16 100644 --- a/ruby.c +++ b/ruby.c @@ -1763,7 +1763,7 @@ ruby_prog_init(void) rb_define_hooked_variable("$VERBOSE", &ruby_verbose, 0, verbose_setter); rb_define_hooked_variable("$-v", &ruby_verbose, 0, verbose_setter); rb_define_hooked_variable("$-w", &ruby_verbose, 0, verbose_setter); - rb_define_hooked_variable("$-W", &ruby_verbose, opt_W_getter, 0); + rb_define_hooked_variable("$-W", &ruby_verbose, opt_W_getter, rb_gvar_readonly_setter); rb_define_variable("$DEBUG", &ruby_debug); rb_define_variable("$-d", &ruby_debug); diff --git a/version.h b/version.h index 336679dbe2..d60dda6c8f 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-05-22" -#define RUBY_PATCHLEVEL 199 +#define RUBY_PATCHLEVEL 200 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3