ripper_ruby_parser 0.0.6 → 0.0.7

data/Rakefile

@@ -14,8 +14,13 @@ namespace :test do
     t.warning = true
   end
 
-  task :run => [:unit, :end_to_end]
+  Rake::TestTask.new(:pt_testcase) do |t|
+    t.libs = ['lib']
+    t.test_files = FileList['test/pt_testcase/*_test.rb']
+    t.warning = true
+  end
 
+  task :run => [:unit, :end_to_end]
 end
 
 desc 'Alias to test:run'

data/lib/ripper_ruby_parser.rb

@@ -1,3 +1,7 @@
+if RUBY_VERSION < "1.9.3"
+  raise LoadError, "Only ruby version 1.9.3 and up are supported"
+end
+
 require 'ripper_ruby_parser/version'
 require 'ripper_ruby_parser/parser'
 

data/lib/ripper_ruby_parser/sexp_handlers/assignment.rb

@@ -7,6 +7,13 @@ module RipperRubyParser
         lvalue = process(lvalue)
         value = process(value)
 
+        case value.sexp_type
+        when :splat
+          value = s(:svalue, value)
+        when :fake_array
+          value = s(:svalue, s(:array, *value.sexp_body))
+        end
+
         with_line_number(lvalue.line,
                          create_regular_assignment_sub_type(lvalue, value))
       end
@@ -25,7 +32,12 @@ module RipperRubyParser
 
         right = process(right)
 
-        unless [:array, :splat].include? right.sexp_type
+        case right.sexp_type
+        when :fake_array
+          right[0] = :array
+        when :array, :splat
+          # Do nothing
+        else
           right = s(:to_ary, right)
         end
 
@@ -36,15 +48,17 @@ module RipperRubyParser
         _, inner, last = exp.shift 3
         inner.map! {|item| process(item)}
         inner.push process(last) unless last.nil?
-        s(:array, *inner)
+        s(:fake_array, *inner)
       end
 
       def process_mrhs_add_star exp
         exp = generic_add_star exp
-        unless exp.first.is_a? Symbol
-          exp = exp.first
+
+        if exp.first.is_a? Symbol
+          exp
+        else
+          exp.first
         end
-        exp
       end
 
       def process_mlhs_add_star exp

data/lib/ripper_ruby_parser/sexp_handlers/blocks.rb

@@ -6,11 +6,8 @@ module RipperRubyParser
         block = process(block)
         args = block[1]
         stmt = block[2].first
-        if stmt.nil?
-          s(:iter, process(call), args)
-        else
-          s(:iter, process(call), args, stmt)
-        end
+        call = process(call)
+        make_iter call, args, stmt
       end
 
       def process_brace_block exp
@@ -46,15 +43,8 @@ module RipperRubyParser
         _, args, _ = exp.shift 3
 
         names = process(args)
-        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
+        args_to_assignment names
       end
 
       def process_begin exp
@@ -155,6 +145,13 @@ module RipperRubyParser
         end
       end
 
+      def process_lambda exp
+        _, args, statements = exp.shift 3
+        make_iter(s(:call, nil, :lambda, s(:arglist)),
+                  args_to_assignment(process(args)),
+                  *handle_potentially_typeless_sexp(statements))
+      end
+
       private
 
       def handle_generic_block exp
@@ -179,6 +176,8 @@ module RipperRubyParser
         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)
@@ -190,6 +189,24 @@ module RipperRubyParser
         end
       end
 
+      def make_iter call, args, stmt
+        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/version.rb

@@ -1,3 +1,3 @@
 module RipperRubyParser
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/test/pt_testcase/pt_test.rb

@@ -0,0 +1,30 @@
+require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+require 'pt_testcase'
+
+class RipperRubyParser::Parser
+  def process input
+    parse input
+  end
+end
+
+class RubyParserTestCase < ParseTreeTestCase
+  def self.previous key
+    "Ruby"
+  end
+
+  def self.generate_test klass, node, data, input_name, output_name
+    return if Array === data['Ruby']
+
+    output_name = "ParseTree"
+
+    super
+  end
+end
+
+class TestRuby19Parser < RubyParserTestCase
+  def setup
+    super
+
+    self.processor = RipperRubyParser::Parser.new
+  end
+end

data/test/unit/parser_assignment_test.rb

@@ -16,6 +16,47 @@ describe RipperRubyParser::Parser do
                               s(:colon3, :Foo),
                               s(:call, nil, :bar, s(:arglist)))
       end
+
+      describe "with a right-hand splat" do
+        specify do
+          "foo = *bar".
+            must_be_parsed_as s(:lasgn, :foo,
+                                s(:svalue,
+                                  s(:splat,
+                                    s(:call, nil, :bar, s(:arglist)))))
+        end
+
+        specify do
+          "foo = bar, *baz".
+            must_be_parsed_as s(:lasgn, :foo,
+                                s(:svalue,
+                                  s(:array,
+                                    s(:call, nil, :bar, s(:arglist)),
+                                    s(:splat,
+                                      s(:call, nil, :baz, s(:arglist))))))
+        end
+      end
+
+      describe "with several items on the right hand side" do
+        specify do
+          "foo = bar, baz".
+            must_be_parsed_as s(:lasgn, :foo,
+                                s(:svalue,
+                                  s(:array,
+                                    s(:call, nil, :bar, s(:arglist)),
+                                    s(:call, nil, :baz, s(:arglist)))))
+        end
+      end
+
+      describe "with an array literal on the right hand side" do
+        specify do
+          "foo = [bar, baz]".
+            must_be_parsed_as s(:lasgn, :foo,
+                                s(:array,
+                                  s(:call, nil, :bar, s(:arglist)),
+                                  s(:call, nil, :baz, s(:arglist))))
+        end
+      end
     end
 
     describe "for multiple assignment" do

data/test/unit/parser_blocks_test.rb

@@ -30,6 +30,16 @@ describe RipperRubyParser::Parser do
                               s(:masgn, s(:array, s(:lasgn, :bar), s(:splat))))
       end
 
+      specify do
+        "foo do |bar, &baz| end".
+          must_be_parsed_as s(:iter,
+                              s(:call, nil, :foo, s(:arglist)),
+                              s(:masgn,
+                                s(:array,
+                                  s(:lasgn, :bar),
+                                  s(:lasgn, :"&baz"))))
+      end
+
       it "behaves differently from RubyParser with a trailing comma in the block parameters" do
         "foo do |bar, | end".
           must_be_parsed_as s(:iter,
@@ -80,5 +90,15 @@ describe RipperRubyParser::Parser do
                                 s(:call, nil, :baz, s(:arglist))))
       end
     end
+
+    describe "for stabby lambda" do
+      it "works in the simple case" do
+        "->(foo) { bar }".
+          must_be_parsed_as s(:iter,
+                              s(:call, nil, :lambda, s(:arglist)),
+                              s(:lasgn, :foo),
+                              s(:call, nil, :bar, s(:arglist))) 
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ripper_ruby_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
-  requirement: &21062800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *21062800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &21062280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 2.11.2
   type: :development
   prerelease: false
-  version_requirements: *21062280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.2
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &21061800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *21061800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: ruby_parser
-  requirement: &21061320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 2.3.1
   type: :development
   prerelease: false
-  version_requirements: *21061320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &21060940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21060940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - matijs@matijs.net
@@ -75,44 +100,45 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - lib/ripper_ruby_parser.rb
+- lib/ripper_ruby_parser/sexp_processor.rb
+- lib/ripper_ruby_parser/syntax_error.rb
 - lib/ripper_ruby_parser/sexp_ext.rb
-- lib/ripper_ruby_parser/commenting_sexp_builder.rb
+- lib/ripper_ruby_parser/sexp_handlers.rb
 - lib/ripper_ruby_parser/sexp_handlers/operators.rb
