From 64040f2daa1ab5c3525f5050e14c65d1b2e5f7f7 Mon Sep 17 00:00:00 2001
From: keiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 28 Feb 2006 13:47:48 +0000
Subject: 	* lib/irb/ruby-lex.rb: fixed that irb can't parse /\^/.
 [ruby-dev:28404] and
 http://rubyforge.org/tracker/index.php?func=detail&aid=3302&group_id=426&atid=1698
 	* lib/irb/ruby-lex.rb: support "\s" in irb.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/irb/ruby-lex.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index 8068d1c8bb..c9b9f10392 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -309,7 +309,7 @@ class RubyLex
     "q" => "\'",
     "Q" => "\"",
     "x" => "\`",
-    "r" => "\/",
+    "r" => "/",
     "w" => "]",
     "W" => "]",
     "s" => ":"
@@ -326,14 +326,14 @@ class RubyLex
     "\'" => TkSTRING,
     "\"" => TkSTRING,
     "\`" => TkXSTRING,
-    "\/" => TkREGEXP,
+    "/" => TkREGEXP,
     "]" => TkDSTRING,
     ":" => TkSYMBOL
   }
   DLtype2Token = {
     "\"" => TkDSTRING,
     "\`" => TkDXSTRING,
-    "\/" => TkDREGEXP,
+    "/" => TkDREGEXP,
   }
 
   def lex_init()
@@ -1087,7 +1087,7 @@ class RubyLex
   def read_escape
     case ch = getc
     when "\n", "\r", "\f"
-    when "\\", "n", "t", "r", "f", "v", "a", "e", "b" #"
+    when "\\", "n", "t", "r", "f", "v", "a", "e", "b", "s" #"
     when /[0-7]/
       ungetc ch
       3.times do
@@ -1122,7 +1122,7 @@ class RubyLex
 	end
       end
 
-    when "C", "c", "^"
+    when "C", "c" #, "^"
       if ch == "C" and (ch = getc) != "-"
 	ungetc
       elsif (ch = getc) == "\\" #"
-- 
cgit v1.2.3