From 24a82091466f3b522b2ad2c9c0163d84e3e66314 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 24 Mar 1998 06:21:55 +0000 Subject: $: changed git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ eval.c | 1 + lib/delegate.rb | 2 +- ruby.c | 7 ++++--- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9748e3f79c..8a221cd003 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Mar 24 12:50:06 1998 Yukihiro Matsumoto + + * ruby.c (ruby_prog_init): `.' should come last in the load-path. + + * eval.c (Init_eval): `__send__', alias for `send'. + Mon Mar 23 12:44:12 1998 Yukihiro Matsumoto * string.c (str_chomp_bang): now takes rs as an argument. diff --git a/eval.c b/eval.c index 8a4e709d25..80d1069e05 100644 --- a/eval.c +++ b/eval.c @@ -4371,6 +4371,7 @@ Init_eval() rb_define_global_function("global_variables", f_global_variables, 0); rb_define_method(mKernel, "send", f_send, -1); + rb_define_method(mKernel, "__send__", f_send, -1); rb_define_method(mKernel, "instance_eval", obj_instance_eval, 1); rb_define_private_method(cModule, "append_features", mod_append_features, 1); diff --git a/lib/delegate.rb b/lib/delegate.rb index 571bf87510..a9809d046d 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -20,7 +20,7 @@ class Delegator end for method in obj.methods next if preserved.include? method - eval "def self.#{method}(*args); __getobj__.send :#{method}, *args; end" + eval "def self.#{method}(*args); __getobj__.__send__ :#{method}, *args; end" end end diff --git a/ruby.c b/ruby.c index 0b516fce8b..c05154357b 100644 --- a/ruby.c +++ b/ruby.c @@ -685,6 +685,10 @@ ruby_prog_init() rb_define_readonly_variable("$-p", &do_print); rb_define_readonly_variable("$-l", &do_line); + if (rb_safe_level() == 0) { + addpath("."); + } + #if defined(_WIN32) || defined(DJGPP) addpath(ruby_libpath()); #endif @@ -701,9 +705,6 @@ ruby_prog_init() addpath(RUBY_ARCHLIB); #endif addpath(RUBY_LIB); - if (rb_safe_level() == 0) { - addpath("."); - } rb_define_hooked_variable("$0", &rb_progname, 0, set_arg0); -- cgit v1.2.3