parser 2.5.1.0 → 2.5.1.2

data/lib/parser/ruby26.y

@@ -665,6 +665,14 @@ rule
                     {
                       result = @builder.range_exclusive(val[0], val[1], val[2])
                     }
+                | arg tDOT2
+                    {
+                      result = @builder.range_inclusive(val[0], val[1], nil)
+                    }
+                | arg tDOT3
+                    {
+                      result = @builder.range_exclusive(val[0], val[1], nil)
+                    }
                 | arg tPLUS arg
                     {
                       result = @builder.binary_op(val[0], val[1], val[2])
@@ -885,7 +893,20 @@ rule
                     }
                   call_args
                     {
-                      @lexer.cmdarg.pop
+                      # call_args can be followed by tLBRACE_ARG (that does cmdarg.push(0) in the lexer)
+                      # but the push must be done after cmdarg.pop() in the parser.
+                      # So this code does cmdarg.pop() to pop 0 pushed by tLBRACE_ARG,
+                      # cmdarg.pop() to pop 1 pushed by command_args,
+                      # and cmdarg.push(0) to restore back the flag set by tLBRACE_ARG.
+                      last_token = @last_token[0]
+                      lookahead = last_token == :tLBRACE_ARG
+                      if lookahead
+                        top = @lexer.cmdarg.pop
+                        @lexer.cmdarg.pop
+                        @lexer.cmdarg.push(top)
+                      else
+                        @lexer.cmdarg.pop
+                      end
 
                       result = val[1]
                     }

data/lib/parser/source/buffer.rb

@@ -46,7 +46,7 @@ module Parser
       # magic encoding comment or UTF-8 BOM. `string` can be in any encoding.
       #
       # @param [String]  string
-      # @return [String|nil] encoding name, if recognized
+      # @return [String, nil] encoding name, if recognized
       #
       def self.recognize_encoding(string)
         return if string.empty?

data/lib/parser/source/comment/associator.rb

@@ -47,7 +47,7 @@ module Parser
 
       ##
       # @param [Parser::AST::Node] ast
-      # @param [Array(Parser::Source::Comment)] comments
+      # @param [Array<Parser::Source::Comment>] comments
       def initialize(ast, comments)
         @ast         = ast
         @comments    = comments
@@ -85,7 +85,7 @@ module Parser
       # Note that {associate} produces unexpected result for nodes which are
       # equal but have distinct locations; comments for these nodes are merged.
       #
-      # @return [Hash(Parser::AST::Node, Array(Parser::Source::Comment))]
+      # @return [Hash<Parser::AST::Node, Array<Parser::Source::Comment>>]
       # @deprecated Use {associate_locations}.
       #
       def associate
@@ -98,7 +98,7 @@ module Parser
       # the hash key, thus producing an unambiguous result even in presence
       # of equal nodes.
       #
-      # @return [Hash(Parser::Source::Map, Array(Parser::Source::Comment))]
+      # @return [Hash<Parser::Source::Map, Array<Parser::Source::Comment>>]
       #
       def associate_locations
         @map_using_locations = true

data/lib/parser/source/comment.rb

@@ -24,8 +24,8 @@ module Parser
       # Associate `comments` with `ast` nodes by their corresponding node.
       #
       # @param [Parser::AST::Node] ast
-      # @param [Array(Comment)]    comments
-      # @return [Hash(Parser::AST::Node, Array(Comment))]
+      # @param [Array<Comment>]    comments
+      # @return [Hash<Parser::AST::Node, Array<Comment>>]
       # @see Parser::Source::Comment::Associator#associate
       # @deprecated Use {associate_locations}.
       #
@@ -39,8 +39,8 @@ module Parser
       # source.
       #
       # @param [Parser::AST::Node] ast
-      # @param [Array(Comment)]    comments
-      # @return [Hash(Parser::Source::Map, Array(Comment))]
+      # @param [Array<Comment>]    comments
+      # @return [Hash<Parser::Source::Map, Array<Comment>>]
       # @see Parser::Source::Comment::Associator#associate_locations
       #
       def self.associate_locations(ast, comments)

data/lib/parser/source/map.rb

@@ -161,7 +161,7 @@ module Parser
       #  #   :expression => #<Source::Range (string) 0...6>
       #  # }
       #
