parser 2.5.1.0 → 2.5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d4445244332537a2a91b8b6f6a2d35b750ffb1dbc3869c91f1a4de840a89600
-  data.tar.gz: 800b3adeae6c64459f2b604c3c4b935eb728018bfe4136debae16c96df0384bf
+  metadata.gz: 74690ed0b42a0adf60b87ac491252301383d408f49c94b3ca57569f731bba610
+  data.tar.gz: bcfab73accb005126ca982eba28ceff93539f4f2b84523e1f31fe9d11f898808
 SHA512:
-  metadata.gz: 99138e99f88e016a3da7cac3fe45c492068fe5fa5ecb6df640ade2f6890c05fdc2aff096d255e0fd57f75f4e5c3300c15f16fa9be177e9fdc56711c6e6ea29ac
-  data.tar.gz: 71504873b9c22a3adfd0d0ee304e69e3317b93d52a7e2506c6225e2c768cea2ddd9bf1a874a04c8b0706047f78dc97f49b7841307f64198678f03a3336ad2675
+  metadata.gz: 4b84846a1eff219eb607276d2b21a3e9c3e08ffc527aa5eb221ae73712e3b3d461ede2b9fae72a995db4dc761d3dc438fd81f2b278bdf577a39a08b04ceb2364
+  data.tar.gz: 3a0febdb064269e6e0ef29e84d86f75c2b9b7ef2ab004e0fe25734d7a58ae947a2507eab90926c28a86cf9fb761c5882205633d25b37639c4807b4ee9bac9e7e

data/CHANGELOG.md

@@ -1,9 +1,21 @@
 Changelog
 =========
 
-Not released (2018-04-12)
+Not released (2018-07-10)
 -------------------------
 
+Features implemented:
+ * ruby26.y: Endless ranges support. (Ilya Bylich)
+
+Bugs fixed:
+ * lexer.rl: Fix parsing of 'm = -> *args do end'. (Ilya Bylich)
+ * AST::Processor: Properly recurse into "kwsplat" nodes (Nelson Elhage)
+ * ruby24, ruby25, ruby26: Fix cmdargs after command_args followed by tLBRACE_ARG. This commit tracks upstream commit ruby/ruby@f168dbd. (Ilya Bylich)
+ * lexer.rl: Fix parsing of `let (:a) { m do; end }`. (Ilya Bylich)
+
+v2.5.1.0 (2018-04-12)
+---------------------
+
 API modifications:
  * Parser::Current: bump latest 2.2 branch to 2.2.10. (Ilya Bylich)
 

data/README.md

@@ -217,7 +217,7 @@ at some point.
 Sometimes it is necessary to modify the format of AST nodes that are already being emitted
 in a way that would break existing applications. To avoid such breakage, applications
 must opt-in to these modifications; without explicit opt-in, Parser will continue to emit
-the old AST node format. The most recent set of opt-ins is speified in
+the old AST node format. The most recent set of opt-ins is specified in
 the [usage section](#usage) of this README.
 
 ## Compatibility with Ruby MRI

data/doc/AST_FORMAT.md

@@ -322,6 +322,23 @@ Format:
  ~~~~~ expression
 ~~~
 
+
+### Endless (2.6)
+
+Format:
+
+~~~
+(irange (int 1) nil)
+"1.."
+  ~~ operator
+ ~~~ expression
+
+(erange (int 1) nil)
+"1..."
+  ~~~ operator
+ ~~~~ expression
+~~~
+
 ## Access
 
 ### Self
@@ -1293,8 +1310,8 @@ Format:
  ~~~~~~ keyword
              ~~~~ begin
                           ~~~~ else
-                                     ~~~ end
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ expression
+                                         ~~~ end
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ expression
 
 "unless cond; iftrue; else; iffalse; end"
  ~~~~~~ keyword

data/lib/parser/ast/processor.rb

@@ -16,6 +16,7 @@ module Parser
       alias on_regexp   process_regular_node
       alias on_xstr     process_regular_node
       alias on_splat    process_regular_node
+      alias on_kwsplat  process_regular_node
       alias on_array    process_regular_node
       alias on_pair     process_regular_node
       alias on_hash     process_regular_node

data/lib/parser/builders/default.rb

@@ -400,12 +400,12 @@ module Parser
 
     def range_inclusive(lhs, dot2_t, rhs)
       n(:irange, [ lhs, rhs ],
-        binary_op_map(lhs, dot2_t, rhs))
+        range_map(lhs, dot2_t, rhs))
     end
 
     def range_exclusive(lhs, dot3_t, rhs)
       n(:erange, [ lhs, rhs ],
-        binary_op_map(lhs, dot3_t, rhs))
+        range_map(lhs, dot3_t, rhs))
     end
 
     #
@@ -1388,6 +1388,16 @@ module Parser
       Source::Map::Operator.new(loc(op_t), expr_l)
     end
 
+    def range_map(start_e, op_t, end_e)
+      if end_e
+        expr_l = join_exprs(start_e, end_e)
+      else
+        expr_l = start_e.loc.expression.join(loc(op_t))
+      end
+
+      Source::Map::Operator.new(loc(op_t), expr_l)
+    end
+
     def arg_prefix_map(op_t, name_t=nil)
       if name_t.nil?
         expr_l = loc(op_t)

data/lib/parser/lexer.rl

@@ -1628,7 +1628,7 @@ class Parser::Lexer
         else
           emit(:tLBRACE_ARG, '{'.freeze)
         end
-        fnext expr_value;
+        fnext expr_value; fbreak;
       };
 
       'do'
@@ -2249,7 +2249,7 @@ class Parser::Lexer
       ( operator_arithmetic | operator_rest ) - ( '|' | '~' | '!' )
       => {
         emit_table(PUNCTUATION);
-        fnext expr_value; fbreak;
+        fgoto expr_value;
       };
 
       ( e_lparen | '|' | '~' | '!' )

data/lib/parser/lexer/stack_state.rb

@@ -35,6 +35,10 @@ module Parser
       @stack[0] == 1
     end
 
+    def empty?
+      @stack == 0
+    end
+
     def to_s
       "[#{@stack.to_s(2)} <= #{@name}]"
     end

data/lib/parser/ruby24.y

@@ -875,7 +875,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/ruby25.y

@@ -885,7 +885,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]
                     }
@@ -1504,7 +1517,7 @@ opt_block_args_tail:
                     {
                       @context.push(:lambda)
                     }
-                  bodystmt kEND
+                  compstmt kEND
                     {
                       result = [ val[0], val[2], val[3] ]
                       @context.pop

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.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/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/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.1'
 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,46 @@ 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
 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.1
 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