diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-02 05:44:41 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-02 05:44:41 +0000 |
commit | 123313e205dd17b51d6321007ede2dc56e6d8126 (patch) | |
tree | 7dfe3137bcfcf396a56bdd5814072b69fe3a1ff8 | |
parent | 9c54107903180c0a99a7af8d9297cfe2e3ad8e1e (diff) | |
download | ruby-123313e205dd17b51d6321007ede2dc56e6d8126.tar.gz |
parse.y: use nd_tag
* parse.y (regexp): set_yylval_num sets u1, should use nd_tag
instead of nd_state. [ruby-core:72638] [Bug #11932]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53411 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | parse.y | 2 | ||||
-rw-r--r-- | test/ripper/test_files.rb | 4 | ||||
-rw-r--r-- | test/ripper/test_ripper.rb | 11 |
4 files changed, 24 insertions, 3 deletions
@@ -1,3 +1,13 @@ +Sat Jan 2 14:44:31 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] + +Sat Jan 2 11:11:01 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] + Sat Jan 2 02:27:22 2016 Marc-Andre Lafortune <ruby-core@marc-andre.ca> * lib/ostruct.rb: Fix case of frozen object with initializer. @@ -4042,7 +4042,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 |