ruby_parser 3.13.0 → 3.13.1

data/test/test_ruby_parser.rb

@@ -30,6 +30,25 @@ module TestRubyParserShared
 
   BLOCK_DUP_MSG = "Both block arg and actual block given."
 
+  def test_bug191
+    pt = s(:if, s(:call, nil, :a), s(:str, ""), s(:call, nil, :b))
+
+    rb = "a ? '': b"
+    assert_parse rb, pt
+
+    rb = "a ? \"\": b"
+    assert_parse rb, pt
+  end
+
+  def test_bug202
+    rb = "$测试 = 1\n测试 = 1"
+    pt = s(:block,
+           s(:gasgn, :$测试, s(:lit, 1)),
+           s(:lasgn, :测试, s(:lit, 1)))
+
+    assert_parse rb, pt
+  end
+
   def test_double_block_error_01
     assert_syntax_error "a(1, &b) { }", BLOCK_DUP_MSG
   end
@@ -499,6 +518,14 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_str_evstr_escape
+    char = [0x00bd].pack("U")
+    rb = "\"a #\{b}\\302\\275\""
+    pt = s(:dstr, "a ", s(:evstr, s(:call, nil, :b)), s(:str, char))
+
+    assert_parse rb, pt
+  end
+
   def test_dsym_to_sym
     pt = s(:alias, s(:lit, :<<), s(:lit, :>>))
 
@@ -525,6 +552,10 @@ module TestRubyParserShared
     # TODO: add more including interpolation etc
   end
 
+  def test_regexp_escape_extended
+    assert_parse '/\“/', s(:lit, /“/)
+  end
+
   def test_label_vs_string
     rb = "_buf << ':\n'"
     pt = s(:call, s(:call, nil, :_buf), :<<, s(:str, ":\n"))
@@ -702,8 +733,6 @@ module TestRubyParserShared
   end
 
   def test_parse_line_dstr_newline
-    skip "dstr line numbers are just gonna be screwed for a while..."
-
     rb = <<-'CODE'
             "a\n#{
             }"
@@ -1259,6 +1288,16 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_lasgn_call_bracket_rescue_arg
+    rb = "a = b(1) rescue 2"
+    pt = s(:lasgn, :a,
+           s(:rescue,
+             s(:call, nil, :b, s(:lit, 1)),
+             s(:resbody, s(:array), s(:lit, 2))))
+
+    assert_parse rb, pt
+  end
+
   def test_call_bang_squiggle
     rb = "1 !~ 2"
     pt = s(:not, s(:call, s(:lit, 1), :=~, s(:lit, 2))) # TODO: check for 1.9+
