diff options
author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-02-28 15:27:24 +0000 |
---|---|---|
committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-02-28 15:27:24 +0000 |
commit | 0c344f2b596665c376aa5ae552dc7302245430e9 (patch) | |
tree | 1421e5685e0e446aa9ec38eb2d57e6600650cc7a | |
parent | 3e7bfa08512df42de03cf88b2ae3202ba73fd9ed (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/branches/ruby_1_8@10005 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:24:31 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> + + * 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] + Tue Feb 28 09:32:17 2006 NAKAMURA Usaku <usa@ruby-lang.org> * lib/drb/extservm.rb (invoke_service_command): cannot invoke command diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb index 6df63c551f..3406f70538 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 |