summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-02-28 13:47:48 +0000
committerkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-02-28 13:47:48 +0000
commit64040f2daa1ab5c3525f5050e14c65d1b2e5f7f7 (patch)
tree03254f09ffab2771a707b889dc6b00026849cb5f /lib
parenta2bd4d594df404218cb6e93beb07439bf4f42038 (diff)
* 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
Diffstat (limited to 'lib')
-rw-r--r--lib/irb/ruby-lex.rb10
1 files changed, 5 insertions, 5 deletions
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) == "\\" #"