From ebd866348254f245f6d689ece6781499489aa411 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 21 Mar 2013 07:48:11 +0000
Subject: [PATCH] parse.y: escape all closing parens

* parse.y (simple_re_meta): escape all closing characters, not only
  round parenthesis.  [ruby-core:53578] [Bug #8133]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39858 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                |  5 +++++
 parse.y                  |  2 +-
 test/ruby/test_regexp.rb | 12 +++++++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2858fca612..6407da1ae1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 21 16:48:06 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (simple_re_meta): escape all closing characters, not only
+	  round parenthesis.  [ruby-core:53578] [Bug #8133]
+
 Thu Mar 21 13:50:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm_core.h (UNINITIALIZED_VAR): suppress warnings by clang 4.2.
diff --git a/parse.y b/parse.y
index 62782709f8..7399aa9c25 100644
--- a/parse.y
+++ b/parse.y
@@ -5994,7 +5994,7 @@ simple_re_meta(int c)
     switch (c) {
       case '$': case '*': case '+': case '.':
       case '?': case '^': case '|':
-      case ')':
+      case ')': case ']': case '}': case '>':
 	return TRUE;
       default:
 	return FALSE;
diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb
index 308b30ae9c..46fd4531a0 100644
--- a/test/ruby/test_regexp.rb
+++ b/test/ruby/test_regexp.rb
@@ -180,9 +180,15 @@ class TestRegexp < Test::Unit::TestCase
   end
 
   def test_source_escaped_paren
-    bug7610 = '[ruby-core:51088]'
-    s = '\(a\)'
-    assert_equal(/#{s}/, eval("%r(#{s})"), bug7610)
+    bug7610 = '[ruby-core:51088] [Bug #7610]'
+    bug8133 = '[ruby-core:53578] [Bug #8133]'
+    [
+     ["(", ")", bug7610], ["[", "]", bug8133],
+     ["{", "}", bug8133], ["<", ">", bug8133],
+    ].each do |lparen, rparen, bug|
+      s = "\\#{lparen}a\\#{rparen}"
+      assert_equal(/#{s}/, eval("%r#{lparen}#{s}#{rparen}"), bug)
+    end
   end
 
   def test_source_unescaped