summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-21 13:35:41 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-21 13:35:41 +0000
commit5d30ddec179c9c3174a2266c4ce1c91093c931ee (patch)
treeda8fb0366aaba910d4421b2b5a94784d0d91d81b
parenta02b33742cc3c6fb134737636f7df951b14e9338 (diff)
* 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/trunk@23809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--load.c2
-rw-r--r--ruby.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7adf1f79d7..a4ee56d48c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun 21 22:33:05 2009 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * 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 <nobu@ruby-lang.org>
* lib/fileutils.rb (FileUtils::Entry_#copy_file): open with
diff --git a/load.c b/load.c
index addfe46934..2832e884c1 100644
--- a/load.c
+++ b/load.c
@@ -716,7 +716,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 3188b7135b..2afedf9a0d 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1803,7 +1803,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);