aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/irb/ruby-lex.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f19050a46..ba781632de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 3 07:47:25 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/irb/ruby-lex.rb (RubyLex#identify_string): parse multiple
+ regex options. a patch from Heesob Park in [ruby-core:32988].
+
Wed Nov 3 07:33:57 2010 Tanaka Akira <akr@fsij.org>
* vm_method.c (rb_clear_cache_by_class): just return if the class has
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index 72600289b8..9befc5471e 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -1068,7 +1068,7 @@ class RubyLex
end
end
if @ltype == "/"
- if peek(0) =~ /i|m|x|o|e|s|u|n/
+ while peek(0) =~ /i|m|x|o|e|s|u|n/
getc
end
end