-- lib/ripper_ruby_parser/sexp_handlers/methods.rb
-- lib/ripper_ruby_parser/sexp_handlers/arrays.rb
-- lib/ripper_ruby_parser/sexp_handlers/method_calls.rb
-- lib/ripper_ruby_parser/sexp_handlers/loops.rb
-- lib/ripper_ruby_parser/sexp_handlers/conditionals.rb
-- lib/ripper_ruby_parser/sexp_handlers/blocks.rb
 - lib/ripper_ruby_parser/sexp_handlers/literals.rb
 - lib/ripper_ruby_parser/sexp_handlers/assignment.rb
 - lib/ripper_ruby_parser/sexp_handlers/arguments.rb
+- lib/ripper_ruby_parser/sexp_handlers/blocks.rb
+- lib/ripper_ruby_parser/sexp_handlers/loops.rb
+- lib/ripper_ruby_parser/sexp_handlers/arrays.rb
+- lib/ripper_ruby_parser/sexp_handlers/methods.rb
 - lib/ripper_ruby_parser/sexp_handlers/hashes.rb
 - lib/ripper_ruby_parser/sexp_handlers/helper_methods.rb
-- lib/ripper_ruby_parser/parser.rb
+- lib/ripper_ruby_parser/sexp_handlers/conditionals.rb
+- lib/ripper_ruby_parser/sexp_handlers/method_calls.rb
 - lib/ripper_ruby_parser/version.rb
-- lib/ripper_ruby_parser/sexp_handlers.rb
-- lib/ripper_ruby_parser/syntax_error.rb
-- lib/ripper_ruby_parser/sexp_processor.rb
+- lib/ripper_ruby_parser/commenting_sexp_builder.rb
+- lib/ripper_ruby_parser/parser.rb
 - test/test_helper.rb
-- test/end_to_end/lib_comparison_test.rb
-- test/end_to_end/samples_comparison_test.rb
-- test/end_to_end/comparison_test.rb
-- test/end_to_end/comments_test.rb
-- test/end_to_end/test_comparison_test.rb
-- test/end_to_end/line_numbering_test.rb
-- test/end_to_end/error_conditions_test.rb
-- test/unit/parser_literals_test.rb
-- test/unit/parser_test.rb
-- test/unit/parser_blocks_test.rb
 - test/unit/sexp_processor_test.rb
-- test/unit/parser_operators_test.rb
-- test/unit/parser_conditionals_test.rb
-- test/unit/version_test.rb
 - test/unit/parser_assignment_test.rb
-- test/unit/parser_method_calls_test.rb
 - test/unit/parser_loops_test.rb
+- test/unit/parser_operators_test.rb
+- test/unit/parser_blocks_test.rb
+- test/unit/parser_method_calls_test.rb
+- test/unit/parser_literals_test.rb
+- test/unit/version_test.rb
 - test/unit/commenting_sexp_builder_test.rb
+- test/unit/parser_conditionals_test.rb
+- test/unit/parser_test.rb
+- test/pt_testcase/pt_test.rb
+- test/end_to_end/samples_comparison_test.rb
+- test/end_to_end/lib_comparison_test.rb
+- test/end_to_end/error_conditions_test.rb
+- test/end_to_end/line_numbering_test.rb
+- test/end_to_end/comparison_test.rb
+- test/end_to_end/test_comparison_test.rb
+- test/end_to_end/comments_test.rb
 - README.rdoc
 - Rakefile
 homepage: http://www.github.com/mvz/ripper_ruby_parser
@@ -126,9 +152,9 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ~>
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -137,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Parse with Ripper, produce sexps that are compatible with RubyParser.
@@ -149,6 +175,7 @@ test_files:
 - test/end_to_end/line_numbering_test.rb
 - test/end_to_end/samples_comparison_test.rb
 - test/end_to_end/test_comparison_test.rb
+- test/pt_testcase/pt_test.rb
 - test/test_helper.rb
 - test/unit/commenting_sexp_builder_test.rb
 - test/unit/parser_assignment_test.rb
@@ -161,3 +188,4 @@ test_files:
 - test/unit/parser_test.rb
 - test/unit/sexp_processor_test.rb
 - test/unit/version_test.rb
+has_rdoc: