parser 2.2.2.6 → 2.2.3.0

data/lib/parser/runner.rb

@@ -82,6 +82,16 @@ module Parser
         @parser_class = Parser::Ruby22
       end
 
+      opts.on '--mac', 'Parse as MacRuby 0.12 would' do
+        require 'parser/macruby'
+        @parser_class = Parser::MacRuby
+      end
+
+      opts.on '--ios', 'Parse as mid-2015 RubyMotion would' do
+        require 'parser/rubymotion'
+        @parser_class = Parser::RubyMotion
+      end
+
       opts.on '-w', '--warnings', 'Enable warnings' do |w|
         @warnings = w
       end

data/lib/parser/source/buffer.rb

@@ -40,6 +40,8 @@ module Parser
           )
         /x
 
+      NEW_LINE = "\n".freeze
+
       ##
       # Try to recognize encoding of `string` as Ruby would, i.e. by looking for
       # magic encoding comment or UTF-8 BOM. `string` can be in any encoding.
@@ -173,7 +175,7 @@ module Parser
           raise ArgumentError, 'Source::Buffer is immutable'
         end
 
-        @source = input.gsub("\r\n", "\n").freeze
+        @source = input.gsub("\r\n", NEW_LINE).freeze
       end
 
       ##
@@ -198,7 +200,7 @@ module Parser
       def source_line(lineno)
         unless @lines
           @lines = @source.lines.to_a
-          @lines.each { |line| line.chomp!("\n") }
+          @lines.each { |line| line.chomp!(NEW_LINE) }
 
           # If a file ends with a newline, the EOF token will appear
           # to be one line further than the end of file.
@@ -215,7 +217,7 @@ module Parser
           @line_begins, index = [ [ 0, 0 ] ], 1
 
           @source.each_char do |char|
-            if char == "\n"
+            if char == NEW_LINE
               @line_begins.unshift [ @line_begins.length, index ]
             end
 

data/lib/parser/source/map/objc_kwarg.rb

@@ -0,0 +1,17 @@
+module Parser
+  module Source
+
+    class Map::ObjcKwarg < Map
+      attr_reader :keyword
+      attr_reader :operator
+      attr_reader :argument
+
+      def initialize(keyword_l, operator_l, argument_l, expression_l)
+        @keyword, @operator, @argument = keyword_l, operator_l, argument_l
+
+        super(expression_l)
+      end
+    end
+
+  end
+end

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.2.2.6'
+  VERSION = '2.2.3.0'
 end

data/parser.gemspec

@@ -5,7 +5,7 @@ require File.expand_path('../lib/parser/version', __FILE__)
 Gem::Specification.new do |spec|
   spec.name          = 'parser'
   spec.version       = Parser::VERSION
-  spec.authors       = ['Peter Zotov']
+  spec.authors       = ['whitequark']
   spec.email         = ['whitequark@whitequark.org']
   spec.description   = 'A Ruby parser written in pure Ruby.'
   spec.summary       = spec.description
@@ -20,6 +20,8 @@ Gem::Specification.new do |spec|
                           lib/parser/ruby20.rb
                           lib/parser/ruby21.rb
                           lib/parser/ruby22.rb
+                          lib/parser/macruby.rb
+                          lib/parser/rubymotion.rb
                        )
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^test/})

data/test/parse_helper.rb

@@ -8,8 +8,10 @@ module ParseHelper
   else
     require 'parser/all'
     require 'parser/ruby22'
+    require 'parser/macruby'
+    require 'parser/rubymotion'
 
-    ALL_VERSIONS = %w(1.8 1.9 2.0 2.1 2.2)
+    ALL_VERSIONS = %w(1.8 1.9 2.0 2.1 2.2 mac ios)
   end
 
   def setup
@@ -25,6 +27,8 @@ module ParseHelper
     when '2.0' then parser = Parser::Ruby20.new
     when '2.1' then parser = Parser::Ruby21.new
     when '2.2' then parser = Parser::Ruby22.new
+    when 'mac' then parser = Parser::MacRuby.new
+    when 'ios' then parser = Parser::RubyMotion.new
     else raise "Unrecognized Ruby version #{version}"
     end
 

data/test/test_parser.rb

@@ -121,13 +121,13 @@ class TestParser < Minitest::Test
       s(:rational, Rational(42)),
       %q{42r},
       %q{~~~ expression},
-      ALL_VERSIONS - %w(1.8 1.9 2.0))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
 
     assert_parses(
       s(:rational, Rational(421, 10)),
       %q{42.1r},
       %q{~~~~~ expression},
-      ALL_VERSIONS - %w(1.8 1.9 2.0))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
   end
 
   def test_complex
@@ -135,25 +135,25 @@ class TestParser < Minitest::Test
       s(:complex, Complex(0, 42)),
       %q{42i},
       %q{~~~ expression},
-      ALL_VERSIONS - %w(1.8 1.9 2.0))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
 
     assert_parses(
       s(:complex, Complex(0, Rational(42))),
       %q{42ri},
       %q{~~~~ expression},
-      ALL_VERSIONS - %w(1.8 1.9 2.0))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
 
     assert_parses(
       s(:complex, Complex(0, 42.1)),
       %q{42.1i},
       %q{~~~~~ expression},
-      ALL_VERSIONS - %w(1.8 1.9 2.0))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
 
     assert_parses(
       s(:complex, Complex(0, Rational(421, 10))),
       %q{42.1ri},
       %q{~~~~~~ expression},
-      ALL_VERSIONS - %w(1.8 1.9 2.0))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
   end
 
   # Strings
@@ -491,7 +491,7 @@ class TestParser < Minitest::Test
         |          ^ end
         |   ~~~ expression (sym)
         |~~~~~~~~~~~ expression},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
   end
 
   def test_array_symbols_interp
@@ -508,7 +508,7 @@ class TestParser < Minitest::Test
         |       ~~~~~~ expression (dsym.begin)
         |         ~~~ expression (dsym.begin.lvar)
         |~~~~~~~~~~~~~~ expression},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
 
     assert_parses(
       s(:array,
@@ -517,7 +517,7 @@ class TestParser < Minitest::Test
           s(:begin, s(:lvar, :bar)))),
       %q{%I[foo#{bar}]},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
   end
 
   def test_array_symbols_empty
@@ -527,13 +527,13 @@ class TestParser < Minitest::Test
       %q{^^^ begin
         |   ^ end
         |~~~~ expression},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
 
     assert_parses(
       s(:array),
       %q{%I()},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
   end
 
   # Hashes
@@ -589,7 +589,7 @@ class TestParser < Minitest::Test
         |  ~~~~~ expression (pair.sym)
         |  ~~~~~~~~ expression (pair)
         |~~~~~~~~~~~~ expression},
-      ALL_VERSIONS - %w(1.8 1.9 2.0 2.1))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0 2.1))
 
     assert_parses(
       s(:hash,
@@ -597,7 +597,7 @@ class TestParser < Minitest::Test
         s(:pair, s(:sym, :bar), s(:hash))),
       %q[{ 'foo': 2, 'bar': {}}],
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9 2.0 2.1))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0 2.1))
 
     assert_parses(
       s(:send, nil, :f,
@@ -606,7 +606,7 @@ class TestParser < Minitest::Test
           s(:int, 1))),
       %q{f(a ? "a":1)},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9 2.0 2.1))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0 2.1))
   end
 
   def test_hash_kwsplat
@@ -617,7 +617,7 @@ class TestParser < Minitest::Test
       %q[{ foo: 2, **bar }],
       %q{          ^^ operator (kwsplat)
         |          ~~~~~ expression (kwsplat)},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
   end
 
   def test_hash_no_hashrocket
@@ -837,7 +837,7 @@ class TestParser < Minitest::Test
           s(:send, nil, :m, s(:lvar, :foo)))),
       %q{foo = bar = m foo},
       %q{},
-      ALL_VERSIONS - %w(1.8))
+      ALL_VERSIONS - %w(1.8 mac ios))
   end
 
   def test_asgn_keyword_invalid
@@ -1233,7 +1233,7 @@ class TestParser < Minitest::Test
         s(:int, 1)),
       %q{::A += 1},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
 
     assert_parses(
       s(:op_asgn,
@@ -1241,7 +1241,7 @@ class TestParser < Minitest::Test
         s(:int, 1)),
       %q{B::A += 1},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
 
     assert_parses(
       s(:def, :x, s(:args),
@@ -1250,7 +1250,7 @@ class TestParser < Minitest::Test
           s(:int, 1))),
       %q{def x; self::A ||= 1; end},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
 
     assert_parses(
       s(:def, :x, s(:args),
@@ -1259,7 +1259,7 @@ class TestParser < Minitest::Test
           s(:int, 1))),
       %q{def x; ::A ||= 1; end},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
   end
 
   def test_const_op_asgn_invalid
@@ -1267,25 +1267,25 @@ class TestParser < Minitest::Test
       [:error, :dynamic_const],
       %q{Foo::Bar += 1},
       %q{     ~~~ location},
-      %w(1.8 1.9))
+      %w(1.8 1.9 mac ios))
 
     assert_diagnoses(
       [:error, :dynamic_const],
       %q{::Bar += 1},
       %q{  ~~~ location},
-      %w(1.8 1.9))
+      %w(1.8 1.9 mac ios))
 
     assert_diagnoses(
       [:error, :dynamic_const],
       %q{def foo; Foo::Bar += 1; end},
       %q{              ~~~ location},
-      %w(1.8 1.9))
+      %w(1.8 1.9 mac ios))
 
     assert_diagnoses(
       [:error, :dynamic_const],
       %q{def foo; ::Bar += 1; end},
       %q{           ~~~ location},
-      %w(1.8 1.9))
+      %w(1.8 1.9 mac ios))
   end
 
   # Method binary operator-assignment
@@ -1339,7 +1339,7 @@ class TestParser < Minitest::Test
         s(:send, nil, :m, s(:lvar, :foo))),
       %q{foo::A += m foo},
       %q{},
-      ALL_VERSIONS - %w(1.8))
+      ALL_VERSIONS - %w(1.8 ios))
   end
 
   def test_op_asgn_index
@@ -1535,7 +1535,7 @@ class TestParser < Minitest::Test
         nil),
       %q{class Foo < a:b; end},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
   end
 
   def test_class_invalid
@@ -1771,7 +1771,7 @@ class TestParser < Minitest::Test
       %q{def f(foo:); end},
       %q{      ~~~ name (args.kwarg)
         |      ~~~~ expression (args.kwarg)},
-      ALL_VERSIONS - %w(1.8 1.9 2.0))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
   end
 
   def test_kwoptarg
@@ -1782,7 +1782,7 @@ class TestParser < Minitest::Test
       %q{def f(foo: 1); end},
       %q{      ~~~ name (args.kwoptarg)
         |      ~~~~~~ expression (args.kwoptarg)},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
   end
 
   def test_kwrestarg_named
@@ -1793,7 +1793,7 @@ class TestParser < Minitest::Test
       %q{def f(**foo); end},
       %q{        ~~~ name (args.kwrestarg)
         |      ~~~~~ expression (args.kwrestarg)},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
   end
 
   def test_kwrestarg_unnamed
@@ -1803,7 +1803,7 @@ class TestParser < Minitest::Test
         nil),
       %q{def f(**); end},
       %q{      ~~ expression (args.kwrestarg)},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
   end
 
   def test_blockarg
@@ -1816,6 +1816,30 @@ class TestParser < Minitest::Test
         |      ~~~~~~ expression (args.blockarg)})
   end
 
+  def test_objc_arg
+    assert_parses(
+      s(:def, :f,
+        s(:args, s(:arg, :a), s(:objc_kwarg, :b, :c)),
+        nil),
+      %q{def f(a, b: c); end},
+      %q{         ~ keyword (args.objc_kwarg)
+        |          ~ operator (args.objc_kwarg)
+        |            ~ argument (args.objc_kwarg)
+        |         ~~~~ expression (args.objc_kwarg)},
+      %w(mac))
+
+    assert_parses(
+      s(:def, :f,
+        s(:args, s(:arg, :a), s(:objc_kwarg, :b, :c)),
+        nil),
+      %q{def f(a, b => c); end},
+      %q{         ~ keyword (args.objc_kwarg)
+        |           ~~ operator (args.objc_kwarg)
+        |              ~ argument (args.objc_kwarg)
+        |         ~~~~~~ expression (args.objc_kwarg)},
+      %w(mac))
+  end
+
   def test_arg_scope
     # [ruby-core:61299] [Bug #9593]
     assert_parses(
@@ -1824,7 +1848,7 @@ class TestParser < Minitest::Test
         s(:lvar, :var)),
       %q{def f(var = defined?(var)) var end},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9 2.0))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
 
     assert_parses(
       s(:def, :f,
@@ -1832,7 +1856,7 @@ class TestParser < Minitest::Test
         s(:lvar, :var)),
       %q{def f(var: defined?(var)) var end},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9 2.0))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
   end
 
   def assert_parses_args(ast, code, versions=ALL_VERSIONS)
@@ -1978,7 +2002,7 @@ class TestParser < Minitest::Test
         s(:kwrestarg, :baz),
         s(:blockarg, :b)),
       %q{(foo: 1, bar: 2, **baz, &b)},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
 
     # f_kwarg opt_f_block_arg
     assert_parses_args(
@@ -1986,7 +2010,7 @@ class TestParser < Minitest::Test
         s(:kwoptarg, :foo, s(:int, 1)),
         s(:blockarg, :b)),
       %q{(foo: 1, &b)},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
 
     # f_kwrest opt_f_block_arg
     assert_parses_args(
@@ -1994,14 +2018,14 @@ class TestParser < Minitest::Test
         s(:kwrestarg, :baz),
         s(:blockarg, :b)),
       %q{**baz, &b},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
 
     assert_parses_args(
       s(:args,
         s(:restarg),
         s(:kwrestarg)),
       %q{*, **},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
   end
 
   def test_kwarg_no_paren
@@ -2009,13 +2033,13 @@ class TestParser < Minitest::Test
       s(:args,
         s(:kwarg, :foo)),
       %Q{foo:\n},
-      ALL_VERSIONS - %w(1.8 1.9 2.0))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
 
     assert_parses_args(
       s(:args,
         s(:kwoptarg, :foo, s(:int, -1))),
       %Q{foo: -1\n},
-      ALL_VERSIONS - %w(1.8 1.9 2.0))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
   end
 
   def assert_parses_margs(ast, code, versions=ALL_VERSIONS - %w(1.8))
@@ -2078,6 +2102,20 @@ class TestParser < Minitest::Test
       %q{(*, p)})
   end
 
+  def test_marg_objc_restarg
+    assert_parses(
+      s(:def, :f,
+        s(:args,
+          s(:arg, :a),
+          s(:mlhs,
+            s(:objc_restarg, s(:objc_kwarg, :b, :c)))),
+        nil),
+      %Q{def f(a, (*b: c)); end},
+      %q{          ~ operator (args.mlhs.objc_restarg)
+        |          ~~~~~ expression (args.mlhs.objc_restarg)},
+      %w(mac))
+  end
+
   def assert_parses_blockargs(ast, code, versions=ALL_VERSIONS)
     assert_parses(
       s(:block,
@@ -2108,7 +2146,7 @@ class TestParser < Minitest::Test
     assert_parses_blockargs(
       s(:args, s(:shadowarg, :a)),
       %Q{|;\na\n|},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
 
     # tOROP
     assert_parses_blockargs(
@@ -2346,7 +2384,7 @@ class TestParser < Minitest::Test
         s(:kwrestarg, :baz),
         s(:blockarg, :b)),
       %q{|foo: 1, bar: 2, **baz, &b|},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
 
     # f_block_kwarg opt_f_block_arg
     assert_parses_blockargs(
@@ -2354,7 +2392,7 @@ class TestParser < Minitest::Test
         s(:kwoptarg, :foo, s(:int, 1)),
         s(:blockarg, :b)),
       %q{|foo: 1, &b|},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
 
     # f_kwrest opt_f_block_arg
     assert_parses_blockargs(
@@ -2362,7 +2400,7 @@ class TestParser < Minitest::Test
         s(:kwrestarg, :baz),
         s(:blockarg, :b)),
       %q{|**baz, &b|},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
   end
 
   def test_block_kwarg
@@ -2370,7 +2408,7 @@ class TestParser < Minitest::Test
       s(:args,
         s(:kwarg, :foo)),
       %q{|foo:|},
-      ALL_VERSIONS - %w(1.8 1.9 2.0))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
   end
 
   def test_arg_invalid
@@ -2447,21 +2485,21 @@ class TestParser < Minitest::Test
       %q{def foo(aa, aa: 1); end},
       %q{            ^^ location
         |        ~~ highlights (0)},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
 
     assert_diagnoses(
       [:error, :duplicate_argument],
       %q{def foo(aa, **aa); end},
       %q{              ^^ location
         |        ~~ highlights (0)},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
 
     assert_diagnoses(
       [:error, :duplicate_argument],
       %q{def foo(aa, aa:); end},
       %q{            ^^ location
         |        ~~ highlights (0)},
-      ALL_VERSIONS - %w(1.8 1.9 2.0))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
   end
 
   def test_arg_duplicate_ignored
@@ -2483,7 +2521,7 @@ class TestParser < Minitest::Test
       [:error, :duplicate_argument],
       %q{def foo(_a, _a); end},
       %q{},
-      %w(1.8 1.9))
+      %w(1.8 1.9 mac ios))
 
     assert_parses(
       s(:def, :foo,
@@ -2491,7 +2529,7 @@ class TestParser < Minitest::Test
         nil),
       %q{def foo(_a, _a); end},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
   end
 
   def test_arg_duplicate_proc
@@ -2515,13 +2553,13 @@ class TestParser < Minitest::Test
       [:error, :argument_const],
       %q{def foo(Abc: 1); end},
       %q{        ~~~~ location},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
 
     assert_diagnoses(
       [:error, :argument_const],
       %q{def foo(Abc:); end},
       %q{        ~~~~ location},
-      ALL_VERSIONS - %w(1.8 1.9 2.0))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
   end
 
   def test_arg_label
@@ -2604,6 +2642,17 @@ class TestParser < Minitest::Test
         |          ~~ highlights (0)})
   end
 
+  def test_send_objc_vararg
+    assert_parses(
+      s(:send, nil, :fun,
+        s(:int, 1),
+        s(:hash,
+          s(:pair, s(:sym, :bar), s(:objc_varargs, s(:int, 2), s(:int, 3), s(:nil))))),
+      %q{fun(1, bar: 2, 3, nil)},
+      %q{            ~~~~~~~~~ expression (hash.pair.objc_varargs)},
+      %w(mac))
+    end
+
   # To receiver
 
   def test_send_plain
@@ -2687,7 +2736,7 @@ class TestParser < Minitest::Test
       [:warning, :ambiguous_prefix, { :prefix => '**' }],
       %q{m **foo},
       %q{  ^^ location},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
   end
 
   def test_send_block_chain_cmd
@@ -2749,7 +2798,7 @@ class TestParser < Minitest::Test
         s(:args), nil),
       %q{meth 1 do end.fun bar do end},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
 
     assert_parses(
       s(:block,
@@ -2761,7 +2810,7 @@ class TestParser < Minitest::Test
         s(:args), nil),
       %q{meth 1 do end.fun(bar) {}},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
 
     assert_parses(
       s(:block,
@@ -2773,7 +2822,7 @@ class TestParser < Minitest::Test
         s(:args), nil),
       %q{meth 1 do end.fun {}},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
   end
 
   def test_send_paren_block_cmd
@@ -3110,7 +3159,7 @@ class TestParser < Minitest::Test
         nil),
       %q{-> (a) { }},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
   end
 
   def test_send_lambda_args_shadow
@@ -3126,6 +3175,26 @@ class TestParser < Minitest::Test
       ALL_VERSIONS - %w(1.8))
   end
 
