ripper_ruby_parser 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12102f722ef4074c0f6d46d207dba7dac580d0af
-  data.tar.gz: edf3dc287249ae2f0ccedb39e2f3cfdae622daff
+  metadata.gz: 6208b988b475f510fcd23c57a01d13e63fd65c7c
+  data.tar.gz: 4f304bdc21ab91d786939d6f0ca944e5ab26b9ac
 SHA512:
-  metadata.gz: 9450f761539fbf3b3d662447497ef1fa7a220a02e9656139bb35d305863cde02a1364b9c9802dcd20883a0c6be16f7d8e80aa4529409445bf280d07e5d4a29fb
-  data.tar.gz: 231ced88a63860467aa18a66c37513b49e232dc9aff74c03d6ba6b7b1ac5d30bf284616ec50d05e38385b66237c3086cb78fe526aeae648b6dd1f4a8dda8a85b
+  metadata.gz: 9a2bce59fdea7e315b2e75eb4420e1eab669883981d95550cda0697509b888744c9b06fffb02b6eddb13fec5a3e009ab683091fc2eabdf49d76d8c844b61a324
+  data.tar.gz: 63992855bcb74ba262ea1bfa156960f41a8d948322926ceac6cf0d41fbd200a0b3cecb1fb8d4f07ba87766c8f0b7ce3aec54876216819404dcc1946fba5f2830

data/CHANGELOG.md

@@ -0,0 +1,30 @@
+# Change log
+
+## 1.1.0 / 2017-10-02
+
+* Compatible with RubyParser 3.10.x
+* Add support for Ruby 2.2, 2.3 and 2.4
+* Drop support for Ruby 1.9.3
+
+## 1.0.0 / 2014-02-07
+
+* First major release
+* Compatible with RubyParser 3.3.x
+
+## 0.0.8 / 2012-06-22
+
+## 0.0.7 / 2012-06-08
+
+## 0.0.6 / 2012-04-04
+
+## 0.0.5 / 2012-04-02
+
+## 0.0.4 / 2012-03-31
+
+## 0.0.3 / 2012-03-21
+
+## 0.0.2 / 2012-03-19
+
+## 0.0.1 / 2012-03-11
+
+* Initial release

data/README.md

@@ -12,7 +12,7 @@ Parse with Ripper, produce sexps that are compatible with RubyParser.
 
 * Drop-in replacement for RubyParser.
 * Should handle 1.9 and later syntax gracefully.
-* Needs MRI 1.9.3 or higher
+* Needs MRI 2.0 or higher
 
 ## Install
 
@@ -29,7 +29,7 @@ Parse with Ripper, produce sexps that are compatible with RubyParser.
 
 ## Requirements
 
-* Ruby 1.9.3 or higher
+* Ruby 2.0 or higher
 * sexp_processor
 
 ## Hacking and contributing
@@ -49,7 +49,7 @@ If you want to send pull requests or patches, please:
 
 (The MIT License)
 
-Copyright (c) 2012, 2014 Matijs van Zuijlen
+Copyright (c) 2012, 2014-2017 Matijs van Zuijlen
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -3,7 +3,6 @@ require "bundler/gem_tasks"
 require 'rake/testtask'
 
 namespace :test do
-
   Rake::TestTask.new(:unit) do |t|
     t.libs = ['lib']
     t.test_files = FileList['test/unit/*_test.rb']
@@ -22,10 +21,11 @@ namespace :test do
     t.warning = true
   end
 
-  task :run => [:unit, :end_to_end, :pt_testcase]
+  desc "Run all three test suites"
+  task run: [:unit, :end_to_end, :pt_testcase]
 end
 
 desc 'Alias to test:run'
-task :test => 'test:run'
+task test: 'test:run'
 
-task :default => :test
+task default: :test

data/lib/ripper_ruby_parser/commenting_ripper_parser.rb

@@ -77,23 +77,23 @@ module RipperRubyParser
     end
 
     def on_parse_error *args
-      raise SyntaxError.new(*args)
+      raise SyntaxError, *args
     end
 
     def on_class_name_error *args
-      raise SyntaxError.new(*args)
+      raise SyntaxError, *args
     end
 
     def on_alias_error *args
-      raise SyntaxError.new(*args)
+      raise SyntaxError, *args
     end
 
     def on_assign_error *args
-      raise SyntaxError.new(*args)
+      raise SyntaxError, *args
     end
 
     def on_param_error *args
-      raise SyntaxError.new(*args)
+      raise SyntaxError, *args
     end
 
     private
@@ -108,8 +108,6 @@ module RipperRubyParser
       [:comment, comment || "", exp]
     end
 
-    private
-
     def suppress_warnings
       old_verbose = $VERBOSE
       $VERBOSE = nil

data/lib/ripper_ruby_parser/parser.rb

@@ -7,12 +7,12 @@ module RipperRubyParser
   class Parser
     attr_accessor :extra_compatible
 
-    def initialize processor=SexpProcessor.new
+    def initialize processor = SexpProcessor.new
       @processor = processor
       @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
 
@@ -28,4 +28,3 @@ module RipperRubyParser
     end
   end
 end
-

data/lib/ripper_ruby_parser/sexp_handlers/arguments.rb

@@ -4,9 +4,7 @@ module RipperRubyParser
       def process_args_add_block exp
         _, regular, block = exp.shift 3
         args = handle_potentially_typeless_sexp(regular)
-        if block
-          args << s(:block_pass, process(block))
-        end
+        args << s(:block_pass, process(block)) if block
         s(:arglist, *args)
       end
 
@@ -17,9 +15,7 @@ module RipperRubyParser
       def process_arg_paren exp
         _, args = exp.shift 2
         args = s() if args.nil?
-        unless args.first.is_a? Symbol
-          args.unshift :arglist
-        end
+        args.unshift :arglist unless args.first.is_a? Symbol
         process(args)
       end
 

data/lib/ripper_ruby_parser/sexp_handlers/assignment.rb

@@ -35,7 +35,7 @@ module RipperRubyParser
         when :fake_array
           right[0] = :array
         when :splat
-          # Do nothing
+          nil # Do nothing
         else
           right = s(:to_ary, right)
         end
@@ -45,7 +45,7 @@ module RipperRubyParser
 
       def process_mrhs_new_from_args exp
         _, inner, last = exp.shift 3
-        inner.map! {|item| process(item)}
+        inner.map! { |item| process(item) }
         inner.push process(last) unless last.nil?
         s(:fake_array, *inner)
       end
@@ -79,7 +79,7 @@ module RipperRubyParser
 
         lvalue = process(lvalue)
         value = process(value)
-        operator = operator[1].gsub(/=/, '').to_sym
+        operator = operator[1].delete('=').to_sym
 
         create_operator_assignment_sub_type lvalue, value, operator
       end
@@ -100,17 +100,17 @@ module RipperRubyParser
         end
       end
 
-      def create_valueless_assignment_sub_type(item)
+      def create_valueless_assignment_sub_type item
         item = with_line_number(item.line,
                                 create_regular_assignment_sub_type(item, nil))
         item.pop
-        return item
+        item
       end
 
       OPERATOR_ASSIGNMENT_MAP = {
         :"||" => :op_asgn_or,
         :"&&" => :op_asgn_and
-      }
+      }.freeze
 
       def create_operator_assignment_sub_type lvalue, value, operator
         case lvalue.sexp_type
@@ -146,16 +146,16 @@ module RipperRubyParser
       end
 
       ASSIGNMENT_SUB_TYPE_MAP = {
-        :ivar => :iasgn,
-        :const => :cdecl,
-        :lvar => :lasgn,
-        :cvar => :cvdecl,
-        :gvar => :gasgn
-      }
+        ivar: :iasgn,
+        const: :cdecl,
+        lvar: :lasgn,
+        cvar: :cvdecl,
+        gvar: :gasgn
+      }.freeze
 
       ASSIGNMENT_IN_METHOD_SUB_TYPE_MAP = {
-        :cvar => :cvasgn
-      }
+        cvar: :cvasgn
+      }.freeze
 
       def create_assignment_sub_type lvalue, value
         s(map_assignment_lvalue_type(lvalue.sexp_type), lvalue[1], value)
@@ -163,10 +163,9 @@ module RipperRubyParser
 
       def map_assignment_lvalue_type type
         @in_method_body && ASSIGNMENT_IN_METHOD_SUB_TYPE_MAP[type] ||
-        ASSIGNMENT_SUB_TYPE_MAP[type] ||
-        type
+          ASSIGNMENT_SUB_TYPE_MAP[type] ||
+          type
       end
     end
   end
 end
-

data/lib/ripper_ruby_parser/sexp_handlers/blocks.rb

@@ -36,7 +36,7 @@ module RipperRubyParser
         end
 
         args << process(splat) unless splat.nil? || splat == 0
-        [*rest].each {|arg| args << process(arg)}
+        [*rest].each { |arg| args << process(arg) }
         args << process(block) unless block.nil?
 
         s(:args, *args)
@@ -148,8 +148,9 @@ module RipperRubyParser
 
       def process_lambda exp
         _, args, statements = exp.shift 3
+        old_type = args.sexp_type
         args = convert_special_args(process(args))
-        args = 0 if args == s(:args)
+        args = 0 if args == s(:args) && old_type == :params
         make_iter(s(:call, nil, :lambda),
                   args,
                   *handle_potentially_typeless_sexp(statements))
@@ -160,12 +161,11 @@ module RipperRubyParser
       def handle_generic_block exp
         _, args, stmts = exp.shift 3
         args = process(args)
-        args = 0 if args == s(:args)
         # FIXME: Symbol :block is irrelevant.
         s(:block, args, s(wrap_in_block(map_body(stmts))))
       end
 
-      def strip_typeless_sexp(block)
+      def strip_typeless_sexp block
         case block.length
         when 0
           s(:nil)
@@ -177,7 +177,7 @@ module RipperRubyParser
       end
 
       def make_iter call, args, stmt
-        args = s(:args) unless args
+        args ||= 0
         if stmt.nil?
           s(:iter, call, args)
         else

data/lib/ripper_ruby_parser/sexp_handlers/conditionals.rb

@@ -71,19 +71,18 @@ module RipperRubyParser
 
       private
 
-      def handle_condition(cond)
+      def handle_condition cond
         cond = process(cond)
         if (cond.sexp_type == :lit) && cond[1].is_a?(Regexp)
-          cond = s(:match, cond)
+          s(:match, cond)
         elsif cond.sexp_type == :dot2
-          cond = s(:flip2, *cond[1..-1])
+          s(:flip2, *cond[1..-1])
         elsif cond.sexp_type == :dot3
-          cond = s(:flip3, *cond[1..-1])
+          s(:flip3, *cond[1..-1])
+        else
+          cond
         end
-        return cond
       end
-
     end
   end
 end
-

data/lib/ripper_ruby_parser/sexp_handlers/hashes.rb

@@ -25,14 +25,13 @@ module RipperRubyParser
 
       def make_hash_items elems
         result = s()
-        elems.each {|sub_exp|
-          process(sub_exp).each {|elm|
+        elems.each do |sub_exp|
+          process(sub_exp).each do |elm|
             result << elm
-          }
-        }
+          end
+        end
         result
       end
     end
   end
 end
-

data/lib/ripper_ruby_parser/sexp_handlers/helper_methods.rb

@@ -11,22 +11,20 @@ module RipperRubyParser
         end
       end
 
-      def handle_potentially_typeless_sexp_with_fallback_type type, exp
+      def handle_argument_list exp
         if exp.nil?
-          s(type)
+          s()
         elsif exp.first.is_a? Symbol
-          process(exp)
+          process(exp).tap(&:shift)
         else
           exp.map! { |sub_exp| process(sub_exp) }
-          exp.unshift type
-          exp
         end
       end
 
       def extract_node_symbol_with_position exp
         return nil if exp.nil?
         return exp if exp.is_a? Symbol
-        
+
         _, ident, pos = exp.shift 3
         return ident.to_sym, pos
       end
@@ -37,7 +35,7 @@ module RipperRubyParser
         ident.to_sym
       end
 
-      def with_position pos, exp=nil
+      def with_position pos, exp = nil
         (line, _) = pos
         exp = yield if exp.nil?
         with_line_number line, exp
@@ -57,13 +55,11 @@ module RipperRubyParser
         _, args, splatarg = exp.shift 3
         items = handle_potentially_typeless_sexp args
         items << s(:splat, process(splatarg))
-        until exp.empty?
-          items << process(exp.shift)
-        end
+        items << process(exp.shift) until exp.empty?
         items
       end
 
-      def is_literal? exp
+      def literal? exp
         exp.sexp_type == :lit
       end
 

data/lib/ripper_ruby_parser/sexp_handlers/literals.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 module RipperRubyParser
   module SexpHandlers
     module Literals
@@ -76,10 +75,10 @@ module RipperRubyParser
         else
           rest << numflags if numflags > 0
           sexp_type = if flags =~ /o/
-                     :dregx_once
-                   else
-                     :dregx
-                   end
+                        :dregx_once
+                      else
+                        :dregx
+                      end
           s(sexp_type, string, *rest)
         end
       end
@@ -91,7 +90,7 @@ module RipperRubyParser
 
       def process_symbol exp
         _, node = exp.shift 2
-        with_position_from_node_symbol(node) {|sym| s(:lit, sym) }
+        with_position_from_node_symbol(node) { |sym| s(:lit, sym) }
       end
 
       def process_dyna_symbol exp
@@ -113,24 +112,35 @@ module RipperRubyParser
       private
 
       def extract_string_parts exp
-        string = ""
-        rest = []
+        parts = internal_process_string_parts(exp)
 
-        until exp.empty? do
-          result = process(exp.shift)
-          rest << result
-        end
-
-        while not(rest.empty?) and rest.first.sexp_type == :str
-          str = rest.shift
+        string = ""
+        while !parts.empty? && parts.first.sexp_type == :str
+          str = parts.shift
           string += str[1]
         end
 
-        rest = rest.map { |se| se.sexp_type == :dstr ? se.last : se }
+        rest = parts.map { |se| se.sexp_type == :dstr ? se.last : se }
 
         return string, rest
       end
 
+      def internal_process_string_parts exp
+        rest = []
+
+        until exp.empty?
+          part = exp.shift
+          result = if part.is_a? String
+                     # FIXME: Extract escaping into separate method
+                     s(:str, part.inspect[1..-2])
+                   else
+                     process(part)
+                   end
+          rest << result
+        end
+        rest
+      end
+
       def extract_unescaped_string_parts exp
         string, rest = extract_string_parts exp
 
@@ -154,8 +164,8 @@ module RipperRubyParser
         "r" => "\r",
         "s" => "\s",
         "t" => "\t",
-        "v" => "\v",
-      }
+        "v" => "\v"
+      }.freeze
 
       SINGLE_LETTER_ESCAPES_REGEXP =
         Regexp.new("^[#{SINGLE_LETTER_ESCAPES.keys.join}]$")
@@ -174,7 +184,7 @@ module RipperRubyParser
           M-.               | # meta
           .                   # single-character
         )/x) do
-          bare = $1
+          bare = Regexp.last_match[1]
           case bare
           when SINGLE_LETTER_ESCAPES_REGEXP
             SINGLE_LETTER_ESCAPES[bare]
@@ -182,12 +192,12 @@ module RipperRubyParser
             bare[1..-1].to_i(16).chr
           when /^u/
             bare[1..-1].to_i(16).chr(Encoding::UTF_8)
-          when /^(?:c|C-)(.)$/
-            ($1.ord & 0b1001_1111).chr
-          when /^M-(.)$/
-            ($1.ord | 0b1000_0000).chr
-          when /^(?:M-\\C-|C-\\M-|M-\\c|c\\M-)(.)$/
-            ($1.ord & 0b1001_1111 | 0b1000_0000).chr
+          when /^(c|C-).$/
+            (bare[-1].ord & 0b1001_1111).chr
+          when /^M-.$/
+            (bare[-1].ord | 0b1000_0000).chr
+          when /^(M-\\C-|C-\\M-|M-\\c|c\\M-).$/
+            (bare[-1].ord & 0b1001_1111 | 0b1000_0000).chr
           when /^[0-7]+/
             bare.to_i(8).chr
           else
@@ -208,7 +218,6 @@ module RipperRubyParser
 
         numflags
       end
-
     end
   end
 end

data/lib/ripper_ruby_parser/sexp_handlers/loops.rb

@@ -2,31 +2,19 @@ module RipperRubyParser
   module SexpHandlers
     module Loops
       def process_until exp
-        _, cond, block = exp.shift 3
-
-        s(:until, process(cond), wrap_in_block(map_body(block)), true)
+        handle_conditional_loop(:until, exp)
       end
 
       def process_until_mod exp
-        _, cond, block = exp.shift 3
-
-        check_at_start = check_at_start?(block)
-
-        s(:until, process(cond), process(block), check_at_start)
+        handle_conditional_loop_mod(:until, exp)
       end
 
       def process_while exp
-        _, cond, block = exp.shift 3
-
-        s(:while, process(cond), wrap_in_block(map_body(block)), true)
+        handle_conditional_loop(:while, exp)
       end
 
       def process_while_mod exp
-        _, cond, block = exp.shift 3
-
-        check_at_start = check_at_start?(block)
-
-        s(:while, process(cond), process(block), check_at_start)
+        handle_conditional_loop_mod(:while, exp)
       end
 
       def process_for exp
@@ -43,10 +31,23 @@ module RipperRubyParser
 
       private
 
-      def check_at_start?(block)
+      def check_at_start? block
         block.sexp_type != :begin
       end
+
+      def handle_conditional_loop type, exp
+        _, cond, block = exp.shift 3
+
+        s(type, process(cond), wrap_in_block(map_body(block)), true)
+      end
+
+      def handle_conditional_loop_mod type, exp
+        _, cond, block = exp.shift 3
+
+        check_at_start = check_at_start?(block)
+
+        s(type, process(cond), process(block), check_at_start)
+      end
     end
   end
 end
-

data/lib/ripper_ruby_parser/sexp_handlers/method_calls.rb

@@ -16,38 +16,39 @@ module RipperRubyParser
 
       def process_call exp
         _, receiver, _, ident = exp.shift 4
-        with_position_from_node_symbol(ident) {|method|
-          s(:call, process(receiver), method) }
+        with_position_from_node_symbol(ident) do |method|
+          s(:call, process(receiver), method)
+        end
       end
 
       def process_command exp
         _, ident, arglist = exp.shift 3
-        with_position_from_node_symbol(ident) {|method|
-          args = handle_potentially_typeless_sexp_with_fallback_type(:arglist, arglist)
-          args.shift
+        with_position_from_node_symbol(ident) do |method|
+          args = handle_argument_list(arglist)
           s(:call, nil, method, *args)
-        }
+        end
       end
 
       def process_command_call exp
         _, receiver, _, ident, arguments = exp.shift 5
-        with_position_from_node_symbol(ident) {|method|
-          args = handle_potentially_typeless_sexp_with_fallback_type(:arglist, arguments)
-          args.shift
+        with_position_from_node_symbol(ident) do |method|
+          args = handle_argument_list(arguments)
           s(:call, process(receiver), method, *args)
-        }
+        end
       end
 
       def process_vcall exp
         _, ident = exp.shift 2
-        with_position_from_node_symbol(ident) {|method|
-          s(:call, nil, method) }
+        with_position_from_node_symbol(ident) do |method|
+          s(:call, nil, method)
+        end
       end
 
       def process_fcall exp
         _, ident = exp.shift 2
-        with_position_from_node_symbol(ident) {|method|
-          s(:call, nil, method) }
+        with_position_from_node_symbol(ident) do |method|
+          s(:call, nil, method)
+        end
       end
 
       def process_super exp
@@ -59,4 +60,3 @@ module RipperRubyParser
     end
   end
 end
-