From 4288624c7db1fe0143ccbfb0ac60ea261c35a62b Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 11 Aug 2011 00:38:19 +0000 Subject: [PATCH] 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 --- ChangeLog | 4 ++++ lib/irb/ruby-lex.rb | 2 +- version.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f66ad5c678..97de5d2e02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jun 28 21:44:58 2011 Keiju Ishitsuka + + * lib/irb/ruby-lex.rb: recognize '\char' in ruby statement. + Tue Jun 28 20:39:29 2011 Hiroshi Nakamura * 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 diff --git a/version.h b/version.h index 563c94dbb4..625626dd32 100644 --- a/version.h +++ b/version.h @@ -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