ripper_ruby_parser 0.0.8 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 12102f722ef4074c0f6d46d207dba7dac580d0af
+  data.tar.gz: edf3dc287249ae2f0ccedb39e2f3cfdae622daff
+SHA512:
+  metadata.gz: 9450f761539fbf3b3d662447497ef1fa7a220a02e9656139bb35d305863cde02a1364b9c9802dcd20883a0c6be16f7d8e80aa4529409445bf280d07e5d4a29fb
+  data.tar.gz: 231ced88a63860467aa18a66c37513b49e232dc9aff74c03d6ba6b7b1ac5d30bf284616ec50d05e38385b66237c3086cb78fe526aeae648b6dd1f4a8dda8a85b

data/{README.rdoc → README.md}

@@ -1,38 +1,38 @@
-= RipperRubyParser
+# RipperRubyParser
 
 by Matijs van Zuijlen
 
 http://www.github.com/mvz/ripper_ruby_parser
 
-== Description
+## Description
 
 Parse with Ripper, produce sexps that are compatible with RubyParser.
 
-== Features/Notes
+## Features/Notes
 
 * Drop-in replacement for RubyParser.
-* Should handle 1.9 syntax gracefully.
-* Needs MRI 1.9.3.
+* Should handle 1.9 and later syntax gracefully.
+* Needs MRI 1.9.3 or higher
 
-== Install
+## Install
 
 * gem install ripper_ruby_parser
 
-== Synopsis
+## Synopsis
 
-  require 'ripper_ruby_parser'
+    require 'ripper_ruby_parser'
 
-  parser = RipperRubyParser::Parser.new
-  result = parser.parse "puts 'Hello World'"
-  p result
-  # => s(:call, nil, :puts, s(:arglist, s(:str, "Hello World!")))
+    parser = RipperRubyParser::Parser.new
+    result = parser.parse "puts 'Hello World'"
+    p result
+    # => s(:call, nil, :puts, s(:arglist, s(:str, "Hello World!")))
 
-== Requirements
+## Requirements
 
-* Ruby 1.9.3.
+* Ruby 1.9.3 or higher
 * sexp_processor
 
-== Hacking and contributing
+## Hacking and contributing
 
 If you want to send pull requests or patches, please:
 
@@ -45,11 +45,11 @@ If you want to send pull requests or patches, please:
 * Try not to include changes that are irrelevant to your feature in the
   same commit.
 
-== License
+## License
 
 (The MIT License)
 
-Copyright (c) 2012 Matijs van Zuijlen
+Copyright (c) 2012, 2014 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

@@ -1,3 +1,5 @@
+require 'rake/clean'
+require "bundler/gem_tasks"
 require 'rake/testtask'
 
 namespace :test do
@@ -20,7 +22,7 @@ namespace :test do
     t.warning = true
   end
 
-  task :run => [:unit, :end_to_end]
+  task :run => [:unit, :end_to_end, :pt_testcase]
 end
 
 desc 'Alias to test:run'

data/lib/ripper_ruby_parser/{commenting_sexp_builder.rb → commenting_ripper_parser.rb}

@@ -2,7 +2,9 @@ require 'ripper'
 require 'ripper_ruby_parser/syntax_error'
 
 module RipperRubyParser
-  class CommentingSexpBuilder < Ripper::SexpBuilderPP
+  # Variant of Ripper's SexpBuilderPP parser class that inserts comments as
+  # Sexps into the built parse tree.
+  class CommentingRipperParser < Ripper::SexpBuilderPP
     def initialize *args
       super
       @comment = nil
@@ -10,6 +12,13 @@ module RipperRubyParser
       @in_symbol = false
     end
 
+    def parse
+      result = suppress_warnings { super }
+      raise "Ripper parse failed." unless result
+
+      Sexp.from_array(result)
+    end
+
     def on_comment tok
       @comment ||= ""
       @comment += tok
@@ -92,14 +101,21 @@ module RipperRubyParser
     def commentize name, exp
       raise "Comment stack empty in #{name} event" if @comment_stack.empty?
       tok, comment = @comment_stack.pop
+      @comment = nil
       unless tok == name
         raise "Expected on_#{tok} event, got on_#{name}"
       end
-      if comment.nil?
-        [:comment, "", exp]
-      else
-        [:comment, comment, exp]
-      end
+      [:comment, comment || "", exp]
+    end
+
+    private
+
+    def suppress_warnings
+      old_verbose = $VERBOSE
+      $VERBOSE = nil
+      result = yield
+      $VERBOSE = old_verbose
+      result
     end
   end
 end

data/lib/ripper_ruby_parser/parser.rb

@@ -1,4 +1,4 @@
-require 'ripper_ruby_parser/commenting_sexp_builder'
+require 'ripper_ruby_parser/commenting_ripper_parser'
 require 'ripper_ruby_parser/sexp_processor'
 
 module RipperRubyParser
@@ -13,13 +13,8 @@ module RipperRubyParser
     end
 
     def parse source, filename='(string)', lineno=1
-      # FIXME: Allow parser class to be passed to #initialize also.
-      parser = CommentingSexpBuilder.new(source, filename, lineno)
-
-      result = suppress_warnings { parser.parse }
-      raise "Ripper parse failed." if result.nil?
-
-      exp = Sexp.from_array(result)
+      parser = CommentingRipperParser.new(source, filename, lineno)
+      exp = parser.parse
 
       @processor.filename = filename
       @processor.extra_compatible = extra_compatible
@@ -31,16 +26,6 @@ module RipperRubyParser
         result
       end
     end
-
-    private
-
-    def suppress_warnings
-      old_verbose = $VERBOSE
-      $VERBOSE = nil
-      result = yield
-      $VERBOSE = old_verbose
-      result
-    end
   end
 end
 

data/lib/ripper_ruby_parser/sexp_handlers/arrays.rb

@@ -13,7 +13,8 @@ module RipperRubyParser
         coll = nil if coll == s(:self)
 
         idx = process(idx) || s(:arglist)
-        s(:call, coll, :[], idx)
+        idx.shift
+        s(:call, coll, :[], *idx)
       end
     end
   end

data/lib/ripper_ruby_parser/sexp_handlers/assignment.rb

@@ -3,7 +3,6 @@ module RipperRubyParser
     module Assignment
       def process_assign exp
         _, lvalue, value = exp.shift 3
-
         lvalue = process(lvalue)
         value = process(value)
 
@@ -35,7 +34,7 @@ module RipperRubyParser
         case right.sexp_type
         when :fake_array
           right[0] = :array
-        when :array, :splat
+        when :splat
           # Do nothing
         else
           right = s(:to_ary, right)
@@ -104,11 +103,7 @@ module RipperRubyParser
       def create_valueless_assignment_sub_type(item)
         item = with_line_number(item.line,
                                 create_regular_assignment_sub_type(item, nil))
-        if item.sexp_type == :attrasgn
-          item.last.pop
-        else
-          item.pop
-        end
+        item.pop
         return item
       end
 
@@ -129,7 +124,7 @@ module RipperRubyParser
           if (mapped = OPERATOR_ASSIGNMENT_MAP[operator])
             s(mapped, lvalue, create_assignment_sub_type(lvalue, value))
           else
-            operator_call = s(:call, lvalue, operator, s(:arglist, value))
+            operator_call = s(:call, lvalue, operator, value)
             create_assignment_sub_type lvalue, operator_call
           end
         end
@@ -140,10 +135,11 @@ module RipperRubyParser
         when :aref_field
           _, arr, arglist = lvalue
           arglist << value
-          s(:attrasgn, arr, :[]=, arglist)
+          arglist.shift
+          s(:attrasgn, arr, :[]=, *arglist)
         when :field
           _, obj, _, (_, field) = lvalue
-          s(:attrasgn, obj, :"#{field}=", s(:arglist, value))
+          s(:attrasgn, obj, :"#{field}=", value)
         else
           create_assignment_sub_type lvalue, value
         end

data/lib/ripper_ruby_parser/sexp_handlers/blocks.rb

@@ -19,22 +19,25 @@ module RipperRubyParser
       end
 
       def process_params exp
-        _, normal, defaults, rest, _, block = exp.shift 6
+        if exp.size == 6
+          _, normal, defaults, splat, rest, block = exp.shift 6
+        else
+          _, normal, defaults, splat, rest, _, _, block = exp.shift 8
+        end
 
         args = [*normal].map do |id|
           process(id)
         end
 
-        assigns = [*defaults].map do |pair|
+        [*defaults].each do |pair|
           sym = process(pair[0])
-          args << sym
           val = process(pair[1])
-          s(:lasgn, sym[1], val)
+          args << s(:lasgn, sym[1], val)
         end
 
-        args << process(rest) unless rest.nil?
+        args << process(splat) unless splat.nil? || splat == 0
+        [*rest].each {|arg| args << process(arg)}
         args << process(block) unless block.nil?
-        args << s(:block, *assigns) if assigns.length > 0
 
         s(:args, *args)
       end
@@ -44,20 +47,20 @@ module RipperRubyParser
 
         names = process(args)
 
-        args_to_assignment names
+        convert_special_args names
       end
 
       def process_begin exp
         _, body = exp.shift 2
 
-        block = process(body)[1]
-
-        strip_wrapping_block(block.compact)
+        body = process(body)
+        strip_typeless_sexp(body)
       end
 
       def process_rescue exp
         _, eclass, evar, block, after = exp.shift 5
         rescue_block = map_body(block)
+        rescue_block << nil if rescue_block.empty?
 
         arr = []
         if eclass
@@ -70,13 +73,11 @@ module RipperRubyParser
         end
 
         if evar
-          evar = process(evar)[1]
-          easgn = s(:lasgn, evar, s(:gvar, :$!))
-          arr << easgn
+          arr << create_assignment_sub_type(process(evar), s(:gvar, :$!))
         end
 
         s(
-          s(:resbody, s(:array, *arr), wrap_in_block(rescue_block)),
+          s(:resbody, s(:array, *arr), *rescue_block),
           *process(after))
       end
 
@@ -85,10 +86,6 @@ module RipperRubyParser
 
         body = map_body body
 
-        #unless rescue_block or ensure_block
-        #  return s(:scope, s(:block, *body))
-        #end
-
         body = wrap_in_block(body)
 
         body = if body.nil?
@@ -110,11 +107,15 @@ module RipperRubyParser
           body = s(s(:ensure, *body))
         end
 
-        if body.length == 1 and body.first.sexp_type == :block
-          s(:scope, *body)
-        else
-          s(:scope, s(:block, *body))
-        end
+        body = wrap_in_block(body)
+
+        body = if body.nil?
+                 s()
+               else
+                 s(body)
+               end
+
+        body
       end
 
       def process_rescue_mod exp
@@ -124,7 +125,7 @@ module RipperRubyParser
 
       def process_ensure exp
         _, block = exp.shift 2
-        wrap_in_block s(*map_body(block))
+        strip_typeless_sexp safe_wrap_in_block s(*map_body(block))
       end
 
       def process_next exp
@@ -147,8 +148,10 @@ module RipperRubyParser
 
       def process_lambda exp
         _, args, statements = exp.shift 3
-        make_iter(s(:call, nil, :lambda, s(:arglist)),
-                  args_to_assignment(process(args)),
+        args = convert_special_args(process(args))
+        args = 0 if args == s(:args)
+        make_iter(s(:call, nil, :lambda),
+                  args,
                   *handle_potentially_typeless_sexp(statements))
       end
 
@@ -156,57 +159,31 @@ 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, process(args), s(handle_statement_list(stmts)))
+        s(:block, args, s(wrap_in_block(map_body(stmts))))
       end
 
-      def strip_wrapping_block(block)
-        return block unless block.sexp_type == :block
+      def strip_typeless_sexp(block)
         case block.length
-        when 1
+        when 0
           s(:nil)
-        when 2
-          block[1]
+        when 1
+          block[0]
         else
           block
         end
       end
 
-      def arg_name_to_lasgn(name)
-        case name.sexp_type
-        when :lvar
-          s(:lasgn, name[1])
-        when :blockarg
-          s(:lasgn, :"&#{name[1][1]}")
-        when :splat
-          if name[1].nil?
-            s(:splat)
-          else
-            s(:splat, s(:lasgn, name[1][1]))
-          end
-        else
-          name
-        end
-      end
-
       def make_iter call, args, stmt
+        args = s(:args) unless args
         if stmt.nil?
           s(:iter, call, args)
         else
           s(:iter, call, args, stmt)
         end
       end
-
-      def args_to_assignment names
-        names.shift
-        if names.length == 1 and names.first.sexp_type == :lvar
-          s(:lasgn, names.first[1])
-        elsif names.length == 1 and names.first.sexp_type == :masgn
-          names.first
-        else
-          s(:masgn, s(:array, *names.map { |name| arg_name_to_lasgn(name) }))
-        end
-      end
     end
   end
 end

data/lib/ripper_ruby_parser/sexp_handlers/conditionals.rb

@@ -4,42 +4,35 @@ module RipperRubyParser
       def process_if exp
         _, cond, truepart, falsepart = exp.shift 4
 
-        cond = process(cond)
-        truepart = handle_statement_list(truepart)
-        falsepart = process(falsepart)
-
-        if cond.sexp_type == :not
-          cond = cond[1]
-          truepart, falsepart = falsepart, truepart
-        end
-
-        s(:if, cond, truepart, falsepart)
+        s(:if, handle_condition(cond),
+          wrap_in_block(map_body(truepart)),
+          process(falsepart))
       end
 
       def process_elsif exp
         _, cond, truepart, falsepart = exp.shift 4
 
         s(:if, process(cond),
-          handle_statement_list(truepart),
+          wrap_in_block(map_body(truepart)),
           process(falsepart))
       end
 
       def process_if_mod exp
         _, cond, truepart = exp.shift 3
-        process_if s(:if, cond, s(truepart), nil)
+        s(:if, handle_condition(cond), process(truepart), nil)
       end
 
       def process_unless_mod exp
         _, cond, truepart = exp.shift 3
-        s(:if, process(cond), nil, process(truepart))
+        s(:if, handle_condition(cond), nil, process(truepart))
       end
 
       def process_unless exp
         _, cond, truepart, falsepart = exp.shift 4
         s(:if,
-          process(cond),
+          handle_condition(cond),
           process(falsepart),
-          handle_statement_list(truepart))
+          wrap_in_block(map_body(truepart)))
       end
 
       def process_case exp
@@ -58,25 +51,38 @@ module RipperRubyParser
             falsepart = s(falsepart)
           end
         end
+        falsepart = [nil] if falsepart.empty?
 
         values = handle_array_elements values
-        values = values.map do |val|
-          if val.sexp_type == :splat
-            s(:when, val[1], nil)
-          else
-            val
-          end
-        end
 
-        s(s(:when, s(:array, *values),
-            handle_statement_list(truepart)),
+        truepart = map_body(truepart)
+        truepart = [nil] if truepart.empty?
+
+        s(s(:when,
+            s(:array, *values),
+            *truepart),
           *falsepart)
       end
 
       def process_else exp
         _, body = exp.shift 2
-        handle_statement_list body
+        safe_wrap_in_block(map_body(body))
       end
+
+      private
+
+      def handle_condition(cond)
+        cond = process(cond)
+        if (cond.sexp_type == :lit) && cond[1].is_a?(Regexp)
+          cond = s(:match, cond)
+        elsif cond.sexp_type == :dot2
+          cond = s(:flip2, *cond[1..-1])
+        elsif cond.sexp_type == :dot3
+          cond = s(:flip3, *cond[1..-1])
+        end
+        return cond
+      end
+
     end
   end
 end