diff options
| author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-02-28 15:21:24 +0000 |
|---|---|---|
| committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-02-28 15:21:24 +0000 |
| commit | 0ecd958d9701b2ef97d408c1d12f43923300e854 (patch) | |
| tree | 9f41dd5d4018d90eeb66368c1fdc789d0cb97702 | |
| parent | e54adb7d1d472ddcf0be99d7bdf6df508ce73245 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/rdoc/parsers/parse_rb.rb | 8 |
2 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Wed Mar 1 00:15:51 2006 Hirokazu Yamamoto <[email protected]> + + * 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] + Fri Feb 24 20:21:38 2006 Masatoshi SEKI <[email protected]> * test/drb/drbtest.rb (add_service_command): quote pathnames in the 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 |