ripper_ruby_parser 1.0.0 → 1.1.0

data/test/unit/parser_test.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
 
 describe RipperRubyParser::Parser do
@@ -294,7 +293,8 @@ describe RipperRubyParser::Parser do
           must_be_parsed_as s(:defs,
                               s(:call, nil, :foo),
                               :bar,
-                              s(:args))
+                              s(:args),
+                              s(:nil))
       end
 
       it "works with def with receiver and multiple statements" do
@@ -364,24 +364,24 @@ describe RipperRubyParser::Parser do
                               s(:nil))
       end
 
-      it "works with a argument with default value plus explicit block parameter" do
+      it "works with a default value plus explicit block parameter" do
         "def foo bar=1, &baz; end".
           must_be_parsed_as s(:defn,
                               :foo,
                               s(:args,
                                 s(:lasgn, :bar, s(:lit, 1)),
                                 :"&baz"),
-                                s(:nil))
+                              s(:nil))
       end
 
-      it "works with a argument with default value followed by a mandatory argument" do
+      it "works with a default value plus mandatory argument" do
         "def foo bar=1, baz; end".
           must_be_parsed_as s(:defn,
                               :foo,
                               s(:args,
                                 s(:lasgn, :bar, s(:lit, 1)),
                                 :baz),
-                                s(:nil))
+                              s(:nil))
       end
 
       it "works with a splat plus explicit block parameter" do
@@ -392,24 +392,24 @@ describe RipperRubyParser::Parser do
                               s(:nil))
       end
 
-      it "works with an argument with default value plus splat" do
+      it "works with a default value plus splat" do
         "def foo bar=1, *baz; end".
           must_be_parsed_as s(:defn,
                               :foo,
                               s(:args,
                                 s(:lasgn, :bar, s(:lit, 1)),
                                 :"*baz"),
-                                s(:nil))
+                              s(:nil))
       end
 
-      it "works with an argument with default value plus splat plus final mandatory arguments" do
+      it "works with a default value, splat, plus final mandatory arguments" do
         "def foo bar=1, *baz, qux, quuz; end".
           must_be_parsed_as s(:defn,
                               :foo,
                               s(:args,
                                 s(:lasgn, :bar, s(:lit, 1)),
                                 :"*baz", :qux, :quuz),
-                                s(:nil))
+                              s(:nil))
       end
 
       it "works when the method name is an operator" do
@@ -424,14 +424,14 @@ describe RipperRubyParser::Parser do
         "foo do; end".
           must_be_parsed_as s(:iter,
                               s(:call, nil, :foo),
-                              s(:args))
+                              0)
       end
 
       it "works with next with no arguments" do
         "foo do; next; end".
           must_be_parsed_as s(:iter,
                               s(:call, nil, :foo),
-                              s(:args),
+                              0,
                               s(:next))
       end
 
@@ -439,7 +439,7 @@ describe RipperRubyParser::Parser do
         "foo do; next bar; end".
           must_be_parsed_as s(:iter,
                               s(:call, nil, :foo),
-                              s(:args),
+                              0,
                               s(:next, s(:call, nil, :bar)))
       end
 
@@ -447,7 +447,7 @@ describe RipperRubyParser::Parser do
         "foo do; next bar, baz; end".
           must_be_parsed_as s(:iter,
                               s(:call, nil, :foo),
-                              s(:args),
+                              0,
                               s(:next,
                                 s(:array,
                                   s(:call, nil, :bar),
@@ -458,7 +458,7 @@ describe RipperRubyParser::Parser do
         "foo do; break; end".
           must_be_parsed_as s(:iter,
                               s(:call, nil, :foo),
-                              s(:args),
+                              0,
                               s(:break))
       end
 
@@ -466,7 +466,7 @@ describe RipperRubyParser::Parser do
         "foo do; break bar; end".
           must_be_parsed_as s(:iter,
                               s(:call, nil, :foo),
-                              s(:args),
+                              0,
                               s(:break, s(:call, nil, :bar)))
       end
 
@@ -474,7 +474,7 @@ describe RipperRubyParser::Parser do
         "foo do; break bar, baz; end".
           must_be_parsed_as s(:iter,
                               s(:call, nil, :foo),
-                              s(:args),
+                              0,
                               s(:break,
                                 s(:array,
                                   s(:call, nil, :bar),
@@ -485,10 +485,17 @@ describe RipperRubyParser::Parser do
         "foo do; redo; end".
           must_be_parsed_as s(:iter,
                               s(:call, nil, :foo),
-                              s(:args),
+                              0,
                               s(:redo))
       end
 
+      it "works with zero arguments" do
+        "foo do ||; end".
+          must_be_parsed_as s(:iter,
+                              s(:call, nil, :foo),
+                              s(:args))
+      end
+
       it "works with one argument" do
         "foo do |bar|; end".
           must_be_parsed_as s(:iter,
@@ -516,7 +523,6 @@ describe RipperRubyParser::Parser do
                               s(:call, nil, :foo),
                               s(:args, :bar, :"*baz"))
       end
-
     end
 
     describe "for yield" do
@@ -590,7 +596,7 @@ describe RipperRubyParser::Parser do
     describe "for the END keyword" do
       it "converts to a :postexe iterator" do
         "END { foo }".
-          must_be_parsed_as s(:iter, s(:postexe), s(:args), s(:call, nil, :foo))
+          must_be_parsed_as s(:iter, s(:postexe), 0, s(:call, nil, :foo))
       end
     end
 
@@ -1059,7 +1065,8 @@ describe RipperRubyParser::Parser do
         result.must_equal s(:defs,
                             s(:call, nil, :foo),
                             :bar,
-                            s(:args))
+                            s(:args),
+                            s(:nil))
         result.comments.must_equal "# Foo\n"
       end
 
@@ -1251,15 +1258,15 @@ describe RipperRubyParser::Parser do
         result.line.must_equal 1
       end
 
-      it "assigns line numbers to nested sexps that don't generate their own line numbers" do
+      it "assigns line numbers to nested sexps without their own line numbers" do
         result = parser.parse "foo(bar) do\nnext baz\nend\n"
         result.must_equal s(:iter,
                             s(:call, nil, :foo, s(:call, nil, :bar)),
-                            s(:args),
+                            0,
                             s(:next, s(:call, nil, :baz)))
         arglist = result[1][3]
         block = result[3]
-        nums = [ arglist.line, block.line ]
+        nums = [arglist.line, block.line]
         nums.must_equal [1, 2]
       end
 

data/test/unit/sexp_processor_test.rb

@@ -23,16 +23,6 @@ describe RipperRubyParser::SexpProcessor do
   end
 
   describe "#process" do
-    it "can handle s(s()) constructs" do
-      sexp = s(s())
-      processor.process sexp
-    end
-
-    it "can handle line number information constructs" do
-      sexp = s(1, 6)
-      processor.process sexp
-    end
-
     describe "for a :program sexp" do
       it "strips off the outer :program node" do
         sexp = s(:program, s(s(:foo)))
@@ -55,7 +45,6 @@ describe RipperRubyParser::SexpProcessor do
       end
     end
 
-    if false
     describe "for an :args_add_block sexp" do
       it "transforms a one-argument sexp to an :arglist" do
         sexp = s(:args_add_block, s(s(:foo)), false)
@@ -69,7 +58,6 @@ describe RipperRubyParser::SexpProcessor do
         result.must_equal s(:arglist, s(:foo_p), s(:bar_p))
       end
     end
-    end
 
     describe "for a :command sexp" do
       it "transforms a sexp to a :call" do
@@ -178,7 +166,6 @@ describe RipperRubyParser::SexpProcessor do
                  s(:bodystmt, s(s(:void_stmt)), nil, nil, nil))
         result = processor.process sexp
         result.must_equal s(:defn, :foo, s(:args), s(:nil))
-
       end
     end
 
@@ -217,7 +204,7 @@ describe RipperRubyParser::SexpProcessor do
                  s(:brace_block, nil, s(s(:bar))))
         result = processor.process sexp
         result.must_equal s(:iter,
-                            s(:call, s(:foo_p), :baz), s(:args),
+                            s(:call, s(:foo_p), :baz), 0,
                             s(:bar_p))
       end
 

metadata

@@ -1,83 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: ripper_ruby_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: 4.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: 4.10.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.10.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -90,71 +104,72 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- CHANGELOG.md
+- README.md
+- Rakefile
 - lib/ripper_ruby_parser.rb
 - lib/ripper_ruby_parser/commenting_ripper_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/parser.rb
 - lib/ripper_ruby_parser/sexp_handlers.rb
-- lib/ripper_ruby_parser/sexp_handlers/operators.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/assignment.rb
+- lib/ripper_ruby_parser/sexp_handlers/blocks.rb
+- lib/ripper_ruby_parser/sexp_handlers/conditionals.rb
 - lib/ripper_ruby_parser/sexp_handlers/hashes.rb
 - lib/ripper_ruby_parser/sexp_handlers/helper_methods.rb
-- lib/ripper_ruby_parser/sexp_handlers/conditionals.rb
+- lib/ripper_ruby_parser/sexp_handlers/literals.rb
+- lib/ripper_ruby_parser/sexp_handlers/loops.rb
 - lib/ripper_ruby_parser/sexp_handlers/method_calls.rb
+- lib/ripper_ruby_parser/sexp_handlers/methods.rb
+- lib/ripper_ruby_parser/sexp_handlers/operators.rb
+- lib/ripper_ruby_parser/sexp_processor.rb
+- lib/ripper_ruby_parser/syntax_error.rb
 - lib/ripper_ruby_parser/version.rb
-- lib/ripper_ruby_parser/parser.rb
+- test/end_to_end/comments_test.rb
+- test/end_to_end/comparison_test.rb
+- test/end_to_end/error_conditions_test.rb
+- test/end_to_end/lib_comparison_test.rb
+- 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/samples/inline.rb
 - test/test_helper.rb
-- test/unit/sexp_processor_test.rb
+- test/unit/commenting_ripper_parser_test.rb
 - test/unit/parser_assignment_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_ripper_parser_test.rb
 - test/unit/parser_conditionals_test.rb
+- test/unit/parser_literals_test.rb
+- test/unit/parser_loops_test.rb
+- test/unit/parser_method_calls_test.rb
+- test/unit/parser_operators_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.md
-- Rakefile
+- test/unit/sexp_processor_test.rb
+- test/unit/version_test.rb
 homepage: http://www.github.com/mvz/ripper_ruby_parser
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Parse with Ripper, produce sexps that are compatible with RubyParser.
@@ -167,6 +182,7 @@ test_files:
 - test/end_to_end/samples_comparison_test.rb
 - test/end_to_end/test_comparison_test.rb
 - test/pt_testcase/pt_test.rb
+- test/samples/inline.rb
 - test/test_helper.rb
 - test/unit/commenting_ripper_parser_test.rb
 - test/unit/parser_assignment_test.rb

data/lib/ripper_ruby_parser/sexp_ext.rb

@@ -1,14 +0,0 @@
-require 'sexp_processor'
-
-module RipperRubyParser
-  # Extensions to Sexp
-  module SexpExt
-    def fix_empty_type
-      unless sexp_type.is_a? Symbol
-        unshift :__empty
-      end
-    end
-  end
-end
-
-Sexp.send :include, RipperRubyParser::SexpExt