From 0ecd958d9701b2ef97d408c1d12f43923300e854 Mon Sep 17 00:00:00 2001
From: ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 28 Feb 2006 15:21:24 +0000
Subject: * lib/rdoc/parsers/parse_rb.rb (read_escape): could not handle /\^/. 
  merged Mr. Ishizuka's lib/irb/ruby-lex.rb 's patch rev 1.29.  
 [ruby-talk:181631] [ruby-dev:28404]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10004 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/parsers/parse_rb.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/rdoc')

diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
index d894125730..fedc67e51f 100644
--- a/lib/rdoc/parsers/parse_rb.rb
+++ b/lib/rdoc/parsers/parse_rb.rb
@@ -560,7 +560,7 @@ class RubyLex
     "q" => "\'",
     "Q" => "\"",
     "x" => "\`",
-    "r" => "\/",
+    "r" => "/",
     "w" => "]"
   }
   
@@ -575,7 +575,7 @@ class RubyLex
     "\'" => TkSTRING,
     "\"" => TkSTRING,
     "\`" => TkXSTRING,
-    "\/" => TkREGEXP,
+    "/" => TkREGEXP,
     "]" => TkDSTRING
   }
   Ltype2Token.default = TkSTRING
@@ -583,7 +583,7 @@ class RubyLex
   DLtype2Token = {
     "\"" => TkDSTRING,
     "\`" => TkDXSTRING,
-    "\/" => TkDREGEXP,
+    "/" => TkDREGEXP,
   }
 
   def lex_init()
@@ -1334,7 +1334,7 @@ class RubyLex
 	end
       end
 
-    when "C", "c", "^"
+    when "C", "c" #, "^"
       res << ch
       if ch == "C" and (ch = getc) != "-"
 	ungetc
-- 
cgit v1.2.3