@@ -1554,6 +1593,20 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_heredoc_bad_hex_escape
+    rb = "s = <<eos\na\\xE9b\neos"
+    pt = s(:lasgn, :s, s(:str, "a\xE9b\n".b))
+
+    assert_parse rb, pt
+  end
+
+  def test_heredoc_bad_oct_escape
+    rb = "s = <<-EOS\na\\247b\ncöd\nEOS\n"
+    pt = s(:lasgn, :s, s(:str, "a\xa7b\nc\xc3\xb6d\n".b))
+
+    assert_parse rb, pt
+  end
+
   def test_masgn_double_paren
     rb = "((a,b))=c" # TODO: blog
     pt = s(:masgn,
@@ -1708,6 +1761,22 @@ module TestRubyParserShared
 
     assert_parse rb, pt
   end
+
+  def test_str_interp_ternary_or_label
+    env = processor.env
+    env[:a] = :lvar
+
+    rb = '"#{a.b? ? ""+a+"": ""}"'
+    pt = s(:dstr,
+           "",
+           s(:evstr,
+             s(:if,
+               s(:call, s(:lvar, :a), :b?),
+               s(:call, s(:call, s(:str, ""), :+, s(:lvar, :a)), :+, s(:str, "")),
+               s(:str, ""))))
+
+    assert_parse rb, pt
+  end
 end
 
 module TestRubyParserShared19Plus
@@ -2537,10 +2606,8 @@ module TestRubyParserShared19Plus
   end
 
   def test_pipe_semicolon
-    skip "not yet"
-
     rb = "a.b do | ; c | end"
-    pt = s(:iter, s(:call, s(:call, nil, :a), :b), 0)
+    pt = s(:iter, s(:call, s(:call, nil, :a), :b), s(:args, s(:shadow, :c)))
 
     assert_parse rb, pt
   end
@@ -2648,10 +2715,13 @@ module TestRubyParserShared19Plus
   end
 
   def test_kill_me5
-    skip "not yet"
-
     rb = "f ->() { g do end }"
-    pt = 42
+    pt = s(:call, nil, :f,
+           s(:iter,
+             s(:call, nil, :lambda),
+             s(:args),
+             s(:iter, s(:call, nil, :g), 0)))
+
 
     assert_parse rb, pt
   end
@@ -2664,8 +2734,6 @@ module TestRubyParserShared19Plus
   end
 
   def test_iter_args_5
-    skip "not yet"
-
     rb = "f { |a, &b| }"
     pt = s(:iter, s(:call, nil, :f), s(:args, :a, :"&b"))
 
@@ -3264,8 +3332,6 @@ module TestRubyParserShared21Plus
   end
 
   def test_parse_line_heredoc_hardnewline
-    skip "not yet"
-
     rb = <<-'CODE'.gsub(/^      /, '')
       <<-EOFOO
       \n\n\n\n\n\n\n\n\n
@@ -3286,6 +3352,13 @@ end
 module TestRubyParserShared22Plus
   include TestRubyParserShared21Plus
 
+  def test_bug_hash_interp_array
+    rp = '{ "#{}": [] }'
+    pt = s(:hash, s(:dsym, "", s(:evstr)), s(:array))
+
+    assert_parse rp, pt
+  end
+
   def test_call_args_assoc_quoted
     pt = s(:call, nil, :x, s(:hash, s(:lit, :k), s(:lit, 42)))
 
@@ -3301,16 +3374,6 @@ module TestRubyParserShared22Plus
     assert_parse rb, pt
   end
 
-  def test_bug191
-    pt = s(:if, s(:call, nil, :a), s(:str, ""), s(:call, nil, :b))
-
-    rb = "a ? '': b"
-    assert_parse rb, pt
-
-    rb = "a ? \"\": b"
-    assert_parse rb, pt
-  end
-
   def test_quoted_symbol_keys
     rb = "{ 'a': :b }"
     pt = s(:hash, s(:lit, :a), s(:lit, :b))
@@ -3329,6 +3392,13 @@ end
 module TestRubyParserShared23Plus
   include TestRubyParserShared22Plus
 
+  def test_bug_215
+    rb = 'undef %s(foo)'
+    pt = s(:undef, s(:lit, :foo))
+
+    assert_parse rb, pt
+  end
+
   def test_safe_call
     rb = "a&.b"
     pt = s(:safe_call, s(:call, nil, :a), :b)
@@ -3406,6 +3476,41 @@ module TestRubyParserShared23Plus
     assert_parse rb, pt
   end
 
+  def test_const_op_asgn_or
+    rb = "X::Y ||= 1"
+    pt = s(:op_asgn_or, s(:colon2, s(:const, :X), :Y), s(:lit, 1))
+
+    assert_parse rb, pt
+  end
+
+  def test_const_2_op_asgn_or2
+    rb = "::X::Y ||= 1"
+    pt = s(:op_asgn_or, s(:colon2, s(:colon3, :X), :Y), s(:lit, 1))
+
+    assert_parse rb, pt
+  end
+
+  def test_const_3_op_asgn_or
+    rb = "::X ||= 1"
+    pt = s(:op_asgn_or, s(:colon3, :X), s(:lit, 1))
+
+    assert_parse rb, pt
+  end
+
+  def test_const_op_asgn_and2
+    rb = "::X &&= 1"
+    pt = s(:op_asgn_and, s(:colon3, :X), s(:lit, 1))
+
+    assert_parse rb, pt
+  end
+
+  def test_const_op_asgn_and1
+    rb = "::X &= 1"
+    pt = s(:op_asgn, s(:colon3, :X), :"&", s(:lit, 1))
+
+    assert_parse rb, pt
+  end
+
   def test_ruby21_numbers
     rb = "[1i, 2r, 3ri]"
     pt = s(:array, s(:lit, Complex(0, 1)), s(:lit, Rational(2)), s(:lit, Complex(0, Rational(3))))
@@ -3468,7 +3573,15 @@ end
 module TestRubyParserShared24Plus
   include TestRubyParserShared23Plus
 
-  # ...version specific tests to go here...
+  def test_lasgn_call_nobracket_rescue_arg
+    rb = "a = b 1 rescue 2"
+    pt = s(:lasgn, :a,
+           s(:rescue,
+             s(:call, nil, :b, s(:lit, 1)),
+             s(:resbody, s(:array), s(:lit, 2))))
+
+    assert_parse rb, pt
+  end
 end
 
 module TestRubyParserShared25Plus
@@ -3591,7 +3704,11 @@ class RubyParserTestCase < ParseTreeTestCase
       end
     end
 
-    assert_equal emsg, e.message
+    if Regexp === emsg then
+      assert_match emsg, e.message
+    else
+      assert_equal emsg, e.message
+    end
   end
 
   def assert_parse_line rb, pt, line
@@ -3643,6 +3760,15 @@ class TestRubyParserV23 < RubyParserTestCase
 
     self.processor = RubyParser::V23.new
   end
+
+  def test_lasgn_call_nobracket_rescue_arg
+    rb = "a = b 1 rescue 2"
+    pt = s(:rescue,
+          s(:lasgn, :a, s(:call, nil, :b, s(:lit, 1))),
+          s(:resbody, s(:array), s(:lit, 2)))
+
+    assert_parse rb, pt
+  end
 end
 
 class TestRubyParserV24 < RubyParserTestCase
@@ -3653,6 +3779,17 @@ class TestRubyParserV24 < RubyParserTestCase
 
     self.processor = RubyParser::V24.new
   end
+
+  def test_rescue_parens
+    rb = "a (b rescue c)"
+    pt = s(:call, nil, :a,
+           s(:rescue, s(:call, nil, :b),
+             s(:resbody, s(:array), s(:call, nil, :c))))
+
+    assert_parse rb, pt
+
+    assert_parse_error "a(b rescue c)", /parse error on value ..rescue/
+  end
 end
 
 class TestRubyParserV25 < RubyParserTestCase

data/tools/munge.rb

@@ -107,6 +107,7 @@ def munge s
 
              '"defined?"',     "kDEFINED",
 
+             "<none>",         "none",
 
              '"do (for condition)"', "kDO_COND",
              '"do (for lambda)"',    "kDO_LAMBDA",
@@ -167,7 +168,7 @@ ARGF.each_line do |line|
     item = $1
     stack << munge(item)
   when /^-> \$\$ = (?:token|nterm) (.+) \(.*\)/ then
-    stack << "<none>" if stack.empty?
+    stack << "none" if stack.empty?
     item = munge $1
     x = stack.map { |s| s.strip }.join " "
     if x != item then # prevent kdef -> kdef

data/tools/ripper.rb

@@ -6,8 +6,13 @@ $p ||= false
 require "ripper/sexp"
 require "pp" if $p
 
+if ARGV.empty? then
+  warn "reading from stdin"
+  ARGV << "-"
+end
+
 ARGV.each do |path|
-  src = File.read path
+  src = path == "-" ? $stdin.read : File.read(path)
   rip = Ripper::SexpBuilderPP.new src
   rip.yydebug = $d
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.13.0
+  version: 3.13.1
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Em82dBUFsipwMLCYj39kcyHWAxyl6Ae1Cn9r/ItVBCxoeFdrHjfavnrIEoXUt4bU
   UfBugfLD19bu3nvL+zTAGx/U
   -----END CERTIFICATE-----
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor