parser 2.7.1.2 → 2.7.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e95a182ac672d1917e517628161ab896f34d4518df71430e0b349998817308e0
-  data.tar.gz: 24175a8fa5f50956127930f697ba4f09ae0561c359d9fea4ea19883c8c7c072a
+  metadata.gz: bab855c4abc633b9ba13f855d816f20948ee539f27bea7878b574f4d0b3232f7
+  data.tar.gz: 929aa201a2c06738c6202c8efb2afd2dda77e630805738007c39f3b8274fa717
 SHA512:
-  metadata.gz: 95e17dd645e2240c9b3f6d7972a03d2c0df0305548920643c9d930ed3fa8b6aee8da77211b11d80a4d3f651aa75c1c2d43e51daa46aca163bd292ba91e9bcc0e
-  data.tar.gz: e9b989147352537fb1460a71585ace1165f5bca6d3baa01fde8f83a5b951c305bb37bab9ac93b019c70b728e6152ecd178f07935c335aab5e0f3a8ee4caf83a8
+  metadata.gz: 78e2e37d1ef61d2c125c1462ecb2e48ab8f76a06fd97bcba28ea4acd5fa60f77a296f859fd6ad67a787027b7a9e62d0fc34bedc8c23522bce21213d1ca49d780
+  data.tar.gz: 07fa5ad8fe63b8503ced8fa0143062385f1d2f99e542f80cc32375269a9ad75f07cc2b0e00838232a71a9e797ba5cab28b661d8a58765f558e29353462641f06

data/.travis.yml

@@ -19,10 +19,10 @@ matrix:
       script: bundle exec rake test_cov
     - name: jruby-9.1.15.0 / Parser tests
       rvm: jruby-9.1.15.0
-      script: bundle exec rake test_cov
-    - name: rbx-2 / Parser tests
-      rvm: rbx-2
-      script: bundle exec rake test_cov
+      script: bundle exec rake test
+    - name: truffleruby / Parser tests
+      rvm: truffleruby
+      script: bundle exec rake test
     - name: 2.5.8 / Rubocop tests
       rvm: 2.5.8
       script: ./ci/run_rubocop_specs
@@ -34,9 +34,7 @@ matrix:
       script: ./ci/run_rubocop_specs
   allow_failures:
     - rvm: ruby-head
-    - rvm: rbx-2
     - script: ./ci/run_rubocop_specs
 before_install:
-  - gem install bundler -v '< 2'
   - bundle --version
   - gem --version

data/CHANGELOG.md

@@ -1,9 +1,25 @@
 Changelog
 =========
 
-Not released (2020-04-30)
+Not released (2020-05-26)
 -------------------------
 
