[前][次][番号順一覧][スレッド一覧]

ruby-changes:12137

From: yugui <ko1@a...>
Date: Sun, 21 Jun 2009 23:41:59 +0900 (JST)
Subject: [ruby-changes:12137] Ruby:r23810 (ruby_1_9_1): merges r23809 from trunk into ruby_1_9_1.

yugui	2009-06-21 23:41:36 +0900 (Sun, 21 Jun 2009)

  New Revision: 23810

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23810

  Log:
    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]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/load.c
    branches/ruby_1_9_1/ruby.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23809)
+++ ruby_1_9_1/ChangeLog	(revision 23810)
@@ -1,3 +1,9 @@
+Sun Jun 21 22:33:05 2009  Yusuke Endoh  <mame@t...>
+
+	* 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@r...>
 
 	* lib/fileutils.rb (FileUtils::Entry_#copy_file): open with
Index: ruby_1_9_1/load.c
===================================================================
--- ruby_1_9_1/load.c	(revision 23809)
+++ ruby_1_9_1/load.c	(revision 23810)
@@ -704,7 +704,7 @@
     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();
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23809)
+++ ruby_1_9_1/version.h	(revision 23810)
@@ -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
Index: ruby_1_9_1/ruby.c
===================================================================
--- ruby_1_9_1/ruby.c	(revision 23809)
+++ ruby_1_9_1/ruby.c	(revision 23810)
@@ -1763,7 +1763,7 @@
     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);
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]