diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-11 00:38:19 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-11 00:38:19 +0000 |
commit | 4288624c7db1fe0143ccbfb0ac60ea261c35a62b (patch) | |
tree | f8ab0cceaec8aa46d709fc5bae44f87389c2f360 | |
parent | dede45a5a45316029506cdbb9c017ed04a8489f8 (diff) |
merges r32272 from trunk into ruby_1_9_2.
--
* lib/irb/ruby-lex.rb: recognize '\char' in ruby statement.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | lib/irb/ruby-lex.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Tue Jun 28 21:44:58 2011 Keiju Ishitsuka <keiju@ishitsuka.com> + + * lib/irb/ruby-lex.rb: recognize '\char' in ruby statement. + Tue Jun 28 20:39:29 2011 Hiroshi Nakamura <nahi@ruby-lang.org> * lib/debug.rb (var_list): Command 'var *' did not work on 1.9(!). diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb index 73c5bff4c5..6a5859111d 100644 --- a/lib/irb/ruby-lex.rb +++ b/lib/irb/ruby-lex.rb @@ -677,7 +677,7 @@ class RubyLex @continue = true Token(TkSPACE) else - ungetc + read_escape Token("\\") end end @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 301 +#define RUBY_PATCHLEVEL 302 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |