diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-02-26 05:29:06 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-02-26 05:29:06 +0000 |
| commit | df2d69b49ab1c8b42dd6c18fb63df26aec95f364 (patch) | |
| tree | f352837db7633a5d6355461ca14f0f870d951e86 /lib | |
| parent | 69739b14a5f8950c1da8b86f90a70903ed975fee (diff) | |
* eval.c (proc_call): should not modify ruby_block->frame.iter
based on ruby_frame->iter altered by PUSH_ITER().
* eval.c (rb_thread_fd_close): should save current context before
raising exception.
* io.c (set_stdin): preserve original stdin.
* io.c (set_outfile): preserve original stdout/stderr.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1219 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Env.rb | 14 | ||||
| -rw-r--r-- | lib/README | 1 | ||||
| -rw-r--r-- | lib/importenv.rb | 1 | ||||
| -rw-r--r-- | lib/mkmf.rb | 3 |
4 files changed, 4 insertions, 15 deletions
diff --git a/lib/Env.rb b/lib/Env.rb index 7101b84c91..452a28659e 100644 --- a/lib/Env.rb +++ b/lib/Env.rb @@ -6,19 +6,7 @@ # $USER = "matz" # p ENV["USER"] -for k,v in ENV - next unless /^[a-zA-Z][_a-zA-Z0-9]*/ =~ k - eval <<EOS - $#{k} = %q!#{v}! - trace_var "$#{k}", proc{|v| - ENV[%q!#{k}!] = v; - $#{k} = %q!#{v}! - if v == nil - untrace_var "$#{k}" - end - } -EOS -end +require 'importenv' if __FILE__ == $0 p $TERM diff --git a/lib/README b/lib/README index de6a43af09..aa031c0481 100644 --- a/lib/README +++ b/lib/README @@ -35,7 +35,6 @@ profile.rb ruby profiler pstore.rb persistent object strage using marshal rational.rb rational number support readbytes.rb define IO#readbytes -shell.rb shell like operation under Ruby (imcomplete) shellwords.rb split into words like shell singleton.rb singleton design pattern library sync.rb 2 phase lock diff --git a/lib/importenv.rb b/lib/importenv.rb index 586f37661b..435d6f972a 100644 --- a/lib/importenv.rb +++ b/lib/importenv.rb @@ -29,4 +29,3 @@ if __FILE__ == $0 $TERM = "foo" p ENV["TERM"] end - diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 0f04794162..4eb77a9b13 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -503,6 +503,9 @@ EOMF .c.#{$OBJEXT}: $(CC) $(CFLAGS) $(CPPFLAGS) -c $(subst /,\\\\,$<) + +.cc.#{$OBJEXT} .cpp.#{$OBJEXT} .cxx.#{$OBJEXT} .C.#{$OBJEXT}: + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(subst /,\\\\,$<) " end |