+API modifications:
+ * fixed all warnings. tests are running in verbose mode now. (#685) (Ilya Bylich)
+
+Features implemented:
+ * ruby-[parse, rewrite]: add legacy switches (#699) (Marc-André Lafortune)
+ * Added Parser::Source::Range#to_range. (#697) (Ilya Bylich)
+ * ruby28.y: support rescue modifier in endless method definition. (#696) (Ilya Bylich)
+ * ruby28.y: unify kwrest and no-kwrest rules. (#694) (Ilya Bylich)
+ * ruby28.y: add right hand assignment (#682) (Vladimir Dementyev)
+
+Bugs fixed:
+ * fix Comment.associate for postfix conditions/loops (#688) (Marc-André Lafortune)
+
+v2.7.1.2 (2020-04-30)
+---------------------
+
 Features implemented:
  * ruby28.y: endless method definition (#676) (Vladimir Dementyev)
  * ruby28.y: branch parser (#677) (Vladimir Dementyev)

data/README.md

@@ -59,8 +59,7 @@ Parse a chunk of code and display all diagnostics:
       puts diag.render
     end
 
-    buffer = Parser::Source::Buffer.new('(string)')
-    buffer.source = "foo *bar"
+    buffer = Parser::Source::Buffer.new('(string)', source: "foo *bar")
 
     p parser.parse(buffer)
     # (string):1:5: warning: `*' interpreted as argument prefix

data/Rakefile

@@ -11,7 +11,7 @@ task :default => [:test]
 Rake::TestTask.new do |t|
   t.libs       = %w(test/ lib/)
   t.test_files = FileList["test/**/test_*.rb"]
-  t.warning    = false
+  t.warning    = true
 end
 
 task :test_cov do

data/doc/AST_FORMAT.md

@@ -730,6 +730,28 @@ Format:
 
 ~~~
 
+### Right-hand assignment
+
+Format:
+
+~~~
+(rasgn (int 1) (lvasgn :a))
+"1 => a"
+ ~~~~~~ expression
+   ~~ operator
+~~~
+
+#### Multiple right-hand assignment
+
+Format:
+
+~~~
+(mrasgn (send (int 13) :divmod (int 5)) (mlhs (lvasgn :a) (lvasgn :b)))
+"13.divmod(5) => a,b"
+ ~~~~~~~~~~~~~~~~~~~ expression
+              ^^ operator
+~~~
+
 ## Class and module definition
 
 ### Module

data/lib/parser/ast/processor.rb

@@ -75,6 +75,9 @@ module Parser
       alias on_mlhs     process_regular_node
       alias on_masgn    process_regular_node
 
+      alias on_rasgn    process_regular_node
+      alias on_mrasgn   process_regular_node
+
       def on_const(node)
         scope_node, name = *node
 

data/lib/parser/builders/default.rb

@@ -619,6 +619,15 @@ module Parser
         binary_op_map(lhs, eql_t, rhs))
     end
 
+    def rassign(lhs, assoc_t, rhs)
+      n(:rasgn, [lhs, rhs], binary_op_map(lhs, assoc_t, rhs))
+    end
+
+    def multi_rassign(lhs, assoc_t, rhs)
+      n(:mrasgn, [ lhs, rhs ],
+        binary_op_map(lhs, assoc_t, rhs))
+    end
+
     #
     # Class and module definition
     #

data/lib/parser/diagnostic.rb

@@ -67,7 +67,7 @@ module Parser
     # @return [String] the rendered message.
     #
     def message
-      MESSAGES[@reason] % @arguments
+      Messages.compile(@reason, @arguments)
     end
 
     ##

data/lib/parser/diagnostic/engine.rb

@@ -7,8 +7,7 @@ module Parser
   # diagnostics by delegating them to registered consumers.
   #
   # @example
-  #  buffer      = Parser::Source::Buffer.new(__FILE__)
-  #  buffer.code = 'foobar'
+  #  buffer      = Parser::Source::Buffer.new(__FILE__, source: 'foobar')
   #
   #  consumer = lambda do |diagnostic|
   #    puts diagnostic.message

data/lib/parser/lexer.rl

@@ -283,6 +283,13 @@ class Parser::Lexer
     %% write exec;
     # %
 
+    # Ragel creates a local variable called `testEof` but it doesn't use
+    # it in any assignment. This dead code is here to swallow the warning.
+    # It has no runtime cost because Ruby doesn't produce any instructions from it.
+    if false
+      testEof
+    end
+
     @p = p
 
     if @token_queue.any?

data/lib/parser/messages.rb

@@ -93,4 +93,19 @@ module Parser
     :crossing_insertions           => 'the rewriting action on:',
     :crossing_insertions_conflict  => 'is crossing that on:',
   }.freeze
+
+  # @api private
+  module Messages
+    # Formats the message, returns a raw template if there's nothing to interpolate
+    #
+    # Code like `format("", {})` gives a warning, and so this method tries interpolating
+    # only if `arguments` hash is not empty.
+    #
+    # @api private
+    def self.compile(reason, arguments)
+      template = MESSAGES[reason]
+      return template if Hash === arguments && arguments.empty?
+      format(template, arguments)
+    end
+  end
 end

data/lib/parser/meta.rb

@@ -12,7 +12,7 @@ module Parser
         sym dsym xstr regopt regexp array splat
         pair kwsplat hash irange erange self
         lvar ivar cvar gvar const defined? lvasgn
-        ivasgn cvasgn gvasgn casgn mlhs masgn
+        ivasgn cvasgn gvasgn casgn mlhs masgn rasgn mrasgn
         op_asgn and_asgn ensure rescue arg_expr
         or_asgn back_ref nth_ref
         match_with_lvasgn match_current_line

data/lib/parser/ruby28.y

@@ -206,8 +206,26 @@ rule
                     {
                       result = @builder.multi_assign(val[0], val[1], val[2])
                     }
+                | rassign
                 | expr
 
+        rassign: arg_value tASSOC lhs
+                    {
+                      result = @builder.rassign(val[0], val[1], val[2])
+                    }
+                | arg_value tASSOC mlhs
+                    {
+                      result = @builder.multi_rassign(val[0], val[1], val[2])
+                    }
+                | rassign tASSOC lhs
+                    {
+                      result = @builder.rassign(val[0], val[1], val[2])
+                    }
+                | rassign tASSOC mlhs
+                    {
+                      result = @builder.multi_rassign(val[0], val[1], val[2])
+                    }
+
     command_asgn: lhs tEQL command_rhs
                     {
                       result = @builder.assign(val[0], val[1], val[2])
@@ -851,6 +869,23 @@ rule
                       result = @builder.def_endless_method(*val[0],
                                  val[1], val[2], val[3])
 
+                      @lexer.cmdarg.pop
+                      @lexer.cond.pop
+                      @static_env.unextend
+                      @context.pop
+                      @current_arg_stack.pop
+                    }
+                | defn_head f_paren_args tEQL arg kRESCUE_MOD arg
+                    {
+                      rescue_body = @builder.rescue_body(val[4],
+                                        nil, nil, nil,
+                                        nil, val[5])
+
+                      method_body = @builder.begin_body(val[3], [ rescue_body ])
+
+                      result = @builder.def_endless_method(*val[0],
+                                 val[1], val[2], method_body)
+
                       @lexer.cmdarg.pop
                       @lexer.cond.pop
                       @static_env.unextend
@@ -862,6 +897,23 @@ rule
                       result = @builder.def_endless_singleton(*val[0],
                                  val[1], val[2], val[3])
 
+                      @lexer.cmdarg.pop
+                      @lexer.cond.pop
+                      @static_env.unextend
+                      @context.pop
+                      @current_arg_stack.pop
+                    }
+                | defs_head f_paren_args tEQL arg kRESCUE_MOD arg
+                    {
+                      rescue_body = @builder.rescue_body(val[4],
+                                        nil, nil, nil,
+                                        nil, val[5])
+
+                      method_body = @builder.begin_body(val[3], [ rescue_body ])
+
+                      result = @builder.def_endless_singleton(*val[0],
+                                 val[1], val[2], method_body)
+
                       @lexer.cmdarg.pop
                       @lexer.cond.pop
                       @static_env.unextend
@@ -1401,6 +1453,9 @@ rule
                       result = @builder.restarg(val[0])
                     }
 
+    f_any_kwrest: f_kwrest
+                | f_no_kwarg
+
  block_args_tail: f_block_kwarg tCOMMA f_kwrest opt_f_block_arg
                     {
                       result = val[0].concat(val[2]).concat(val[3])
@@ -1409,11 +1464,7 @@ rule
                     {
                       result = val[0].concat(val[1])
                     }
-                | f_kwrest opt_f_block_arg
-                    {
-                      result = val[0].concat(val[1])
-                    }
-                | f_no_kwarg opt_f_block_arg
+                | f_any_kwrest opt_f_block_arg
                     {
                       result = val[0].concat(val[1])
                     }
@@ -2012,7 +2063,7 @@ opt_block_args_tail:
 
            p_arg: p_expr
 
-        p_kwargs: p_kwarg tCOMMA p_kwrest
+        p_kwargs: p_kwarg tCOMMA p_any_kwrest
                     {
                       result = [ *val[0], *val[2] ]
                     }
@@ -2024,18 +2075,10 @@ opt_block_args_tail:
                     {
                       result = val[0]
                     }
-                | p_kwrest
+                | p_any_kwrest
                     {
                       result = val[0]
                     }
-                | p_kwarg tCOMMA p_kwnorest
-                    {
-                      result = [ *val[0], *val[2] ]
-                    }
-                | p_kwnorest
-                    {
-                      result = [ *val[0], *val[2] ]
-                    }
 
          p_kwarg: p_kw
                     {
@@ -2079,6 +2122,9 @@ opt_block_args_tail:
                       result = [ @builder.match_nil_pattern(val[0], val[1]) ]
                     }
 
+    p_any_kwrest: p_kwrest
+                | p_kwnorest
+
          p_value: p_primitive
                 | p_primitive tDOT2 p_primitive
                     {
@@ -2579,11 +2625,7 @@ keyword_variable: kNIL
                     {
                       result = val[0].concat(val[1])
                     }
-                | f_kwrest opt_f_block_arg
-                    {
-                      result = val[0].concat(val[1])
-                    }
-                | f_no_kwarg opt_f_block_arg
+                | f_any_kwrest opt_f_block_arg
                     {
                       result = val[0].concat(val[1])
                     }

data/lib/parser/runner.rb

@@ -14,9 +14,8 @@ module Parser
     end
 
     def initialize
-      Parser::Builders::Default.modernize
-
       @option_parser = OptionParser.new { |opts| setup_option_parsing(opts) }
+      @legacy = {}
       @parser_class  = nil
       @parser        = nil
       @files         = []
@@ -30,6 +29,7 @@ module Parser
 
     def execute(options)
       parse_options(options)
+      setup_builder_default
       prepare_parser
 
       process_all_input
@@ -37,6 +37,8 @@ module Parser
 
     private
 
+    LEGACY_MODES = %i[lambda procarg0 encoding index arg_inside_procarg0].freeze
+
     def runner_name
       raise NotImplementedError, "implement #{self.class}##{__callee__}"
     end
@@ -126,6 +128,17 @@ module Parser
         @parser_class = Parser::RubyMotion
       end
 
+      opts.on '--legacy', "Parse with all legacy modes" do
+        @legacy = Hash.new(true)
+      end
+
+      LEGACY_MODES.each do |mode|
+        opt_name = "--legacy-#{mode.to_s.gsub('_', '-')}"
+        opts.on opt_name, "Parse with legacy mode for emit_#{mode}" do
+          @legacy[mode] = true
+        end
+      end
+
       opts.on '-w', '--warnings', 'Enable warnings' do |w|
         @warnings = w
       end
@@ -164,6 +177,12 @@ module Parser
       end
     end
 
+    def setup_builder_default
+      LEGACY_MODES.each do |mode|
+        Parser::Builders::Default.send(:"emit_#{mode}=", !@legacy[mode])
+      end
+    end
+
     def prepare_parser
       @parser = @parser_class.new
 

data/lib/parser/runner/ruby_rewrite.rb

@@ -55,8 +55,8 @@ module Parser
         new_source = rewriter.rewrite(buffer, ast)
 
         new_buffer = Source::Buffer.new(initial_buffer.name +
-                                    '|after ' + rewriter_class.name)
-        new_buffer.source = new_source
+                                    '|after ' + rewriter_class.name,
+                                    source: new_source)
 
         @parser.reset
         new_ast = @parser.parse(new_buffer)

data/lib/parser/source/buffer.rb

@@ -102,7 +102,7 @@ module Parser
         end
       end
 
-      def initialize(name, first_line = 1)
+      def initialize(name, first_line = 1, source: nil)
         @name        = name.to_s
         @source      = nil
         @first_line  = first_line
@@ -116,6 +116,8 @@ module Parser
         # Cache for fast lookup
         @line_for_position   = {}
         @column_for_position = {}
+
+        self.source = source if source
       end
 
       ##

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

@@ -107,6 +107,19 @@ module Parser
 
       private
 
+      POSTFIX_TYPES = Set[:if, :while, :while_post, :until, :until_post].freeze
+      def children_in_source_order(node)
+        if POSTFIX_TYPES.include?(node.type)
+          # All these types have either nodes with expressions, or `nil`
+          # so a compact will do, but they need to be sorted.
+          node.children.compact.sort_by { |child| child.loc.expression.begin_pos }
+        else
+          node.children.select do |child|
+            child.is_a?(AST::Node) && child.loc && child.loc.expression
+          end
+        end
+      end
+
       def do_associate
         @mapping     = Hash.new { |h, k| h[k] = [] }
         @comment_num = -1
@@ -131,10 +144,7 @@ module Parser
         node_loc = node.location
         if @current_comment.location.line <= node_loc.last_line ||
            node_loc.is_a?(Map::Heredoc)
-          node.children.each do |child|
-            next unless child.is_a?(AST::Node) && child.loc && child.loc.expression
-            visit(child)
-          end
+          children_in_source_order(node).each { |child| visit(child) }
 
           process_trailing_comments(node)
         end