1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
ocean 2006-02-28 15:21:24 +00:00
parent e54adb7d1d
commit 0ecd958d97
2 changed files with 10 additions and 4 deletions

View file

@ -1,3 +1,9 @@
Wed Mar 1 00:15:51 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]
Fri Feb 24 20:21:38 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> Fri Feb 24 20:21:38 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* test/drb/drbtest.rb (add_service_command): quote pathnames in the * test/drb/drbtest.rb (add_service_command): quote pathnames in the

View file

@ -560,7 +560,7 @@ class RubyLex
"q" => "\'", "q" => "\'",
"Q" => "\"", "Q" => "\"",
"x" => "\`", "x" => "\`",
"r" => "\/", "r" => "/",
"w" => "]" "w" => "]"
} }
@ -575,7 +575,7 @@ class RubyLex
"\'" => TkSTRING, "\'" => TkSTRING,
"\"" => TkSTRING, "\"" => TkSTRING,
"\`" => TkXSTRING, "\`" => TkXSTRING,
"\/" => TkREGEXP, "/" => TkREGEXP,
"]" => TkDSTRING "]" => TkDSTRING
} }
Ltype2Token.default = TkSTRING Ltype2Token.default = TkSTRING
@ -583,7 +583,7 @@ class RubyLex
DLtype2Token = { DLtype2Token = {
"\"" => TkDSTRING, "\"" => TkDSTRING,
"\`" => TkDXSTRING, "\`" => TkDXSTRING,
"\/" => TkDREGEXP, "/" => TkDREGEXP,
} }
def lex_init() def lex_init()
@ -1334,7 +1334,7 @@ class RubyLex
end end
end end
when "C", "c", "^" when "C", "c" #, "^"
res << ch res << ch
if ch == "C" and (ch = getc) != "-" if ch == "C" and (ch = getc) != "-"
ungetc ungetc