ripper_ruby_parser 1.0.0 → 1.1.0

data/lib/ripper_ruby_parser/sexp_handlers/methods.rb

@@ -13,19 +13,10 @@ module RipperRubyParser
         _, receiver, _, method, params, body = exp.shift 6
         params = convert_special_args(process(params))
 
-        body = in_method do
-          process(body)
-        end
-
-        if body.length == 1 && body.first.sexp_type == :block
-          body = body.first
-          body.shift
-        end
-
         s(:defs,
           process(receiver),
           extract_node_symbol(method),
-          params, *body)
+          params, *method_body(body))
       end
 
       def process_return exp
@@ -81,7 +72,7 @@ module RipperRubyParser
       end
 
       def make_method_name_literal exp
-        process(exp).tap {|it| it[0] = :lit}
+        process(exp).tap { |it| it[0] = :lit }
       end
 
       def method_body exp
@@ -99,9 +90,9 @@ module RipperRubyParser
       end
 
       SPECIAL_ARG_MARKER = {
-        :splat => "*",
-        :blockarg => "&"
-      }
+        splat: "*",
+        blockarg: "&"
+      }.freeze
 
       def convert_special_args args
         args.map! do |item|
@@ -109,10 +100,6 @@ module RipperRubyParser
             item
           else
             case item.sexp_type
-            when *SPECIAL_ARG_MARKER.keys
-              marker = SPECIAL_ARG_MARKER[item.sexp_type]
-              name = extract_node_symbol item[1]
-              :"#{marker}#{name}"
             when :lvar
               item[1]
             when :masgn
@@ -125,6 +112,10 @@ module RipperRubyParser
               else
                 item
               end
+            when *SPECIAL_ARG_MARKER.keys
+              marker = SPECIAL_ARG_MARKER[item.sexp_type]
+              name = extract_node_symbol item[1]
+              :"#{marker}#{name}"
             else
               item
             end

data/lib/ripper_ruby_parser/sexp_handlers/operators.rb

@@ -6,15 +6,15 @@ module RipperRubyParser
         :"||" => :or,
         :and => :and,
         :or => :or
-      }
+      }.freeze
 
       UNARY_OPERATOR_MAP = {
-        :not => :!
-      }
+        not: :!
+      }.freeze
 
       NEGATED_BINARY_OPERATOR_MAP = {
-        :"!~" => :=~,
-      }
+        :"!~" => :=~
+      }.freeze
 
       def process_binary exp
         _, left, op, right = exp.shift 4
@@ -30,7 +30,7 @@ module RipperRubyParser
         end
       end
 
-      def make_boolean_operator(op, left, right)
+      def make_boolean_operator op, left, right
         if left.first == :paren
           s(op, process(left), process(right))
         else
@@ -38,7 +38,7 @@ module RipperRubyParser
         end
       end
 
-      def make_regexp_match_operator(op, left, right)
+      def make_regexp_match_operator op, left, right
         if left.sexp_type == :regexp_literal
           s(:match2, process(left), process(right))
         elsif right.sexp_type == :regexp_literal
@@ -52,7 +52,7 @@ module RipperRubyParser
         _, op, arg = exp.shift 3
         arg = process(arg)
         op = UNARY_OPERATOR_MAP[op] || op
-        if is_literal?(arg) && op != :!
+        if literal?(arg) && op != :!
           s(:lit, arg[1].send(op))
         else
           s(:call, arg, op)
@@ -63,7 +63,7 @@ module RipperRubyParser
         _, left, right = exp.shift 3
         left = process(left)
         right = process(right)
-        if is_literal?(left) && is_literal?(right)
+        if literal?(left) && literal?(right)
           s(:lit, Range.new(left[1], right[1]))
         else
           s(:dot2, left, right)
@@ -74,7 +74,7 @@ module RipperRubyParser
         _, left, right = exp.shift 3
         left = process(left)
         right = process(right)
-        if is_literal?(left) && is_literal?(right)
+        if literal?(left) && literal?(right)
           s(:lit, Range.new(left[1], right[1], true))
         else
           s(:dot3, left, right)

data/lib/ripper_ruby_parser/sexp_processor.rb

@@ -1,6 +1,5 @@
 require 'sexp_processor'
 require 'ripper_ruby_parser/sexp_handlers'
-require 'ripper_ruby_parser/sexp_ext'
 
 module RipperRubyParser
   # Processes the sexp created by Ripper to what RubyParser would produce.
@@ -36,7 +35,6 @@ module RipperRubyParser
 
     def process exp
       return nil if exp.nil?
-      exp.fix_empty_type
 
       result = super
       trickle_up_line_numbers result
@@ -112,12 +110,12 @@ module RipperRubyParser
 
     def process_paren exp
       _, body = exp.shift 2
-      if body.size == 0
+      if body.empty?
         s()
       elsif body.first.is_a? Symbol
         process body
       else
-        body.map! {|it| convert_void_stmt_to_nil process it }
+        body.map! { |it| convert_void_stmt_to_nil process it }
         safe_wrap_in_block body
       end
     end
@@ -136,16 +134,16 @@ module RipperRubyParser
 
     def process_END exp
       _, body = exp.shift 2
-      s(:iter, s(:postexe), s(:args), *map_body(body))
+      s(:iter, s(:postexe), 0, *map_body(body))
     end
 
     # number literals
     def process_at_int exp
-      make_literal(exp) {|val| Integer(val) }
+      make_literal(exp) { |val| Integer(val) }
     end
 
     def process_at_float exp
-      make_literal(exp) {|val| val.to_f }
+      make_literal(exp, &:to_f)
     end
 
     # character literals
@@ -155,7 +153,7 @@ module RipperRubyParser
     end
 
     def process_at_label exp
-      make_literal(exp) {|val| val.chop.to_sym }
+      make_literal(exp) { |val| val.chop.to_sym }
     end
 
     # symbol-like sexps
@@ -213,9 +211,7 @@ module RipperRubyParser
     def const_ref_to_const_with_line_number const_ref
       const = process(const_ref)
       line = const.line
-      if const.sexp_type == :const
-        const = const[1]
-      end
+      const = const[1] if const.sexp_type == :const
       return const, line
     end
 
@@ -230,9 +226,10 @@ module RipperRubyParser
       body
     end
 
-    def make_identifier(type, exp)
-      with_position_from_node_symbol(exp) {|ident|
-        s(type, ident) }
+    def make_identifier type, exp
+      with_position_from_node_symbol(exp) do |ident|
+        s(type, ident)
+      end
     end
 
     def make_literal exp

data/lib/ripper_ruby_parser/syntax_error.rb

@@ -1,5 +1,3 @@
 module RipperRubyParser
-  class SyntaxError < RuntimeError
-
-  end
+  class SyntaxError < RuntimeError; end
 end

data/lib/ripper_ruby_parser/version.rb

@@ -1,3 +1,3 @@
 module RipperRubyParser
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'.freeze
 end

data/test/end_to_end/comparison_test.rb

@@ -146,4 +146,3 @@ describe "Using RipperRubyParser and RubyParser" do
     end
   end
 end
-

data/test/end_to_end/lib_comparison_test.rb

@@ -25,5 +25,3 @@ describe "Using RipperRubyParser and RubyParser" do
     end
   end
 end
-
-

data/test/end_to_end/line_numbering_test.rb

@@ -60,4 +60,3 @@ describe "Using RipperRubyParser and RubyParser" do
     end
   end
 end
-

data/test/end_to_end/samples_comparison_test.rb

@@ -10,7 +10,7 @@ describe "Using RipperRubyParser and RubyParser" do
     RubyParser.new
   end
 
-  Dir.glob("samples/**/*.rb").each do |file|
+  Dir.glob(File.expand_path("../samples/*.rb", File.dirname(__FILE__))).each do |file|
     describe "for #{file}" do
       let :program do
         File.read file

data/test/end_to_end/test_comparison_test.rb

@@ -28,6 +28,3 @@ describe "Using RipperRubyParser and RubyParser" do
     end
   end
 end
-
-
-

data/test/pt_testcase/pt_test.rb

@@ -1,16 +1,16 @@
 require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
 require 'pt_testcase'
 
-class RipperRubyParser::Parser
+class TestParser < RipperRubyParser::Parser
   def process input
     parse input
   end
 end
 
-SKIPPED_TESTS = ["dstr_heredoc_windoze_sucks"]
+SKIPPED_TESTS = ["dstr_heredoc_windoze_sucks"].freeze
 
 class RubyParserTestCase < ParseTreeTestCase
-  def self.previous key
+  def self.previous _key
     "Ruby"
   end
 
@@ -39,6 +39,6 @@ class TestRuby19Parser < RubyParserTestCase
   def setup
     super
 
-    self.processor = RipperRubyParser::Parser.new
+    self.processor = TestParser.new
   end
 end