merge revision(s) 53411,53425: [Backport #11932]

	* parse.y (regexp): set_yylval_num sets u1, should use nd_tag
	  instead of nd_state.  [ruby-core:72638] [Bug #11932]

	* parse.y (set_yylval_num): should be used as nd_state, set to u3.
	  [ruby-core:72638] [Bug #11932]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 25 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 371854166b..38fdc24a7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Mar 29 13:31:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (regexp): set_yylval_num sets u1, should use nd_tag
+	  instead of nd_state.  [ruby-core:72638] [Bug #11932]
+
+Tue Mar 29 13:31:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (set_yylval_num): should be used as nd_state, set to u3.
+	  [ruby-core:72638] [Bug #11932]
+
 Tue Mar 29 13:26:15 2016  Joseph Tibbertsma  <josephtibbertsma@gmail.com>
 
 	* gc.c (RVALUE_PAGE_WB_UNPROTECTED): fix a typo of argument name.
diff --git a/parse.y b/parse.y
index fdb84f8512..03dcbaa404 100644
--- a/parse.y
+++ b/parse.y
@@ -4037,7 +4037,7 @@ regexp		: tREGEXP_BEG regexp_contents tREGEXP_END
 			}
 			if (ripper_is_node_yylval(opt)) {
 			    $3 = RNODE(opt)->nd_rval;
-			    options = (int)RNODE(opt)->nd_state;
+			    options = (int)RNODE(opt)->nd_tag;
 			}
 			if (src && NIL_P(rb_parser_reg_compile(parser, src, options, &err))) {
 			    compile_error(PARSER_ARG "%"PRIsVALUE, err);
diff --git a/test/ripper/test_files.rb b/test/ripper/test_files.rb
index 7b5fa1dc6c..88222cf87d 100644
--- a/test/ripper/test_files.rb
+++ b/test/ripper/test_files.rb
@@ -7,14 +7,14 @@ class TestRipper::Generic < Test::Unit::TestCase
     srcdir = File.expand_path("../../..", __FILE__)
     assert_separately(%W[--disable-gem -rripper - #{srcdir}],
                       __FILE__, __LINE__, <<-'eom', timeout: Float::INFINITY)
-      TEST_RATIO = 0.05 # testing all files needs too long time...
+      TEST_RATIO = ENV["TEST_RIPPER_RATIO"]&.tap {|s|break s.to_f} || 0.05 # testing all files needs too long time...
       class Parser < Ripper
         PARSER_EVENTS.each {|n| eval "def on_#{n}(*args) r = [:#{n}, *args]; r.inspect; Object.new end" }
         SCANNER_EVENTS.each {|n| eval "def on_#{n}(*args) r = [:#{n}, *args]; r.inspect; Object.new end" }
       end
       dir = ARGV.shift
       for script in Dir["#{dir}/{lib,sample,ext,test}/**/*.rb"].sort
-        next if TEST_RATIO < rand
+        next if TEST_RATIO and TEST_RATIO < rand
         assert_nothing_raised("ripper failed to parse: #{script.inspect}") {
           Parser.new(File.read(script), script).parse
         }
diff --git a/test/ripper/test_ripper.rb b/test/ripper/test_ripper.rb
index e0b65a04d8..7631b91042 100644
--- a/test/ripper/test_ripper.rb
+++ b/test/ripper/test_ripper.rb
@@ -61,4 +61,15 @@ class TestRipper::Ripper < Test::Unit::TestCase
     assert_predicate @ripper, :yydebug
   end
 
+  def test_regexp_with_option
+    bug11932 = '[ruby-core:72638] [Bug #11932]'
+    src = '/[\xC0-\xF0]/u'.force_encoding(Encoding::UTF_8)
+    ripper = Ripper.new(src)
+    ripper.parse
+    assert_predicate(ripper, :error?)
+    src = '/[\xC0-\xF0]/n'.force_encoding(Encoding::UTF_8)
+    ripper = Ripper.new(src)
+    ripper.parse
+    assert_not_predicate(ripper, :error?, bug11932)
+  end
 end if ripper_test
diff --git a/version.h b/version.h
index 9d60eda79b..fc82cad733 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.3.0"
 #define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 8
+#define RUBY_PATCHLEVEL 9
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3