From 26f897ab9b2670707ec8100786219eca7641b87e Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 8 Feb 2001 09:19:27 +0000
Subject: * parse.y (parse_quotedwords): %w should allow parenthesis escape.

* parse.y (parse_qstring): %q should allow terminator escape.

* re.c (rb_reg_options): new method to give an option values.

* parse.y (cond0): disable special treating of integer literal in
  conditional unless option -e is supplied.  changes current
  behavior.  experimental.

* parse.y (cond0): give warning for string/integer literals and
  dot operators in conditionals unless option -e is supplied.

* re.c (rb_reg_equal): all option flags should be same to be equal.

* error.c (Init_Exception): make Interrupt a subclass of
  SignalException.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/importenv.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/importenv.rb b/lib/importenv.rb
index fcf306a9a..abf1c306e 100644
--- a/lib/importenv.rb
+++ b/lib/importenv.rb
@@ -9,11 +9,12 @@
 
 for k,v in ENV
   next unless /^[a-zA-Z][_a-zA-Z0-9]*/ =~ k
+  v = v.gsub(/\\/) {|s| '\\'+s}
   eval <<EOS
-  $#{k} = %q!#{v}!
+  $#{k} = %q\0#{v}\0
   trace_var "$#{k}", proc{|v|
-    ENV[%q!#{k}!] = v; 
-    $#{k} = %q!#{v}!
+    ENV[%q!#{k}!] = v
+    $#{k} = v
     if v == nil
       untrace_var "$#{k}"
     end
-- 
cgit