-      # @return [Hash(Symbol, Parser::Source::Range)]
+      # @return [Hash<Symbol, Parser::Source::Range>]
       #
       def to_hash
         instance_variables.inject({}) do |hash, ivar|

data/lib/parser/source/range.rb

@@ -143,7 +143,7 @@ module Parser
       end
 
       ##
-      # @return [Array(Integer)] a set of character indexes contained in this range.
+      # @return [Array<Integer>] a set of character indexes contained in this range.
       #
       def to_a
         (@begin_pos...@end_pos).to_a

data/lib/parser/source/tree_rewriter.rb

@@ -133,8 +133,8 @@ module Parser
       # Inserts the given strings before and after the given range.
       #
       # @param [Range] range
-      # @param [String or nil] insert_before
-      # @param [String or nil] insert_after
+      # @param [String, nil] insert_before
+      # @param [String, nil] insert_after
       # @return [Rewriter] self
       # @raise [ClobberingError] when clobbering is detected
       #

data/lib/parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parser
-  VERSION = '2.5.1.0'
+  VERSION = '2.5.1.2'
 end

data/test/parse_helper.rb

@@ -124,7 +124,7 @@ module ParseHelper
       assert_source_range(begin_pos, end_pos, range, version, line.inspect)
     end
 
-    assert_equal parser.instance_eval { @lexer }.cmdarg.instance_eval { @stack }, 0,
+    assert parser.instance_eval { @lexer }.cmdarg.empty?,
       "(#{version}) expected cmdarg to be empty after parsing"
   end
 

data/test/test_parser.rb

@@ -833,6 +833,24 @@ class TestParser < Minitest::Test
         |~~~~~ expression})
   end
 
+  def test_range_endless
+    assert_parses(
+      s(:irange,
+        s(:int, 1), nil),
+      %q{1..},
+      %q{~~~ expression
+        | ~~ operator},
+      SINCE_2_6)
+
+    assert_parses(
+      s(:erange,
+        s(:int, 1), nil),
+      %q{1...},
+      %q{~~~~ expression
+        | ~~~ operator},
+      SINCE_2_6)
+  end
+
   #
   # Access
   #
@@ -6658,7 +6676,7 @@ class TestParser < Minitest::Test
       [:error, :unexpected_token, { :token => 'kRESCUE'}],
       %q{-> do rescue; end},
       %q{      ~~~~~~ location},
-      SINCE_1_9 - SINCE_2_5)
+      SINCE_1_9 - SINCE_2_6)
 
     assert_parses(
       s(:block,
@@ -6668,7 +6686,7 @@ class TestParser < Minitest::Test
           s(:resbody, nil, nil, nil), nil)),
       %q{-> do rescue; end},
       %q{      ~~~~~~ keyword (rescue.resbody)},
-      SINCE_2_5)
+      SINCE_2_6)
 
     assert_diagnoses(
       [:error, :unexpected_token, { :token => 'kRESCUE'}],
@@ -6965,4 +6983,56 @@ class TestParser < Minitest::Test
       %q{      ^ location},
       SINCE_2_2)
   end
+
+  def test_lbrace_arg_after_command_args
+    assert_parses(
+      s(:block,
+        s(:send, nil, :let,
+          s(:begin,
+            s(:sym, :a))),
+        s(:args),
+        s(:block,
+          s(:send, nil, :m),
+          s(:args), nil)),
+      %q{let (:a) { m do; end }},
+      %q{},
+      ALL_VERSIONS)
+  end
+
+  def test_ruby_bug_14690
+    assert_parses(
+      s(:block,
+        s(:send, nil, :let,
+          s(:begin)),
+        s(:args),
+        s(:block,
+          s(:send, nil, :m,
+            s(:send, nil, :a)),
+          s(:args), nil)),
+      %q{let () { m(a) do; end }},
+      %q{},
+      SINCE_2_0)
+  end
+
+  def test_parser_bug_507
+    assert_parses(
+      s(:lvasgn, :m,
+        s(:block,
+          s(:lambda),
+          s(:args,
+            s(:restarg, :args)), nil)),
+      %q{m = -> *args do end},
+      %q{},
+      SINCE_1_9)
+  end
+
+  def test_parser_bug_518
+    assert_parses(
+      s(:class,
+        s(:const, nil, :A),
+        s(:const, nil, :B), nil),
+      "class A < B\nend",
+      %q{},
+      ALL_VERSIONS)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.5.1.0
+  version: 2.5.1.2
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast