parser 2.3.0.pre.2 → 2.3.0.pre.3

data/lib/parser/rubymotion.y

@@ -7,7 +7,7 @@ token kCLASS kMODULE kDEF kUNDEF kBEGIN kRESCUE kENSURE kEND kIF kUNLESS
       kUNTIL_MOD kRESCUE_MOD kALIAS kDEFINED klBEGIN klEND k__LINE__
       k__FILE__ k__ENCODING__ tIDENTIFIER tFID tGVAR tIVAR tCONSTANT
       tLABEL tCVAR tNTH_REF tBACK_REF tSTRING_CONTENT tINTEGER tFLOAT
-      tREGEXP_END tUPLUS tUMINUS tUMINUS_NUM tPOW tCMP tEQ tEQQ tNEQ
+      tUPLUS tUMINUS tUMINUS_NUM tPOW tCMP tEQ tEQQ tNEQ
       tGEQ tLEQ tANDOP tOROP tMATCH tNMATCH tDOT tDOT2 tDOT3 tAREF
       tASET tLSHFT tRSHFT tCOLON2 tCOLON3 tOP_ASGN tASSOC tLPAREN
       tLPAREN2 tRPAREN tLPAREN_ARG tLBRACK tLBRACK2 tRBRACK tLBRACE

data/lib/parser/runner.rb

@@ -12,6 +12,8 @@ module Parser
     end
 
     def initialize
+      Parser::Builders::Default.modernize
+
       @option_parser = OptionParser.new { |opts| setup_option_parsing(opts) }
       @parser_class  = nil
       @parser        = nil
@@ -82,6 +84,11 @@ module Parser
         @parser_class = Parser::Ruby22
       end
 
+      opts.on '--23', 'Parse as Ruby 2.3 would' do
+        require 'parser/ruby23'
+        @parser_class = Parser::Ruby23
+      end
+
       opts.on '--mac', 'Parse as MacRuby 0.12 would' do
         require 'parser/macruby'
         @parser_class = Parser::MacRuby

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
 
@@ -226,13 +228,15 @@ module Parser
         @line_begins
       end
 
-      def line_for(position)
-        if line_begins.respond_to? :bsearch
+      if [].respond_to?(:bsearch)
+        def line_for(position)
           # Fast O(log n) variant for Ruby >=2.0.
           line_begins.bsearch do |line, line_begin|
             line_begin <= position
           end
-        else
+        end
+      else
+        def line_for(position)
           # Slower O(n) variant for Ruby <2.0.
           line_begins.find do |line, line_begin|
             line_begin <= position

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.3.0.pre.2'
+  VERSION = '2.3.0.pre.3'
 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
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler',   '~> 1.2'
   spec.add_development_dependency 'rake',      '~> 10.0'
-  spec.add_development_dependency 'racc',      '= 1.4.9' # update to 1.4.11 when it's done
+  spec.add_development_dependency 'racc',      '= 1.4.13'
   spec.add_development_dependency 'cliver',    '~> 0.3.0'
 
   spec.add_development_dependency 'yard'

data/test/parse_helper.rb

@@ -7,11 +7,10 @@ module ParseHelper
     ALL_VERSIONS = %w(1.8)
   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 mac ios)
+    ALL_VERSIONS = %w(1.8 1.9 2.0 2.1 2.2 2.3 mac ios)
   end
 
   def setup
@@ -27,6 +26,7 @@ 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 '2.3' then parser = Parser::Ruby23.new
     when 'mac' then parser = Parser::MacRuby.new
     when 'ios' then parser = Parser::RubyMotion.new
     else raise "Unrecognized Ruby version #{version}"

data/test/test_current.rb

@@ -15,7 +15,7 @@ class TestCurrent < Minitest::Test
     when /^2\.2\.\d+/
       assert_equal Parser::Ruby22, Parser::CurrentRuby
     when /^2\.3\.\d+/
-      assert_equal Parser::Ruby22, Parser::CurrentRuby
+      assert_equal Parser::Ruby23, Parser::CurrentRuby
     else
       flunk "Update test_current for #{RUBY_VERSION}"
     end

data/test/test_lexer.rb

@@ -226,6 +226,12 @@ class TestLexer < Minitest::Test
     assert_lex_fname "&", :tAMPER2
   end
 
+  def test_and_dot
+    @lex.state = :expr_cmdarg
+
+    assert_scanned "&.", :tANDDOT, "&."
+  end
+
   def test_assoc
     assert_scanned "=>", :tASSOC, "=>"
   end
@@ -2296,6 +2302,34 @@ class TestLexer < Minitest::Test
     end
   end
 
+  #
+  # Test for 'fluent interface'
+  #
+
+  def test_fluent_dot
+    assert_scanned("x\n.y",
+                   :tIDENTIFIER, 'x',
+                   :tDOT,        '.',
+                   :tIDENTIFIER, 'y')
+
+    assert_scanned("x\n  .y",
+                   :tIDENTIFIER, 'x',
+                   :tDOT,        '.',
+                   :tIDENTIFIER, 'y')
+
+    assert_scanned("x # comment\n  .y",
+                   :tIDENTIFIER, 'x',
+                   :tDOT,        '.',
+                   :tIDENTIFIER, 'y')
+  end
+
+  def test_fluent_and_dot
+    assert_scanned("x\n&.y",
+                   :tIDENTIFIER, 'x',
+                   :tANDDOT,     '&.',
+                   :tIDENTIFIER, 'y')
+  end
+
   #
   # Tests for whitespace.
   #

data/test/test_parser.rb

@@ -3,6 +3,8 @@
 require 'helper'
 require 'parse_helper'
 
+Parser::Builders::Default.modernize
+
 class TestParser < Minitest::Test
   include ParseHelper
 
@@ -361,15 +363,20 @@ class TestParser < Minitest::Test
   end
 
   def test_regex_error
-    # The tests work on 1.8, but with a different message.
+    begin
+      Regexp.new("?")
+    rescue RegexpError => e
+      message = e.message
+    end
+
     assert_diagnoses(
-      [:error, :invalid_regexp, {:message => 'target of repeat operator is not specified: /?/'}],
+      [:error, :invalid_regexp, {:message => message}],
       %q[/?/],
       %q(~~~ location),
       ALL_VERSIONS - %w(1.8))
 
     assert_diagnoses(
-      [:error, :invalid_regexp, {:message => 'target of repeat operator is not specified: /?/'}],
+      [:error, :invalid_regexp, {:message => message}],
       %q[/#{""}?/],
       %q(~~~~~~~~ location),
       ALL_VERSIONS - %w(1.8))
@@ -3106,20 +3113,20 @@ class TestParser < Minitest::Test
 
   def test_send_lambda
     assert_parses(
-      s(:block, s(:send, nil, :lambda),
+      s(:block, s(:lambda),
         s(:args), nil),
       %q{->{ }},
-      %q{~~ selector (send)
+      %q{~~ expression (lambda)
         |  ^ begin
         |    ^ end
         |~~~~~ expression},
       ALL_VERSIONS - %w(1.8))
 
     assert_parses(
-      s(:block, s(:send, nil, :lambda),
+      s(:block, s(:lambda),
         s(:args, s(:restarg)), nil),
       %q{-> * { }},
-      %q{~~ selector (send)
+      %q{~~ expression (lambda)
         |     ^ begin
         |       ^ end
         |   ^ expression (args.restarg)
@@ -3127,10 +3134,10 @@ class TestParser < Minitest::Test
       ALL_VERSIONS - %w(1.8))
 
     assert_parses(
-      s(:block, s(:send, nil, :lambda),
+      s(:block, s(:lambda),
         s(:args), nil),
       %q{-> do end},
-      %q{~~ selector (send)
+      %q{~~ expression (lambda)
         |   ^^ begin
         |      ^^^ end
         |~~~~~~~~~ expression},
@@ -3139,12 +3146,12 @@ class TestParser < Minitest::Test
 
   def test_send_lambda_args
     assert_parses(
-      s(:block, s(:send, nil, :lambda),
+      s(:block, s(:lambda),
         s(:args,
           s(:arg, :a)),
         nil),
       %q{->(a) { }},
-      %q{~~ selector (send)
+      %q{~~ expression (lambda)
         |  ^ begin (args)
         |    ^ end (args)
         |      ^ begin
@@ -3153,7 +3160,7 @@ class TestParser < Minitest::Test
       ALL_VERSIONS - %w(1.8))
 
     assert_parses(
-      s(:block, s(:send, nil, :lambda),
+      s(:block, s(:lambda),
         s(:args,
           s(:arg, :a)),
         nil),
@@ -3164,7 +3171,7 @@ class TestParser < Minitest::Test
 
   def test_send_lambda_args_shadow
     assert_parses(
-      s(:block, s(:send, nil, :lambda),
+      s(:block, s(:lambda),
         s(:args,
           s(:arg, :a),
           s(:shadowarg, :foo),
@@ -3175,6 +3182,40 @@ class TestParser < Minitest::Test
       ALL_VERSIONS - %w(1.8))
   end
 
+  def test_send_lambda_args_noparen
+    assert_parses(
+      s(:block, s(: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(: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_lambda_legacy
+    Parser::Builders::Default.emit_lambda = false
+    assert_parses(
+      s(:block, s(:send, nil, :lambda),
+        s(:args), nil),
+      %q{->{ }},
+      %q{~~ selector (send)
+        |  ^ begin
+        |    ^ end
+        |~~~~~ expression},
+      ALL_VERSIONS - %w(1.8))
+    Parser::Builders::Default.emit_lambda = true
+  end
+
   def test_send_call
     assert_parses(
       s(:send, s(:lvar, :foo), :call,
@@ -3197,6 +3238,22 @@ class TestParser < Minitest::Test
       ALL_VERSIONS - %w(1.8))
   end
 
+  def test_send_conditional
+    assert_parses(
+      s(:csend, s(:send, nil, :a), :b),
+      %q{a&.b},
+      %q{ ^^ dot},
+      ALL_VERSIONS - %w(1.8 1.9 2.0 2.1 2.2 ios mac))
+  end
+
+  def test_send_attr_asgn_conditional
+    assert_parses(
+      s(:csend, s(:send, nil, :a), :b=, s(:int, 1)),
+      %q{a&.b = 1},
+      %q{ ^^ dot},
+      ALL_VERSIONS - %w(1.8 1.9 2.0 2.1 2.2 ios mac))
+  end
+
   def test_lvar_injecting_match
     assert_parses(
       s(:begin,
@@ -4724,7 +4781,7 @@ class TestParser < Minitest::Test
           s(:pair,
             s(:sym, :x),
             s(:block,
-              s(:send, nil, :lambda),
+              s(:lambda),
               s(:args),
               s(:block,
                 s(:send, nil, :meth),
@@ -4999,12 +5056,29 @@ class TestParser < Minitest::Test
     assert_parses(
       s(:send, nil, :p,
         s(:block,
-          s(:send, nil, :lambda),
+          s(: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 mac ios backport
+      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(: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
@@ -5023,7 +5097,7 @@ class TestParser < Minitest::Test
     assert_parses(
       s(:begin,
         s(:block,
-          s(:send, nil, :lambda),
+          s(:lambda),
           s(:args,
             s(:arg, :scope)), nil),
         s(:send, nil, :scope)),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.3.0.pre.2
+  version: 2.3.0.pre.3
 platform: ruby
 authors:
-- Peter Zotov
+- whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.9
+        version: 1.4.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.9
+        version: 1.4.13
 - !ruby/object:Gem::Dependency
   name: cliver
   requirement: !ruby/object:Gem::Requirement
@@ -284,6 +284,7 @@ files:
 - lib/parser/ruby21.y
 - lib/parser/ruby22.rb
 - lib/parser/ruby22.y
+- lib/parser/ruby23.y
 - lib/parser/rubymotion.rb
 - lib/parser/rubymotion.y
 - lib/parser/runner.rb