From d2fbacfcf976a58e545c91d740b102048c67fc7b Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 26 Feb 2001 05:29:06 +0000
Subject: * 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: http://svn.ruby-lang.org/repos/ruby/trunk@1219 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/Env.rb       | 14 +-------------
 lib/README       |  1 -
 lib/importenv.rb |  1 -
 lib/mkmf.rb      |  3 +++
 4 files changed, 4 insertions(+), 15 deletions(-)

(limited to 'lib')

diff --git a/lib/Env.rb b/lib/Env.rb
index 7101b84c9..452a28659 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 de6a43af0..aa031c048 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 586f37661..435d6f972 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 0f0479416..4eb77a9b1 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
 
-- 
cgit