ruby_parser 3.1.3 → 3.2.0

data/test/test_ruby_parser.rb

@@ -4,7 +4,6 @@
 # ENV['VERBOSE'] = "1"
 
 require 'rubygems'
-gem "minitest"
 require 'minitest/autorun'
 require 'ruby_parser'
 
@@ -676,6 +675,22 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_parse_line_heredoc_regexp_chars
+    rb = <<-CODE
+      string = <<-"^D"
+        very long string
+      ^D
+      puts string
+    CODE
+
+    pt = s(:block,
+           s(:lasgn, :string,
+             s(:str, "        very long string\n").line(1)).line(1),
+           s(:call, nil, :puts, s(:lvar, :string).line(4)).line(4)).line(1)
+
+    assert_parse rb, pt
+  end
+
   def test_parse_line_newlines
     rb = "true\n\n"
     pt = s(:true)
@@ -758,10 +773,14 @@ module TestRubyParserShared
     Ruby19Parser === self.processor
   end
 
+  def ruby20
+    Ruby20Parser === self.processor
+  end
+
   def test_bug_comma
     val = if ruby18 then
             s(:lit, 100)
-          elsif ruby19 then
+          elsif ruby19  or ruby20 then
             s(:str, "d")
           else
             raise "wtf"
@@ -785,201 +804,1005 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
-  def test_bug_masgn_right
-    rb = "f { |a, (b, c)| }"
-    pt = s(:iter,
-           s(:call, nil, :f),
-           s(:args, :a, s(:masgn, :b, :c)))
+  def test_bug_masgn_right
+    rb = "f { |a, (b, c)| }"
+    pt = s(:iter,
+           s(:call, nil, :f),
+           s(:args, :a, s(:masgn, :b, :c)))
+
+    assert_parse rb, pt
+  end
+
+  def test_when_splat
+    rb = "case a; when *b then; end"
+    pt = s(:case, s(:call, nil, :a),
+           s(:when, s(:array, s(:splat, s(:call, nil, :b))), nil),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_if_symbol
+    rb = "if f :x; end"
+    pt = s(:if, s(:call, nil, :f, s(:lit, :x)), nil, nil)
+
+    assert_parse rb, pt
+  end
+
+
+  def test_bug_not_parens
+    rb = "not(a)"
+    pt = if ruby18 then
+           s(:not, s(:call, nil, :a))
+         elsif ruby19 or ruby20 then
+           s(:call, s(:call, nil, :a), :"!")
+         else
+           raise "wtf"
+         end
+
+    assert_parse rb, pt
+  end
+
+  def test_pipe_space
+    rb = "a.b do | | end"
+    pt = s(:iter, s(:call, s(:call, nil, :a), :b), 0)
+
+    assert_parse rb, pt
+  end
+
+  def test_cond_unary_minus
+    rb = "if -1; end"
+    pt = s(:if, s(:lit, -1), nil, nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_bug_op_asgn_rescue
+    rb = "a ||= b rescue nil"
+    pt = s(:rescue,
+           s(:op_asgn_or, s(:lvar, :a), s(:lasgn, :a, s(:call, nil, :b))),
+           s(:resbody, s(:array), s(:nil)))
+
+    assert_parse rb, pt
+  end
+
+  def test_magic_encoding_comment
+    rb = "# encoding: utf-8\nclass ExampleUTF8ClassNameVarietà; def self.è; così = :però; end\nend\n"
+
+    rb.force_encoding "ASCII-8BIT" if rb.respond_to? :force_encoding
+
+    # TODO: class vars
+    # TODO: odd-ternary: a ?bb : c
+    # TODO: globals
+
+    pt = s(:class, :"ExampleUTF8ClassNameVariet\303\240", nil,
+           s(:defs, s(:self), :"\303\250", s(:args),
+             s(:lasgn, :"cos\303\254", s(:lit, :"per\303\262"))))
+
+    err = RUBY_VERSION =~ /^1\.8/ ? "Skipping magic encoding comment\n" : ""
+
+    assert_output "", err do
+      assert_parse rb, pt
+    end
+  end
+
+  def test_iter_args_1
+    rb = "f { |a,b| }"
+    pt = s(:iter, s(:call, nil, :f), s(:args, :a, :b))
+
+    assert_parse rb, pt
+  end
+
+  def test_iter_args_3
+    rb = "f { |a, (b, c), d| }"
+    pt = s(:iter, s(:call, nil, :f), s(:args, :a, s(:masgn, :b, :c), :d))
+
+    assert_parse rb, pt
+  end
+
+  def test_str_heredoc_interp
+    rb = "<<\"\"\n\#{x}\nblah2\n\n"
+    pt = s(:dstr, "", s(:evstr, s(:call, nil, :x)), s(:str, "\nblah2\n"))
+
+    assert_parse rb, pt
+  end
+
+  def test_i_fucking_hate_line_numbers
+    rb = <<-END.gsub(/^ {6}/, '')
+      if true
+        p 1
+        a.b 2
+        c.d 3, 4
+        e.f 5
+        g.h 6, 7
+        p(1)
+        a.b(2)
+        c.d(3, 4)
+        e.f(5)
+        g.h(6, 7)
+      end
+    END
+
+    pt = s(:if, s(:true).line(1),
+           s(:block,
+             s(:call, nil, :p, s(:lit, 1).line(2)).line(2),
+             s(:call, s(:call, nil, :a).line(3), :b,
+               s(:lit, 2).line(3)).line(3),
+             s(:call, s(:call, nil, :c).line(4), :d,
+               s(:lit, 3).line(4), s(:lit, 4).line(4)).line(4),
+             s(:call, s(:call, nil, :e).line(5), :f,
+               s(:lit, 5).line(5)).line(5),
+             s(:call, s(:call, nil, :g).line(6), :h,
+               s(:lit, 6).line(6), s(:lit, 7).line(6)).line(6),
+             s(:call, nil, :p, s(:lit, 1).line(7)).line(7),
+             s(:call, s(:call, nil, :a).line(8), :b,
+               s(:lit, 2).line(8)).line(8),
+             s(:call, s(:call, nil, :c).line(9), :d,
+               s(:lit, 3).line(9), s(:lit, 4).line(9)).line(9),
+             s(:call, s(:call, nil, :e).line(10), :f,
+               s(:lit, 5).line(10)).line(10),
+             s(:call, s(:call, nil, :g).line(11), :h,
+               s(:lit, 6).line(11), s(:lit, 7).line(11)).line(11)).line(2),
+           nil).line(1)
+
+    assert_parse rb, pt
+  end
+
+  def test_i_fucking_hate_line_numbers2
+    rb = <<-EOM.gsub(/^ {6}/, '')
+      if true then
+        p('a')
+        b = 1
+        p b
+        c =1
+      end
+      a
+    EOM
+
+    pt = s(:block,
+           s(:if, s(:true).line(1),
+             s(:block,
+               s(:call, nil, :p, s(:str, "a").line(2)).line(2),
+               s(:lasgn, :b, s(:lit, 1).line(3)).line(3),
+               s(:call, nil, :p, s(:lvar, :b).line(4)).line(4),
+               s(:lasgn, :c, s(:lit, 1).line(5)).line(5)).line(2), # TODO line 2?
+             nil).line(1),
+           s(:call, nil, :a).line(7)).line(1)
+
+    assert_parse rb, pt
+  end
+
+  def test_parse_comments
+    p = RubyParser.new
+    sexp = p.parse <<-CODE
+      # class comment
+      class Inline
+        def show
+          # woot
+        end
+
+        # Returns a list of things
+        def list
+          # woot
+        end
+      end
+      CODE
+
+    assert_equal "# class comment\n", sexp.comments
+    act = sexp.find_nodes(:defn).map(&:comments)
+    exp = ["", "# Returns a list of things\n"]
+
+    assert_equal exp, act
+    assert_equal [], processor.comments
+    assert_equal "", processor.lexer.comments
+  end
+
+  def test_call_pipe
+    rb = "1 | 2"
+    pt = s(:call, s(:lit, 1), :|, s(:lit, 2))
+
+    assert_parse rb, pt
+  end
+
+  def test_lasgn_command
+    rb = "a = b.c 1"
+    pt = s(:lasgn, :a, s(:call, s(:call, nil, :b), :c, s(:lit, 1)))
+
+    assert_parse rb, pt
+  end
+
+    def test_call_args_command
+    rb = "a.b c.d 1"
+    pt = s(:call, s(:call, nil, :a), :b,
+           s(:call, s(:call, nil, :c), :d,
+             s(:lit, 1)))
+
+    assert_parse rb, pt
+    end
+
+  def test_defined_eh_parens
+    rb = "defined?(42)"
+    pt = s(:defined, s(:lit, 42))
+
+    assert_parse rb, pt
+  end
+
+  def test_if_elsif
+    rb = "if 1; elsif 2; end"
+    pt = s(:if, s(:lit, 1), nil, s(:if, s(:lit, 2), nil, nil))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_gt
+    rb = "1 > 2"
+    pt = s(:call, s(:lit, 1), :>, s(:lit, 2))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_lt
+    rb = "1 < 2"
+    pt = s(:call, s(:lit, 1), :<, s(:lit, 2))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_lte
+    rb = "1 <= 2"
+    pt = s(:call, s(:lit, 1), :<=, s(:lit, 2))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_spaceship
+    rb = "1 <=> 2"
+    pt = s(:call, s(:lit, 1), :<=>, s(:lit, 2))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_and
+    rb = "1 & 2"
+    pt = s(:call, s(:lit, 1), :&, s(:lit, 2))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_star2
+    rb = "1 ** 2"
+    pt = s(:call, s(:lit, 1), :"**", s(:lit, 2))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_colon2
+    rb = "A::b"
+    pt = s(:call, s(:const, :A), :b)
+
+    assert_parse rb, pt
+  end
+
+  def test_call_star
+    rb = "1 * 2"
+    pt = s(:call, s(:lit, 1), :"*", s(:lit, 2))
+
+    assert_parse rb, pt
+  end
+
+  def test_yield_arg
+    rb = "yield 42"
+    pt = s(:yield, s(:lit, 42))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_div
+    rb = "1 / 2"
+    pt = s(:call, s(:lit, 1), :/, s(:lit, 2))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_eq3
+    rb = "1 === 2"
+    pt = s(:call, s(:lit, 1), :===, s(:lit, 2))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_carat
+    rb = "1 ^ 2"
+    pt = s(:call, s(:lit, 1), :^, s(:lit, 2))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_rshift
+    rb = "1 >> 2"
+    pt = s(:call, s(:lit, 1), :>>, s(:lit, 2))
+
+    assert_parse rb, pt
+  end
+
+  def test_lasgn_arg_rescue_arg
+    rb = "a = 1 rescue 2"
+    pt = s(:lasgn, :a, s(:rescue, 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+
+
+    assert_parse rb, pt
+  end
+
+  def test_super_arg
+    rb = "super 42"
+    pt = s(:super, s(:lit, 42))
+
+    assert_parse rb, pt
+  end
+
+  def test_defns_reserved
+    rb = "def self.return; end"
+    pt = s(:defs, s(:self), :return, s(:args))
+
+    assert_parse rb, pt
+  end
+
+  def test_unary_minus
+    rb = "-a"
+    pt = s(:call, s(:call, nil, :a), :"-@")
+
+    assert_parse rb, pt
+  end
+
+  def test_masgn_command_call
+    rb = "a, = b.c 1"
+    pt = s(:masgn,
+           s(:array, s(:lasgn, :a)),
+           s(:to_ary, s(:call, s(:call, nil, :b), :c, s(:lit, 1))))
+
+    assert_parse rb, pt
+  end
+
+  def test_uminus_float
+    rb = "-0.0"
+    pt = s(:lit, -0.0)
+
+    assert_parse rb, pt
+  end
+
+  def test_op_asgn_command_call
+    rb = "a ||= b.c 2"
+    pt = s(:op_asgn_or,
+           s(:lvar, :a),
+           s(:lasgn, :a, s(:call, s(:call, nil, :b), :c, s(:lit, 2))))
+
+    assert_parse rb, pt
+  end
+
+  def test_masgn_paren
+    rb = "(a, b) = c.d"
+    pt = s(:masgn,
+           s(:array, s(:lasgn, :a), s(:lasgn, :b)),
+           s(:to_ary, s(:call, s(:call, nil, :c), :d)))
+
+    assert_parse rb, pt
+  end
+
+  def test_unary_tilde
+    rb = "~a"
+    pt = s(:call, s(:call, nil, :a), :~)
+
+    assert_parse rb, pt
+  end
+
+  def test_unary_plus
+    rb = "+a"
+    pt = s(:call, s(:call, nil, :a), :+@)
+
+    assert_parse rb, pt
+  end
+
+  def test_qwords_empty
+    rb = "%w()"
+    pt = s(:array)
+
+    assert_parse rb, pt
+  end
+
+  def test_qWords_space
+    rb = "%W( )"
+    pt = s(:array)
+
+    assert_parse rb, pt
+  end
+
+  def test_attr_asgn_colon_id
+    rb = "A::b = 1"
+    pt = s(:attrasgn, s(:const, :A), :b=, s(:lit, 1))
+
+    assert_parse rb, pt
+  end
+
+  def test_aref_args_assocs
+    rb = "[1 => 2]"
+    pt = s(:array, s(:hash, s(:lit, 1), s(:lit, 2)))
+
+    assert_parse rb, pt
+  end
+
+  def test_BEGIN
+    rb = "BEGIN { 42 }"
+    pt = s(:iter, s(:preexe), s(:args), s(:lit, 42))
+
+    assert_parse rb, pt
+  end
+
+  def test_attrasgn_primary_dot_constant
+    rb = "a.B = 1"
+    pt = s(:attrasgn, s(:call, nil, :a), :"B=", s(:lit, 1))
+
+    assert_parse rb, pt
+  end
+
+  def test_op_asgn_primary_colon_identifier
+    rb = "A::b += 1"
+    pt = s(:op_asgn, s(:const, :A), s(:lit, 1), :b, :+) # TODO: check? looks wack
+
+    assert_parse rb, pt
+  end
+
+  def test_words_interp
+    rb = '%W(#{1}b)'
+    pt = s(:array, s(:dstr, "", s(:evstr, s(:lit, 1)), s(:str, "b")))
+
+    assert_parse rb, pt
+  end
+
+  def test_op_asgn_index_command_call
+    rb = "a[:b] ||= c 1, 2"
+    pt = s(:op_asgn1, s(:call, nil, :a), s(:array, s(:lit, :b)),
+           :"||",
+           s(:call, nil, :c, s(:lit, 1), s(:lit, 2)))
+
+    assert_parse rb, pt
+  end
+
+  def test_op_asgn_val_dot_ident_command_call
+    rb = "a.b ||= c 1"
+    pt = s(:op_asgn, s(:call, nil, :a), s(:call, nil, :c, s(:lit, 1)), :b, :"||")
+
+    assert_parse rb, pt
+  end
+
+  def test_yield_empty_parens
+    rb = "yield()"
+    pt = s(:yield)
+
+    assert_parse rb, pt
+  end
+
+  def test_masgn_lhs_splat
+    rb = "*a = 1, 2, 3"
+    pt = s(:masgn,
+           s(:array, s(:splat, s(:lasgn, :a))),
+           s(:array, s(:lit, 1), s(:lit, 2), s(:lit, 3)))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_decomp_arg_splat
+    skip "not that smart yet" if ruby18 # HACK
+
+    rb = "a { |(b, *)| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, s(:masgn, :b, :*)))
+
+    assert_parse rb, pt
+  end
+
+  def test_masgn_arg_ident
+    rb = "a, b.C = d"
+    pt = s(:masgn,
+           s(:array, s(:lasgn, :a), s(:attrasgn, s(:call, nil, :b), :"C=")),
+           s(:to_ary, s(:call, nil, :d)))
+
+    assert_parse rb, pt
+  end
+
+  def test_masgn_arg_colon_arg
+    rb = "a, b::c = d"
+    pt = s(:masgn,
+           s(:array, s(:lasgn, :a), s(:attrasgn, s(:call, nil, :b), :c=)),
+           s(:to_ary, s(:call, nil, :d)))
+
+    assert_parse rb, pt
+  end
+
+  def test_masgn_star
+    rb = "* = 1"
+    pt = s(:masgn,
+           s(:array, s(:splat)),
+           s(:to_ary, s(:lit, 1)))
+
+    assert_parse rb, pt
+  end
+
+  def test_op_asgn_dot_ident_command_call
+    rb = "A.B ||= c 1"
+    pt = s(:op_asgn, s(:const, :A), s(:call, nil, :c, s(:lit, 1)), :B, :"||")
+
+    assert_parse rb, pt
+  end
+
+  def test_block_decomp_splat
+    skip "not that smart yet" if ruby18 # HACK
+
+    rb = "f { |(*a)| }"
+    pt = s(:iter, s(:call, nil, :f), s(:args, s(:masgn, :"*a")))
+
+    assert_parse rb, pt
+  end
+
+  def test_masgn_colon3
+    rb = "::A, ::B = 1, 2"
+    pt = s(:masgn,
+           s(:array, s(:const, nil, s(:colon3, :A)), s(:const, s(:colon3, :B))),
+           s(:array, s(:lit, 1), s(:lit, 2)))
+
+    assert_parse rb, pt
+  end
+
+  def test_masgn_colon2
+    rb = "a, b::C = 1, 2"
+    pt = s(:masgn,
+           s(:array, s(:lasgn, :a), s(:const, s(:colon2, s(:call, nil, :b), :C))),
+           s(:array, s(:lit, 1), s(:lit, 2)))
+
+    assert_parse rb, pt
+  end
+
+  def test_alias_gvar_backref
+    rb = "alias $MATCH $&"
+    pt = s(:valias, :$MATCH, :$&)
+
+    assert_parse rb, pt
+  end
+
+  def test_heredoc_broken_windows_theory_applies_to_microsoft_more_than_anything
+    rb = "<<EOS\r\r\nEOS\r\r\n"
+    pt = s(:str, "")
+
+    assert_parse rb, pt
+  end
+
+  def test_heredoc_unicode
+    rb = "<<OOTPÜT\n.\nOOTPÜT\n"
+    pt = s(:str, ".\n")
+
+    assert_parse rb, pt
+  end
+
+  def test_masgn_double_paren
+    rb = "((a,b))=c" # TODO: blog
+    pt = s(:masgn,
+           s(:array, s(:masgn, s(:array, s(:lasgn, :a), s(:lasgn, :b)))),
+           s(:to_ary, s(:call, nil, :c)))
+
+    assert_parse rb, pt
+  end
+
+  def test_index_0_opasgn
+    rb = "a[] += b"
+    pt = s(:op_asgn1, s(:call, nil, :a), nil, :+, s(:call, nil, :b))
+
+    assert_parse rb, pt
+  end
+
+  def test___ENCODING__
+    # skip "lexer bug" if ruby18
+    rb = "__ENCODING__"
+    pt = if Ruby18Parser === processor then
+           s(:call, nil, :__ENCODING__)
+         else
+           if defined? Encoding then
+             if Ruby18Parser === processor then
+               s(:call, nil, :__ENCODING__)
+             else
+               s(:colon2, s(:const, :Encoding), :UTF_8)
+             end
+           else
+             s(:str, "Unsupported!")
+           end
+         end
+
+    assert_parse rb, pt
+  end
+
+  def test_dstr_evstr_empty_end
+    rb = ':"#{field}"'
+    pt = s(:dsym, "", s(:evstr, s(:call, nil, :field)))
+
+    assert_parse rb, pt
+  end
+end
+
+module TestRubyParserShared1920
+  def test_block_call_operation_dot
+    rb = "a.b c do end.d"
+    pt = s(:call,
+           s(:iter,
+             s(:call, s(:call, nil, :a), :b, s(:call, nil, :c)), s(:args)),
+           :d)
+
+    assert_parse rb, pt
+  end
+
+  def test_block_call_operation_colon
+    rb = "a.b c do end::d"
+    pt = s(:call,
+           s(:iter,
+             s(:call, s(:call, nil, :a), :b, s(:call, nil, :c)), s(:args)),
+           :d)
+
+    assert_parse rb, pt
+  end
+
+  def test_block_command_operation_dot
+    rb = "a :b do end.c :d"
+    pt = s(:call,
+           s(:iter, s(:call, nil, :a, s(:lit, :b)), s(:args)),
+           :c,
+           s(:lit, :d))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_command_operation_colon
+    rb = "a :b do end::c :d"
+    pt = s(:call,
+           s(:iter, s(:call, nil, :a, s(:lit, :b)), s(:args)),
+           :c,
+           s(:lit, :d))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_optarg
+    rb = "a { |b = :c| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, s(:lasgn, :b, s(:lit, :c))))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_reg_optarg
+    rb = "a { |b, c = :d| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, :b, s(:lasgn, :c, s(:lit, :d))))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_splat_reg
+    rb = "a { |*b, c| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, :"*b", :c))
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_opt_reg
+    rb = "def f(a=nil, b) end"
+    pt = s(:defn, :f, s(:args, s(:lasgn, :a, s(:nil)), :b), s(:nil))
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_reg_opt_reg
+    rb = "def f(a, b = :c, d) end"
+    pt = s(:defn, :f, s(:args, :a, s(:lasgn, :b, s(:lit, :c)), :d), s(:nil))
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_splat_arg
+    rb = "def f(*, a) end"
+    pt = s(:defn, :f, s(:args, :*, :a), s(:nil))
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_arg_asplat_arg
+    rb = "def call(interp, *, args) end"
+    pt = s(:defn, :call, s(:args, :interp, :*, :args), s(:nil))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_arg_scope
+    rb = "a { |b; c| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, :b, s(:shadow, :c)))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_arg_scope2
+    rb = "a {|b; c, d| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, :b, s(:shadow, :c, :d)))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_arg_splat_arg
+    rb = "a { |b, *c, d| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, :b, :"*c", :d))
+
+    assert_parse rb, pt
+  end
+
+  def test_stabby_proc_scope
+    rb = "->(a; b) {}"
+    pt = s(:iter, s(:call, nil, :lambda), s(:args, :a, s(:shadow, :b)))
+
+    assert_parse rb, pt
+  end
+
+  def test_stabby_arg_opt_splat_arg_block_omfg
+    rb = "->(b, c=1, *d, e, &f){}"
+    pt = s(:iter,
+           s(:call, nil, :lambda),
+           s(:args, :b, s(:lasgn, :c, s(:lit, 1)), :"*d", :e, :"&f"))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_arg_opt_splat_arg_block_omfg
+    rb = "a { |b, c=1, *d, e, &f| }"
+    pt = s(:iter,
+           s(:call, nil, :a),
+           s(:args, :b, s(:lasgn, :c, s(:lit, 1)), :"*d", :e, :"&f"))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_arg_opt_splat
+    rb = "a { |b, c = 1, *d| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, :b, s(:lasgn, :c, s(:lit, 1)), :"*d"))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_opt_splat
+    rb = "a { |b = 1, *c| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, s(:lasgn, :b, s(:lit, 1)), :"*c"))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_arg_opt_arg_block
+    rb = "a { |b, c=1, d, &e| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, :b, s(:lasgn, :c, s(:lit, 1)), :d, :"&e"))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_opt_arg
+    rb = "a { |b=1, c| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, s(:lasgn, :b, s(:lit, 1)), :c))
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_opt_splat_arg
+    rb = "def f (a = 1, *b, c) end"
+    pt = s(:defn, :f, s(:args, s(:lasgn, :a, s(:lit, 1)), :"*b", :c), s(:nil))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_opt_splat_arg_block_omfg
+    rb = "a { |b=1, *c, d, &e| }"
+    pt = s(:iter,
+           s(:call, nil, :a),
+           s(:args, s(:lasgn, :b, s(:lit, 1)), :"*c", :d, :"&e"))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_scope
+    rb = "a { |;b| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, s(:shadow, :b)))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_unary_bang
+    rb = "!1"
+    pt = s(:call, s(:lit, 1), :"!")
+
+    assert_parse rb, pt
+  end
+
+  def test_assoc_label
+    rb = "a(b:1)"
+    pt = s(:call, nil, :a, s(:hash, s(:lit, :b), s(:lit, 1)))
+
+    assert_parse rb, pt
+  end
+
+  def test_bang_eq
+    rb = "1 != 2"
+    pt = s(:call, s(:lit, 1), :"!=", s(:lit, 2))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_not
+    rb = "not 42"
+    pt = s(:call, s(:lit, 42), :"!")
+
+    assert_parse rb, pt
+  end
+
+  def test_call_bang_command_call
+    rb = "! a.b 1"
+    pt = s(:call, s(:call, s(:call, nil, :a), :b, s(:lit, 1)), :"!")
+
+    assert_parse rb, pt
+  end
+
+  def test_stabby_arg_no_paren
+    rb = "->a{}"
+    pt = s(:iter, s(:call, nil, :lambda), s(:args, :a))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_trailing_comma
+    rb = "f(1,)"
+    pt = s(:call, nil, :f, s(:lit, 1))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_assoc_trailing_comma
+    rb = "f(1=>2,)"
+    pt = s(:call, nil, :f, s(:hash, s(:lit, 1), s(:lit, 2)))
 
     assert_parse rb, pt
   end
 
-  def test_when_splat
-    rb = "case a; when *b then; end"
-    pt = s(:case, s(:call, nil, :a),
-           s(:when, s(:array, s(:splat, s(:call, nil, :b))), nil),
-           nil)
+  def test_call_args_assoc_trailing_comma
+    rb = "f(1, 2=>3,)"
+    pt = s(:call, nil, :f, s(:lit, 1), s(:hash, s(:lit, 2), s(:lit, 3)))
 
     assert_parse rb, pt
   end
 
-  def test_if_symbol
-    rb = "if f :x; end"
-    pt = s(:if, s(:call, nil, :f, s(:lit, :x)), nil, nil)
+  def test_do_lambda
+    rb = "->() do end"
+    pt = s(:iter, s(:call, nil, :lambda), 0)
 
     assert_parse rb, pt
   end
 
-
-  def test_bug_not_parens
-    rb = "not(a)"
-    pt = if ruby18 then
-           s(:not, s(:call, nil, :a))
-         elsif ruby19 then
-           s(:call, s(:call, nil, :a), :"!")
-         else
-           raise "wtf"
-         end
+  def test_call_dot_parens
+    rb = "1.()"
+    pt = s(:call, s(:lit, 1), :call)
 
     assert_parse rb, pt
   end
 
-  def test_pipe_space
-    rb = "a.b do | | end"
-    pt = s(:iter, s(:call, s(:call, nil, :a), :b), 0)
+  def test_call_colon_parens
+    rb = "1::()"
+    pt = s(:call, s(:lit, 1), :call)
 
     assert_parse rb, pt
   end
 
-  def test_cond_unary_minus
-    rb = "if -1; end"
-    pt = s(:if, s(:lit, -1), nil, nil)
+  def test_block_args_opt2
+    rb = "a { | b=1, c=2 | }"
+    pt = s(:iter,
+           s(:call, nil, :a),
+           s(:args, s(:lasgn, :b, s(:lit, 1)), s(:lasgn, :c, s(:lit, 2))))
 
     assert_parse rb, pt
   end
 
-  def test_bug_op_asgn_rescue
-    rb = "a ||= b rescue nil"
-    pt = s(:rescue,
-           s(:op_asgn_or, s(:lvar, :a), s(:lasgn, :a, s(:call, nil, :b))),
-           s(:resbody, s(:array), s(:nil)))
+  def test_block_paren_splat # TODO: rename # TODO: should work on 1.8
+    rb = "a { |(b, *c)| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, s(:masgn, :b, :"*c")))
 
     assert_parse rb, pt
   end
 
-  def test_magic_encoding_comment
-    rb = "# encoding: utf-8\nclass ExampleUTF8ClassNameVarietà; def self.è; così = :però; end\nend\n"
+  def test_masgn_anon_splat_arg
+    rb = "*, a = b"
+    pt = s(:masgn,
+           s(:array, s(:splat), s(:lasgn, :a)),
+           s(:to_ary, s(:call, nil, :b)))
 
-    rb.force_encoding "ASCII-8BIT" if rb.respond_to? :force_encoding
+    assert_parse rb, pt
+  end
 
-    # TODO: class vars
-    # TODO: odd-ternary: a ?bb : c
-    # TODO: globals
+  def test_masgn_splat_arg
+    rb = "*a, b = c"
+    pt = s(:masgn,
+           s(:array, s(:splat, s(:lasgn, :a)), s(:lasgn, :b)),
+           s(:to_ary, s(:call, nil, :c)))
 
-    pt = s(:class, :"ExampleUTF8ClassNameVariet\303\240", nil,
-           s(:defs, s(:self), :"\303\250", s(:args),
-             s(:lasgn, :"cos\303\254", s(:lit, :"per\303\262"))))
+    assert_parse rb, pt
+  end
 
-    err = RUBY_VERSION =~ /^1\.8/ ? "Skipping magic encoding comment\n" : ""
+  def test_lasgn_lasgn_command_call
+    rb = "a = b = c 1"
+    pt = s(:lasgn, :a, s(:lasgn, :b, s(:call, nil, :c, s(:lit, 1))))
 
-    assert_output "", err do
-      assert_parse rb, pt
-    end
+    assert_parse rb, pt
   end
 
-  def test_iter_args_1
-    rb = "f { |a,b| }"
-    pt = s(:iter, s(:call, nil, :f), s(:args, :a, :b))
+  def test_masgn_arg_splat_arg
+    rb = "a, *b, c = d"
+    pt = s(:masgn,
+           s(:array, s(:lasgn, :a), s(:splat, s(:lasgn, :b)), s(:lasgn, :c)),
+           s(:to_ary, s(:call, nil, :d)))
 
     assert_parse rb, pt
   end
 
-  def test_iter_args_3
-    rb = "f { |a, (b, c), d| }"
-    pt = s(:iter, s(:call, nil, :f), s(:args, :a, s(:masgn, :b, :c), :d))
+  def test_masgn_splat_arg_arg
+    rb = "*a, b, c = d"
+    pt = s(:masgn,
+           s(:array, s(:splat, s(:lasgn, :a)), s(:lasgn, :b), s(:lasgn, :c)),
+           s(:to_ary, s(:call, nil, :d)))
 
     assert_parse rb, pt
   end
 
-  def test_str_heredoc_interp
-    rb = "<<\"\"\n\#{x}\nblah2\n\n"
-    pt = s(:dstr, "", s(:evstr, s(:call, nil, :x)), s(:str, "\nblah2\n"))
+  def test_block_decomp_anon_splat_arg
+    rb = "f { |(*, a)| }"
+    pt = s(:iter, s(:call, nil, :f), s(:args, s(:masgn, :*, :a)))
 
     assert_parse rb, pt
   end
 
-  def test_i_fucking_hate_line_numbers
-    rb = <<-END.gsub(/^ {6}/, '')
-      if true
-        p 1
-        a.b 2
-        c.d 3, 4
-        e.f 5
-        g.h 6, 7
-        p(1)
-        a.b(2)
-        c.d(3, 4)
-        e.f(5)
-        g.h(6, 7)
-      end
-    END
-
-    pt = s(:if, s(:true).line(1),
-           s(:block,
-             s(:call, nil, :p, s(:lit, 1).line(2)).line(2),
-             s(:call, s(:call, nil, :a).line(3), :b,
-               s(:lit, 2).line(3)).line(3),
-             s(:call, s(:call, nil, :c).line(4), :d,
-               s(:lit, 3).line(4), s(:lit, 4).line(4)).line(4),
-             s(:call, s(:call, nil, :e).line(5), :f,
-               s(:lit, 5).line(5)).line(5),
-             s(:call, s(:call, nil, :g).line(6), :h,
-               s(:lit, 6).line(6), s(:lit, 7).line(6)).line(6),
-             s(:call, nil, :p, s(:lit, 1).line(7)).line(7),
-             s(:call, s(:call, nil, :a).line(8), :b,
-               s(:lit, 2).line(8)).line(8),
-             s(:call, s(:call, nil, :c).line(9), :d,
-               s(:lit, 3).line(9), s(:lit, 4).line(9)).line(9),
-             s(:call, s(:call, nil, :e).line(10), :f,
-               s(:lit, 5).line(10)).line(10),
-             s(:call, s(:call, nil, :g).line(11), :h,
-               s(:lit, 6).line(11), s(:lit, 7).line(11)).line(11)).line(2),
-           nil).line(1)
+  def test_block_decomp_arg_splat_arg
+    rb = "f { |(a, *b, c)| }"
+    pt = s(:iter, s(:call, nil, :f), s(:args, s(:masgn, :a, :"*b", :c)))
 
     assert_parse rb, pt
   end
 
-  def test_i_fucking_hate_line_numbers2
-    rb = <<-EOM.gsub(/^ {6}/, '')
-      if true then
-        p('a')
-        b = 1
-        p b
-        c =1
-      end
-      a
-    EOM
+  def test_symbol_empty
+    skip "can't do this in ruby 1.8" if RUBY_VERSION < "1.9"
 
-    pt = s(:block,
-           s(:if, s(:true).line(1),
-             s(:block,
-               s(:call, nil, :p, s(:str, "a").line(2)).line(2),
-               s(:lasgn, :b, s(:lit, 1).line(3)).line(3),
-               s(:call, nil, :p, s(:lvar, :b).line(4)).line(4),
-               s(:lasgn, :c, s(:lit, 1).line(5)).line(5)).line(2), # TODO line 2?
-             nil).line(1),
-           s(:call, nil, :a).line(7)).line(1)
+    rb = ":''"
+    pt = s(:lit, "".to_sym)
 
     assert_parse rb, pt
   end
 
-  def test_parse_comments
-    p = RubyParser.new
-    sexp = p.parse <<-CODE
-      # class comment
-      class Inline
-        def show
-          # woot
-        end
+  def test_masgn_var_star_var
+    rb = "a, *, b = c" # TODO: blog
+    pt = s(:masgn,
+           s(:array, s(:lasgn, :a), s(:splat), s(:lasgn, :b)),
+           s(:to_ary, s(:call, nil, :c)))
 
-        # Returns a list of things
-        def list
-          # woot
-        end
-      end
-      CODE
+    assert_parse rb, pt
+  end
 
-    assert_equal "# class comment\n", sexp.comments
-    act = sexp.find_nodes(:defn).map(&:comments)
-    exp = ["", "# Returns a list of things\n"]
+  def test_mlhs_keyword
+    skip "Breaks on 1.9 and 2.0 parser but valid" # HACK
+    rb = "a.!=(true, true)"
+    pt = 42
 
-    assert_equal exp, act
-    assert_equal [], processor.comments
-    assert_equal "", processor.lexer.comments
+    assert_parse rb, pt
   end
 end
 
-class TestRubyParser < MiniTest::Unit::TestCase
+class TestRubyParser < Minitest::Test
   def test_parse
     processor = RubyParser.new
 
@@ -1175,10 +1998,39 @@ class TestRuby18Parser < RubyParserTestCase
 
     assert_parse rb, pt.dup
   end
+
+  def test_call_unary_bang
+    rb = "!1"
+    pt = s(:not, s(:lit, 1))
+
+    assert_parse rb, pt
+  end
+
+  def test_bang_eq
+    rb = "1 != 2"
+    pt = s(:not, s(:call, s(:lit, 1), :"==", s(:lit, 2)))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_not
+    rb = "not 42"
+    pt = s(:not, s(:lit, 42))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_bang_command_call
+    rb = "! a.b 1"
+    pt = s(:not, s(:call, s(:call, nil, :a), :b, s(:lit, 1)))
+
+    assert_parse rb, pt
+  end
 end
 
 class TestRuby19Parser < RubyParserTestCase
   include TestRubyParserShared
+  include TestRubyParserShared1920
 
   def setup
     super
@@ -1267,17 +2119,6 @@ class TestRuby19Parser < RubyParserTestCase
     assert_parse rb, pt
   end
 
-  def test_encoding
-    rb = '__ENCODING__'
-    pt = if defined? Encoding then
-           s(:const, Encoding::UTF_8)
-         else
-           s(:str, "Unsupported!")
-         end
-
-    assert_parse rb, pt
-  end
-
   def test_do_colon_19
     rb = "while false : 42 end"
 
@@ -1377,7 +2218,7 @@ class TestRuby19Parser < RubyParserTestCase
 
   def test_parse_opt_call_args_assocs_comma
     rb = "1[2=>3,]"
-    pt = s(:call, s(:lit, 1), :[], s(:lit, 2), s(:lit, 3))
+    pt = s(:call, s(:lit, 1), :[], s(:hash, s(:lit, 2), s(:lit, 3)))
 
     assert_parse rb, pt
   end
@@ -1779,3 +2620,156 @@ class TestRuby19Parser < RubyParserTestCase
     assert_parse rb, pt
   end
 end
+
+class TestRuby20Parser < RubyParserTestCase
+  include TestRubyParserShared
+  include TestRubyParserShared1920
+
+  def setup
+    super
+
+    self.processor = Ruby20Parser.new
+  end
+
+  def test_defn_kwarg_val
+    rb = "def f(a, b:1) end"
+    pt = s(:defn, :f, s(:args, :a, s(:kwarg, :b, s(:lit, 1))), s(:nil))
+
+    assert_parse rb, pt
+  end
+
+  def test_args_kw_block
+    rb = "def f(a: 1, &b); end"
+    pt = s(:defn, :f, s(:args, s(:kwarg, :a, s(:lit, 1)), :"&b"), s(:nil))
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_kwarg_kwarg
+    rb = "def f(a, b: 1, c: 2) end"
+    pt = s(:defn, :f, s(:args, :a,
+                        s(:kwarg, :b, s(:lit, 1)),
+                        s(:kwarg, :c, s(:lit, 2))),
+           s(:nil))
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_powarg
+    rb = "def f(**opts) end"
+    pt = s(:defn, :f, s(:args, :"**opts"), s(:nil))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_arg_kwsplat
+    rb = "a { |**b| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, :"**b"))
+
+    assert_parse rb, pt
+  end
+
+  def test_symbols
+    rb = "%i(a b c)"
+    pt = s(:array, s(:lit, :a), s(:lit, :b), s(:lit, :c))
+
+    assert_parse rb, pt
+  end
+
+  def test_symbols_interp
+    rb = '%i(a b#{1+1} c)'
+    pt = s(:array, s(:lit, :a), s(:lit, :'b#{1+1}'), s(:lit, :c))
+
+    assert_parse rb, pt
+  end
+
+  def test_symbols_empty_space
+    rb = "%i( )"
+    pt = s(:array)
+
+    assert_parse rb, pt
+  end
+
+  def test_symbols_empty
+    rb = "%i()"
+    pt = s(:array)
+
+    assert_parse rb, pt
+  end
+
+  def test_qsymbols
+    rb = "%I(a b c)"
+    pt = s(:array, s(:lit, :a), s(:lit, :b), s(:lit, :c))
+
+    assert_parse rb, pt
+  end
+
+  def test_qsymbols_interp
+    rb = '%I(a b#{1+1} c)'
+    pt = s(:array,
+           s(:lit, :a),
+           s(:dsym, "b", s(:evstr, s(:call, s(:lit, 1), :+, s(:lit, 1)))),
+           s(:lit, :c))
+
+    assert_parse rb, pt
+  end
+
+  def test_qsymbols_empty
+    rb = "%I()"
+    pt = s(:array)
+
+    assert_parse rb, pt
+  end
+
+  def test_qsymbols_empty_space
+    rb = "%I( )"
+    pt = s(:array)
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_unary_not # TODO: this needs to work on 1.9
+    skip "Not yet"
+    rb = "def !@; true; end" # I seriously HATE this
+    pt = s(:defn, :"!@", s(:args), s(:true))
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_kwarg_kwsplat
+    rb = "def a(b: 1, **c) end"
+    pt = s(:defn, :a, s(:args, s(:kwarg, :b, s(:lit, 1)), :"**c"), s(:nil))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_arg_kwsplat
+    rb = "a(b, **1)"
+    pt = s(:call, nil, :a, s(:call, nil, :b), s(:kwsplat, s(:lit, 1)))
+
+    assert_parse rb, pt
+  end
+
+  def test_iter_kwarg
+    rb = "a { |b: 1| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, s(:kwarg, :b, s(:lit, 1))))
+
+    assert_parse rb, pt
+  end
+
+  def test_iter_kwarg_kwsplat
+    rb = "a { |b: 1, **c| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, s(:kwarg, :b, s(:lit, 1)), :"**c"))
+
+    assert_parse rb, pt
+  end
+
+  def test_iter_array_curly
+    rb = "f :a, [:b] { |c, d| }" # yes, this is bad code... that's their problem
+    pt = s(:iter,
+           s(:call, nil, :f, s(:lit, :a), s(:array, s(:lit, :b))),
+           s(:args, :c, :d))
+
+    assert_parse rb, pt
+  end
+end