archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r23809 from trunk into ruby_1_9_1.

Browse source 
--
* 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
This commit is contained in:
yugui 2009-06-21 14:41:36 +00:00
parent 953138e421
commit d990d38aac
4 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> Sun Jun 21 10:47:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/fileutils.rb (FileUtils::Entry_#copy_file): open with * lib/fileutils.rb (FileUtils::Entry_#copy_file): open with

2
load.c
View file

@ -704,7 +704,7 @@ Init_load()
static const char var_load_path[] = "$:"; static const char var_load_path[] = "$:";
ID id_load_path = rb_intern2(var_load_path, sizeof(var_load_path)-1); 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("$-I"), id_load_path);
rb_alias_variable(rb_intern("$LOAD_PATH"), id_load_path); rb_alias_variable(rb_intern("$LOAD_PATH"), id_load_path);
vm->load_path = rb_ary_new(); vm->load_path = rb_ary_new();

2
ruby.c
View file

@ -1763,7 +1763,7 @@ ruby_prog_init(void)
rb_define_hooked_variable("$VERBOSE", &ruby_verbose, 0, verbose_setter); rb_define_hooked_variable("$VERBOSE", &ruby_verbose, 0, verbose_setter);
rb_define_hooked_variable("$-v", &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, 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("$DEBUG", &ruby_debug);
rb_define_variable("$-d", &ruby_debug); rb_define_variable("$-d", &ruby_debug);

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_RELEASE_DATE "2009-05-22" #define RUBY_RELEASE_DATE "2009-05-22"
#define RUBY_PATCHLEVEL 199 #define RUBY_PATCHLEVEL 200
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1