summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-05 03:08:16 +0000
committerkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-05 03:08:16 +0000
commit0894e9ea69b9501f604c9cdee03cf5d4dea4bb60 (patch)
tree02855fe753f08d2df7b79b8fdd3fcd1bc57128f0
parent30d3d7f6412336252b1e876ddf23d66b053d9119 (diff)
downloadruby-0894e9ea69b9501f604c9cdee03cf5d4dea4bb60.tar.gz
ruby-0894e9ea69b9501f604c9cdee03cf5d4dea4bb60.tar.xz
ruby-0894e9ea69b9501f604c9cdee03cf5d4dea4bb60.zip
* lib/irb/ruby-lex.rb, lib/irb/ruby-token.rb: support %s-notation for irb.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4322 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/irb/ruby-lex.rb6
-rw-r--r--lib/irb/ruby-token.rb1
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index 2dd2b7b34..5a005e596 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -301,7 +301,8 @@ class RubyLex
"x" => "\`",
"r" => "\/",
"w" => "]",
- "W" => "]"
+ "W" => "]",
+ "s" => ":"
}
PERCENT_PAREN = {
@@ -316,7 +317,8 @@ class RubyLex
"\"" => TkSTRING,
"\`" => TkXSTRING,
"\/" => TkREGEXP,
- "]" => TkDSTRING
+ "]" => TkDSTRING,
+ ":" => TkSYMBOL
}
DLtype2Token = {
"\"" => TkDSTRING,
diff --git a/lib/irb/ruby-token.rb b/lib/irb/ruby-token.rb
index 55c1bd11f..49b97e9c5 100644
--- a/lib/irb/ruby-token.rb
+++ b/lib/irb/ruby-token.rb
@@ -164,6 +164,7 @@ module RubyToken
[:TkSTRING, TkVal],
[:TkXSTRING, TkVal],
[:TkREGEXP, TkVal],
+ [:TkSYMBOL, TkVal],
[:TkDSTRING, TkNode],
[:TkDXSTRING, TkNode],