+  def test_send_lambda_args_noparen
+    assert_parses(
+      s(:block, s(:send, nil, :lambda),
+        s(:args,
+          s(:kwoptarg, :a, s(:int, 1))),
+        nil),
+      %q{-> a: 1 { }},
+      %q{},
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
+
+    assert_parses(
+      s(:block, s(:send, nil, :lambda),
+        s(:args,
+          s(:kwarg, :a)),
+        nil),
+      %q{-> a: { }},
+      %q{},
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
+  end
+
   def test_send_call
     assert_parses(
       s(:send, s(:lvar, :foo), :call,
@@ -3422,6 +3491,14 @@ class TestParser < Minitest::Test
       %q{fun (1)})
   end
 
+  def test_space_args_arg_newline
+    assert_parses(
+      s(:send, nil, :fun, s(:begin, s(:int, 1))),
+      %Q{fun (1\n)},
+      %q{},
+      ALL_VERSIONS - %w(mac))
+  end
+
   def test_space_args_arg_block
     assert_parses(
       s(:block,
@@ -3702,7 +3779,7 @@ class TestParser < Minitest::Test
         s(:args), nil),
       %q{fun () {}},
       %q{    ~~ expression (send.begin)},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
   end
 
   #
@@ -4255,7 +4332,7 @@ class TestParser < Minitest::Test
       %q{break fun foo do end},
       %q{      ~~~~~~~~~~~~~~ expression (block)
         |~~~~~~~~~~~~~~~~~~~~ expression},
-      ALL_VERSIONS - %w(1.8))
+      ALL_VERSIONS - %w(1.8 ios))
   end
 
   def test_return
@@ -4302,7 +4379,7 @@ class TestParser < Minitest::Test
       %q{return fun foo do end},
       %q{       ~~~~~~~~~~~~~~ expression (block)
         |~~~~~~~~~~~~~~~~~~~~~ expression},
-      ALL_VERSIONS - %w(1.8))
+      ALL_VERSIONS - %w(1.8 ios))
   end
 
   def test_next
@@ -4349,7 +4426,7 @@ class TestParser < Minitest::Test
       %q{next fun foo do end},
       %q{     ~~~~~~~~~~~~~~ expression (block)
         |~~~~~~~~~~~~~~~~~~~ expression},
-      ALL_VERSIONS - %w(1.8))
+      ALL_VERSIONS - %w(1.8 ios))
   end
 
   def test_redo
@@ -4580,7 +4657,7 @@ class TestParser < Minitest::Test
       %q{def f; BEGIN{}; end},
       %q{       ~~~~~ location},
       # Yes. *Exclude 1.9*. Sigh.
-      ALL_VERSIONS - %w(1.9))
+      ALL_VERSIONS - %w(1.9 mac ios))
   end
 
   def test_postexe
@@ -4634,7 +4711,7 @@ class TestParser < Minitest::Test
             s(:int, 1)))),
       %q{p begin 1.times do 1 end end},
       %{},
-      ALL_VERSIONS - %w(1.8 1.9))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios))
   end
 
   def test_bug_cmdarg
@@ -4864,7 +4941,7 @@ class TestParser < Minitest::Test
             s(:args), nil))),
       %q{tap (proc do end)},
       %q{},
-      ALL_VERSIONS - %w(1.8))
+      ALL_VERSIONS - %w(1.8 mac ios))
   end
 
   def test_bug_interp_single
@@ -4917,7 +4994,7 @@ class TestParser < Minitest::Test
       s(:def, :a, s(:args, s(:kwarg, :b)), s(:return)),
       %Q{def a b:\nreturn\nend},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9 2.0))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
 
     assert_parses(
       s(:lvasgn, :o,
@@ -4925,7 +5002,7 @@ class TestParser < Minitest::Test
           s(:pair, s(:sym, :a), s(:int, 1)))),
       %Q{o = {\na:\n1\n}},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9 2.0))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
   end
 
   def test_ruby_bug_10279
@@ -4935,7 +5012,36 @@ class TestParser < Minitest::Test
         s(:if, s(:true), s(:int, 42), nil))),
       %q{{a: if true then 42 end}},
       %q{},
-      ALL_VERSIONS - %w(1.8 1.9 2.0))
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
+  end
+
+  def test_ruby_bug_11107
+    assert_parses(
+      s(:send, nil, :p,
+        s(:block,
+          s(:send, nil, :lambda),
+          s(:args),
+          s(:block, s(:send, nil, :a), s(:args), nil))),
+      %q{p ->() do a() do end end},
+      %q{},
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0)) # no 1.9 backport
+  end
+
+  def test_ruby_bug_11380
+    assert_parses(
+      s(:block,
+        s(:send, nil, :p,
+          s(:block,
+            s(:send, nil, :lambda),
+            s(:args),
+            s(:sym, :hello)),
+          s(:hash,
+            s(:pair, s(:sym, :a), s(:int, 1)))),
+        s(:args),
+        nil),
+      %q{p -> { :hello }, a: 1 do end},
+      %q{},
+      ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0)) # no 1.9 backport
   end
 
   def test_parser_bug_198