* eval.c (Init_load): make $LOADED_FEATURES built-in. [ruby-dev:23299]

* ruby.c (ruby_prog_init): make $PROGRAM_NAME built-in.
* lib/English.rb: remove $LOADED_FEATURES and $PROGRAM_NAME.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 11 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 4ac6dd82ec..dd95354806 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Apr  2 11:36:20 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* eval.c (Init_load): make $LOADED_FEATURES built-in.
+	  [ruby-dev:23299]
+
+	* ruby.c (ruby_prog_init): make $PROGRAM_NAME built-in.
+
+	* lib/English.rb: remove $LOADED_FEATURES and $PROGRAM_NAME.
+
 Fri Apr  2 07:31:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/socket/socket.c: mistakingly removed do_not_reverse_lookup.
diff --git a/eval.c b/eval.c
index 7d3342f5a2..d4f9cb8b38 100644
--- a/eval.c
+++ b/eval.c
@@ -7643,6 +7643,7 @@ Init_load()
 
     rb_features = rb_ary_new();
     rb_define_readonly_variable("$\"", &rb_features);
+    rb_define_readonly_variable("$LOADED_FEATURES", &rb_features);
 
     rb_define_global_function("load", rb_f_load, -1);
     rb_define_global_function("require", rb_f_require, 1);
diff --git a/lib/English.rb b/lib/English.rb
index 4b859d96f6..1a0e11de74 100644
--- a/lib/English.rb
+++ b/lib/English.rb
@@ -24,9 +24,6 @@ alias $ERROR_INFO              $!
 # exception. <tt>See Kernel.caller</tt> for details. Thread local.
 alias $ERROR_POSITION          $@
 
-# An array containing the filenames of modules loaded by +require+.
-alias $LOADED_FEATURES         $"
-
 # The default separator pattern used by <tt>String.split</tt>.  May be
 # set from the command line using the <tt>-F</tt> flag.
 alias $FS                      $;
@@ -130,12 +127,6 @@ alias $LAST_MATCH_INFO         $~
 # string hash values will be case insensitive. Deprecated
 alias $IGNORECASE              $=
 
-# The name of the top-level Ruby program being executed.  Typically
-# this will be the program's filename. On some operating systems,
-# assigning to this variable will change the name of the process
-# reported (for example) by the <tt>ps(1)</tt> command.
-alias $PROGRAM_NAME            $0
-
 # An array of strings containing the command-line
 # options from the invocation of the program. Options
 # used by the Ruby interpreter will have been
diff --git a/ruby.c b/ruby.c
index fc727d188e..3e46c4a911 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1081,6 +1081,7 @@ ruby_prog_init()
     rb_define_readonly_variable("$-l", &do_line);
 
     rb_define_hooked_variable("$0", &rb_progname, 0, set_arg0);
+    rb_define_hooked_variable("$PROGRAM_NAME", &rb_progname, 0, set_arg0);
 
     rb_argv = rb_ary_new();
     rb_define_readonly_variable("$*", &rb_argv);