ripper_ruby_parser 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20d34b3ba8f1c186e8df1118334a231d2520c9ef51a36b4c7d5b12c33fe9947b
-  data.tar.gz: 881e3286d632c0189a33a2add98dd43bddda798cf6c7c8f3fa75e1b9dfdda7e3
+  metadata.gz: 16ae34997256487e8611f1c1128bfa3f0ededad4befbdcba5cae435e957e4382
+  data.tar.gz: 9751a46aeaa42e05bc52587fa0fee46b64e0b45204b9cbf651f7492d7e6bde90
 SHA512:
-  metadata.gz: f3a58dd16a10a8c0f64996c753e2da3c02d7b0ec074099795bf240925e388a5edb215edf680df0c70baab82c42ea77d22762d2a2b27a7a9a246aa01bb47753a1
-  data.tar.gz: 7b360aaea5ba1fe76855a4e534d56aec13b1a470f7cc9e539d4e2c996ef0684848142ea6c4d2e522c439e84d62628ebaf571da5c993e9a44a0f9641d8e3283df
+  metadata.gz: c31670a8b6d911f7679096feb5d1b01e2c67a7aec7694eb7f4ac932c2f335f24e5996074bd0857614e8f508c093f639d644f3ab4555de97c68f1ea601f4fd586
+  data.tar.gz: 2668135d139b2c4c5cb3da3f036bc7653896239a48846bbae4fe18056bb751f21e00618c8b2d7b90f3de3e504f4dfb959e442f3f302b253bcf777a0232329950

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.7.0 / 2019-11-01
+
+* Make results compatible with RubyParser 3.14.0 ([#85])
+  - Remove obsolete extra-compatible behavior
+  - Parse stabby lambda as :lambda-typed sexp
+  - Emit nil argument for block arguments with trailing comma
+* Require Ruby 2.4 or higher ([#86])
+
 ## 1.6.1 / 2019-04-22
 
 * Improve line numbering for some block structures ([#82])

data/README.md

@@ -10,28 +10,16 @@ Parse with Ripper, produce sexps that are compatible with RubyParser.
 
 * Drop-in replacement for RubyParser
 * Should handle 1.9 and later syntax gracefully
-* Requires MRI 2.3 or higher
-* Compatible with RubyParser 3.13.1
+* Requires Ruby 2.4 or higher
+* Compatible with RubyParser 3.14.0
 
 ## Known incompatibilities
 
-RipperRubyParser has some incompatibilities with RubyParser. For some of these,
-the behavior can be changed by turning on extra-compatible mode.
-
-The following incompatibilities cannot be changed:
+RipperRubyParser has a few incompatibilities with RubyParser.
 
 * RipperRubyParser won't handle non-UTF-8 files without an encoding comment,
   just like regular Ruby
-* RipperRubyParser does not match RubyParser's line numbering
-* RipperRubyParser correctly dedents heredocs with interpolations
-
-The following incompatibilities can be made compatible by turning on
-extra-compatible mode:
-
-* Operator assignment of a method call without parentheses to a collection
-  element uses an `:array` S-expression instead of `:arglist`
-* RipperRubyParser keeps carriage return characters in heredocs that include
-  them
+* RipperRubyParser does not always match RubyParser's line numbering
 
 ## Install
 
@@ -50,13 +38,6 @@ parser.parse "foo[bar] += baz qux"
 #      s(:arglist, s(:call, nil, :bar)),
 #      :+,
 #      s(:call, nil, :baz, s(:call, nil, :qux)))
-parser.extra_compatible = true
-
-parser.parse "foo[bar] += baz qux"
-# => s(:op_asgn1, s(:call, nil, :foo),
-#      s(:array, s(:call, nil, :bar)),
-#      :+,
-#      s(:call, nil, :baz, s(:call, nil, :qux)))
 ```
 
 ## Requirements

data/Rakefile

@@ -1,33 +1,33 @@
 # frozen_string_literal: true
 
-require 'rake/clean'
-require 'bundler/gem_tasks'
-require 'rake/testtask'
+require "rake/clean"
+require "bundler/gem_tasks"
+require "rake/testtask"
 
 namespace :test do
   Rake::TestTask.new(:unit) do |t|
-    t.libs = ['lib']
-    t.test_files = FileList['test/ripper_ruby_parser/**/*_test.rb']
+    t.libs = ["lib"]
+    t.test_files = FileList["test/ripper_ruby_parser/**/*_test.rb"]
     t.warning = true
   end
 
   Rake::TestTask.new(:end_to_end) do |t|
-    t.libs = ['lib']
-    t.test_files = FileList['test/end_to_end/*_test.rb']
+    t.libs = ["lib"]
+    t.test_files = FileList["test/end_to_end/*_test.rb"]
     t.warning = true
   end
 
   Rake::TestTask.new(:pt_testcase) do |t|
-    t.libs = ['lib']
-    t.test_files = FileList['test/pt_testcase/*_test.rb']
+    t.libs = ["lib"]
+    t.test_files = FileList["test/pt_testcase/*_test.rb"]
     t.warning = true
   end
 
-  desc 'Run all three test suites'
+  desc "Run all three test suites"
   task run: [:unit, :end_to_end, :pt_testcase]
 end
 
-desc 'Alias to test:run'
-task test: 'test:run'
+desc "Alias to test:run"
+task test: "test:run"
 
 task default: :test

data/lib/ripper_ruby_parser.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-require 'ripper_ruby_parser/version'
-require 'ripper_ruby_parser/parser'
+require "ripper_ruby_parser/version"
+require "ripper_ruby_parser/parser"

data/lib/ripper_ruby_parser/commenting_ripper_parser.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'ripper'
-require 'ripper_ruby_parser/syntax_error'
-require 'ripper_ruby_parser/unescape'
+require "ripper"
+require "ripper_ruby_parser/syntax_error"
+require "ripper_ruby_parser/unescape"
 
 module RipperRubyParser
   # Variant of Ripper's SexpBuilder parser class that inserts comments as
@@ -12,7 +12,7 @@ module RipperRubyParser
   class CommentingRipperParser < Ripper::SexpBuilder
     def initialize(*args)
       super
-      @comment = ''
+      @comment = ""
       @comment_stack = []
       @delimiter_stack = []
       @space_before = false
@@ -22,7 +22,7 @@ module RipperRubyParser
 
     def parse
       result = super
-      raise 'Ripper parse failed.' unless result
+      raise "Ripper parse failed." unless result
 
       Sexp.from_array(result)
     end
@@ -60,10 +60,10 @@ module RipperRubyParser
     def on_kw(tok)
       result = super
       case tok
-      when 'class', 'def', 'module', 'BEGIN', 'begin', 'END'
+      when "class", "def", "module", "BEGIN", "begin", "END"
         unless @in_symbol
           @comment_stack.push [result, @comment]
-          @comment = ''
+          @comment = ""
         end
       end
       result
@@ -255,7 +255,7 @@ module RipperRubyParser
     def on_unary(operator, value)
       if !@space_before && operator == :-@ && NUMBER_LITERAL_TYPES.include?(value.first)
         type, literal, lines = value
-        if literal[0] == '-'
+        if literal[0] == "-"
           super
         else
           [type, "-#{literal}", lines]
@@ -317,7 +317,7 @@ module RipperRubyParser
 
     def commentize(_name, exp)
       (_, _kw, loc), comment = @comment_stack.pop
-      @comment = ''
+      @comment = ""
       exp.push loc
       [:comment, comment, exp]
     end

data/lib/ripper_ruby_parser/parser.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'ripper_ruby_parser/commenting_ripper_parser'
-require 'ripper_ruby_parser/sexp_processor'
+require "ripper_ruby_parser/commenting_ripper_parser"
+require "ripper_ruby_parser/sexp_processor"
 
 module RipperRubyParser
   # Main parser class. Brings together Ripper and our
@@ -13,7 +13,7 @@ module RipperRubyParser
       @extra_compatible = false
     end
 
-    def parse(source, filename = '(string)', lineno = 1)
+    def parse(source, filename = "(string)", lineno = 1)
       parser = CommentingRipperParser.new(source, filename, lineno)
       exp = parser.parse
 

data/lib/ripper_ruby_parser/sexp_handlers.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'ripper_ruby_parser/sexp_handlers/helper_methods'
+require "ripper_ruby_parser/sexp_handlers/helper_methods"
 
-require 'ripper_ruby_parser/sexp_handlers/assignment'
-require 'ripper_ruby_parser/sexp_handlers/blocks'
-require 'ripper_ruby_parser/sexp_handlers/conditionals'
-require 'ripper_ruby_parser/sexp_handlers/literals'
-require 'ripper_ruby_parser/sexp_handlers/loops'
-require 'ripper_ruby_parser/sexp_handlers/method_calls'
-require 'ripper_ruby_parser/sexp_handlers/methods'
-require 'ripper_ruby_parser/sexp_handlers/operators'
+require "ripper_ruby_parser/sexp_handlers/assignment"
+require "ripper_ruby_parser/sexp_handlers/blocks"
+require "ripper_ruby_parser/sexp_handlers/conditionals"
+require "ripper_ruby_parser/sexp_handlers/literals"
+require "ripper_ruby_parser/sexp_handlers/loops"
+require "ripper_ruby_parser/sexp_handlers/method_calls"
+require "ripper_ruby_parser/sexp_handlers/methods"
+require "ripper_ruby_parser/sexp_handlers/operators"
 
 module RipperRubyParser
   # Umbrella module for handlers of particular sexp types

data/lib/ripper_ruby_parser/sexp_handlers/assignment.rb

@@ -96,11 +96,10 @@ module RipperRubyParser
         _, lvalue, (_, operator,), value = exp.shift 4
 
         lvalue = process(lvalue)
-        original_value_type = value.sexp_type
         value = process(value)
         operator = operator.chop.to_sym
 
-        create_operator_assignment_sub_type lvalue, value, operator, original_value_type
+        create_operator_assignment_sub_type lvalue, value, operator
       end
 
       private
@@ -123,16 +122,11 @@ module RipperRubyParser
         '&&': :op_asgn_and
       }.freeze
 
-      def create_operator_assignment_sub_type(lvalue, value, operator, original_value_type)
+      def create_operator_assignment_sub_type(lvalue, value, operator)
         case lvalue.sexp_type
         when :aref_field
           _, arr, arglist = lvalue
-          arglist.sexp_type = if extra_compatible &&
-                                 [:command, :command_call].include?(original_value_type)
-                                :array
-                              else
-                                :arglist
-                              end
+          arglist.sexp_type = :arglist
           s(:op_asgn1, arr, arglist, operator, value)
         when :field
           _, obj, _, (_, field) = lvalue

data/lib/ripper_ruby_parser/sexp_handlers/blocks.rb

@@ -58,27 +58,23 @@ module RipperRubyParser
         rescue_block = map_process_list_compact block.sexp_body
         rescue_block << nil if rescue_block.empty?
 
-        capture = if eclass
-                    if eclass.first.is_a? Symbol
-                      eclass = process(eclass)
-                      body = eclass.sexp_body
-                      if eclass.sexp_type == :mrhs
-                        body.first
-                      else
-                        s(:array, *body)
-                      end
+        capture = if eclass.nil?
+                    s(:array)
+                  elsif eclass.first.is_a? Symbol
+                    eclass = process(eclass)
+                    body = eclass.sexp_body
+                    if eclass.sexp_type == :mrhs
+                      body.first
                     else
-                      s(:array, process(eclass.first))
+                      s(:array, *body)
                     end
                   else
-                    s(:array)
+                    s(:array, process(eclass.first))
                   end
 
         capture << create_assignment_sub_type(process(evar), s(:gvar, :$!)) if evar
 
-        s(
-          s(:resbody, capture, *rescue_block),
-          *process(after))
+        s(s(:resbody, capture, *rescue_block), *process(after))
       end
 
       def process_bodystmt(exp)
@@ -91,13 +87,9 @@ module RipperRubyParser
         main = wrap_in_block reject_void_stmt main_list
         body << main if main
 
-        if rescue_block
-          body.push(*process(rescue_block))
-          body << process(else_block) if else_block
-          body = s(s(:rescue, *body))
-        elsif else_block
-          body << process(else_block)
-        end
+        body.push(*process(rescue_block)) if rescue_block
+        body << process(else_block) if else_block
+        body = s(s(:rescue, *body)) if rescue_block
 
         if ensure_block
           body << process(ensure_block)
@@ -143,7 +135,7 @@ module RipperRubyParser
         old_type = args.sexp_type
         args = convert_arguments(process(args))
         args = nil if args == s(:args) && old_type == :params
-        make_iter(s(:call, nil, :lambda),
+        make_iter(s(:lambda),
                   args,
                   safe_unwrap_void_stmt(process(statements)))
       end
@@ -167,7 +159,10 @@ module RipperRubyParser
       end
 
       def handle_splat(splat)
-        if splat && splat != 0
+        if splat == 0
+          # Only relevant for Ruby < 2.6
+          [s(:excessed_comma)]
+        elsif splat
           [process(splat)]
         else
           []
@@ -209,7 +204,7 @@ module RipperRubyParser
       end
 
       def make_iter(call, args, stmt)
-        args.pop if args && args.last == s(:excessed_comma)
+        args[-1] = nil if args && args.last == s(:excessed_comma)
         args ||= 0
         if stmt.empty?
           s(:iter, call, args)

data/lib/ripper_ruby_parser/sexp_handlers/literals.rb

@@ -31,16 +31,16 @@ module RipperRubyParser
         when :str, :dstr
           val
         when :void_stmt
-          s(:dstr, '', s(:evstr))
+          s(:dstr, "", s(:evstr))
         else
-          s(:dstr, '', s(:evstr, val))
+          s(:dstr, "", s(:evstr, val))
         end
       end
 
       def process_string_dvar(exp)
         _, list = exp.shift 2
         val = process(list)
-        s(:dstr, '', s(:evstr, val))
+        s(:dstr, "", s(:evstr, val))
       end
 
       def process_string_concat(exp)
@@ -81,7 +81,7 @@ module RipperRubyParser
           return with_line_number(content.line, s(:lit, Regexp.new(content.last, numflags)))
         end
 
-        content.sexp_type = :dregx_once if flags =~ /o/
+        content.sexp_type = :dregx_once if /o/.match?(flags)
         content << numflags unless numflags == 0
         content
       end
@@ -121,11 +121,11 @@ module RipperRubyParser
 
       INTERPOLATING_HEREDOC = /^<<[-~]?[^-~']/.freeze
       NON_INTERPOLATING_HEREDOC = /^<<[-~]?'/.freeze
-      INTERPOLATING_STRINGS = ['"', '`', ':"', /^%Q.$/, /^%.$/].freeze
+      INTERPOLATING_STRINGS = ['"', "`", ':"', /^%Q.$/, /^%.$/].freeze
       NON_INTERPOLATING_STRINGS = ["'", ":'", /^%q.$/].freeze
       INTERPOLATING_WORD_LIST = /^%[WI].$/.freeze
       NON_INTERPOLATING_WORD_LIST = /^%[wi].$/.freeze
-      REGEXP_LITERALS = ['/', /^%r.$/].freeze
+      REGEXP_LITERALS = ["/", /^%r.$/].freeze
 
       def process_at_tstring_content(exp)
         _, content, pos, delim = exp.shift 4
@@ -166,7 +166,7 @@ module RipperRubyParser
       private
 
       def extract_string_parts(list)
-        return nil, '', [] if list.empty?
+        return nil, "", [] if list.empty?
 
         list = merge_raw_string_literals list
         list = map_process_list list
@@ -184,7 +184,7 @@ module RipperRubyParser
           end
         end
 
-        string = ''
+        string = ""
         while parts.first&.sexp_type == :str
           str = parts.shift
           line ||= str.line
@@ -210,12 +210,12 @@ module RipperRubyParser
       def character_flags_to_numerical(flags)
         numflags = 0
 
-        numflags = Regexp::MULTILINE if flags =~ /m/
-        numflags |= Regexp::EXTENDED if flags =~ /x/
-        numflags |= Regexp::IGNORECASE if flags =~ /i/
+        numflags = Regexp::MULTILINE if /m/.match?(flags)
+        numflags |= Regexp::EXTENDED if /x/.match?(flags)
+        numflags |= Regexp::IGNORECASE if /i/.match?(flags)
 
-        numflags |= Regexp::NOENCODING if flags =~ /n/
-        numflags |= Regexp::FIXEDENCODING if flags =~ /[ues]/
+        numflags |= Regexp::NOENCODING if /n/.match?(flags)
+        numflags |= Regexp::FIXEDENCODING if /[ues]/.match?(flags)
 
         numflags
       end
@@ -260,11 +260,7 @@ module RipperRubyParser
       def handle_string_unescaping(content, delim)
         case delim
         when INTERPOLATING_HEREDOC
-          if extra_compatible
-            unescape(content).delete("\r")
-          else
-            unescape(content)
-          end
+          unescape(content)
         when *INTERPOLATING_STRINGS
           unescape(content)
         when INTERPOLATING_WORD_LIST

data/lib/ripper_ruby_parser/sexp_handlers/methods.rb

@@ -92,9 +92,9 @@ module RipperRubyParser
       end
 
       SPECIAL_ARG_MARKER = {
-        splat: '*',
-        dsplat: '**',
-        blockarg: '&'
+        splat: "*",
+        dsplat: "**",
+        blockarg: "&"
       }.freeze
 
       def convert_arguments(args)