1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ruby.c (ruby_init_prelude): get rid of global namespace

Browse Source 
pullution.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30547 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-01-15 00:48:16 +00:00
parent fea355647e
commit 7350562e5e
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Jan 15 09:48:14 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (ruby_init_prelude): get rid of global namespace
pullution.
Sat Jan 15 09:42:12 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jan 15 09:42:12 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/io.h: missing prototypes. * include/ruby/io.h: missing prototypes.

2
gem_prelude.rb
View File

@ -1 +1 @@
require 'rubygems' unless $disable_rubygems require 'rubygems.rb' if defined?(Gem)

8
ruby.c
View File

@ -1103,9 +1103,8 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
void Init_prelude(void); void Init_prelude(void);
static void static void
ruby_init_prelude(int enable_gems) ruby_init_prelude(void)
{ {
rb_gv_set("$disable_rubygems", enable_gems ? Qfalse : Qtrue);
Init_prelude(); Init_prelude();
rb_const_remove(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX")); rb_const_remove(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX"));
} }
@ -1365,7 +1364,10 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
rb_enc_associate(RARRAY_PTR(load_path)[i], lenc); rb_enc_associate(RARRAY_PTR(load_path)[i], lenc);
} }
} }
ruby_init_prelude(!(opt->disable & DISABLE_BIT(gems))); if (!(opt->disable & DISABLE_BIT(gems))) {
rb_define_module("Gem");
}
ruby_init_prelude();
ruby_set_argv(argc, argv); ruby_set_argv(argc, argv);
process_sflag(&opt->sflag); process_sflag(&opt->sflag);