ripper_ruby_parser 1.4.2 → 1.5.0

data/test/samples/number.rb

@@ -0,0 +1,7 @@
+# Samples of number-like literals
+
+3.14
+42
+100r
+0700
+0x100

data/test/samples/strings.rb

@@ -5,8 +5,18 @@
 %W(foo\nbar baz)
 %w(foo\nbar baz)
 
+"foo\u273bbar"
+"\0"
+"foo#{bar}\0"
+"foo#{bar}baz\0"
+"2\302\275"
+"#{foo}2\302\275"
+%W(2\302\275)
+/2\302\275/
+
 # Encoding
 "日本語"
+/日本語/
 "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E"  # => "日本語"
 "\xAB\xE6\x97\xA5"                      # Invalid in UTF8
 
@@ -18,29 +28,53 @@ EOS
 \xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E
 EOS
 
+# Quotes around heredoc names
+<<'FOO'
+\n
+FOO
+
+<<"FOO"
+\n
+FOO
+
 # Line continuation
 "foo\
 bar"
+
 'foo2\
 bar'
+
 /foo3\
 bar/
+
 <<EOS
 foo4\
 bar
 EOS
+
+<<'EOS'
+foo4\
+bar
+EOS
+
 %Q[foo5\
 bar]
+
 %W[fooa\
 bar baz]
+
 %I[foob\
 bar baz]
+
 %q[fooc\
 bar]
+
 %w[food\
 bar baz]
+
 %i[fooe\
 bar baz]
+
 %r[foof\
 bar baz]
 
@@ -69,3 +103,8 @@ bar baz]
 bar baz]
 %r[fool\\
 bar baz]
+
+eval(<<FOO, __FILE__, __LINE__)
+bar
+baz
+FOO

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'simplecov'
 SimpleCov.start do
   add_filter '/test/'
@@ -15,6 +17,20 @@ module MiniTest
       exp.to_s.gsub(/\), /, "),\n")
     end
 
+    def fix_lines(exp)
+      return s(:lit, :__LINE__) if exp.sexp_type == :lit && exp.line == exp[1]
+
+      inner = exp.map do |sub_exp|
+        if sub_exp.is_a? Sexp
+          fix_lines sub_exp
+        else
+          sub_exp
+        end
+      end
+
+      s(*inner)
+    end
+
     def to_comments(exp)
       inner = exp.map do |sub_exp|
         if sub_exp.is_a? Sexp
@@ -32,21 +48,26 @@ module MiniTest
       end
     end
 
-    def assert_parsed_as(sexp, code)
+    def assert_parsed_as(sexp, code, extra_compatible: false)
       parser = RipperRubyParser::Parser.new
+      parser.extra_compatible = extra_compatible
       result = parser.parse code
       if sexp.nil?
         assert_nil result
       else
         assert_equal sexp, result
+        assert_equal sexp.to_s, result.to_s
       end
     end
 
     def assert_parsed_as_before(code)
       oldparser = RubyParser.new
       newparser = RipperRubyParser::Parser.new
+      newparser.extra_compatible = true
       expected = oldparser.parse code.dup
       result = newparser.parse code
+      expected = to_comments fix_lines expected
+      result = to_comments fix_lines result
       assert_equal formatted(expected), formatted(result)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ripper_ruby_parser
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.10.0
+        version: '4.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.10.0
+        version: '4.10'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -97,12 +97,9 @@ files:
 - lib/ripper_ruby_parser/commenting_ripper_parser.rb
 - lib/ripper_ruby_parser/parser.rb
 - lib/ripper_ruby_parser/sexp_handlers.rb
-- lib/ripper_ruby_parser/sexp_handlers/arguments.rb
-- lib/ripper_ruby_parser/sexp_handlers/arrays.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/literals.rb
 - lib/ripper_ruby_parser/sexp_handlers/loops.rb
@@ -128,10 +125,15 @@ files:
 - test/ripper_ruby_parser/sexp_handlers/literals_test.rb
 - test/ripper_ruby_parser/sexp_handlers/loops_test.rb
 - test/ripper_ruby_parser/sexp_handlers/method_calls_test.rb
+- test/ripper_ruby_parser/sexp_handlers/methods_test.rb
 - test/ripper_ruby_parser/sexp_handlers/operators_test.rb
 - test/ripper_ruby_parser/sexp_processor_test.rb
 - test/ripper_ruby_parser/version_test.rb
+- test/samples/comments.rb
+- test/samples/conditionals.rb
+- test/samples/loops.rb
 - test/samples/misc.rb
+- test/samples/number.rb
 - test/samples/operators.rb
 - test/samples/strings.rb
 - test/test_helper.rb
@@ -149,15 +151,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Parse with Ripper, produce sexps that are compatible with RubyParser.
@@ -177,10 +178,15 @@ test_files:
 - test/ripper_ruby_parser/sexp_handlers/literals_test.rb
 - test/ripper_ruby_parser/sexp_handlers/loops_test.rb
 - test/ripper_ruby_parser/sexp_handlers/method_calls_test.rb
+- test/ripper_ruby_parser/sexp_handlers/methods_test.rb
 - test/ripper_ruby_parser/sexp_handlers/operators_test.rb
 - test/ripper_ruby_parser/sexp_processor_test.rb
 - test/ripper_ruby_parser/version_test.rb
+- test/samples/comments.rb
+- test/samples/conditionals.rb
+- test/samples/loops.rb
 - test/samples/misc.rb
+- test/samples/number.rb
 - test/samples/operators.rb
 - test/samples/strings.rb
 - test/test_helper.rb

data/lib/ripper_ruby_parser/sexp_handlers/arguments.rb

@@ -1,29 +0,0 @@
-module RipperRubyParser
-  module SexpHandlers
-    # Sexp handlers for argument lists
-    module Arguments
-      def process_args_add_block(exp)
-        _, regular, block = exp.shift 3
-        args = process(regular)
-        args << s(:block_pass, process(block)) if block
-        s(:arglist, *args.sexp_body)
-      end
-
-      def process_args_add_star(exp)
-        generic_add_star exp
-      end
-
-      def process_arg_paren(exp)
-        _, args = exp.shift 2
-        args = s() if args.nil?
-        args.unshift :arglist unless args.first.is_a? Symbol
-        process(args)
-      end
-
-      def process_rest_param(exp)
-        _, ident = exp.shift 2
-        s(:splat, process(ident))
-      end
-    end
-  end
-end

data/lib/ripper_ruby_parser/sexp_handlers/arrays.rb

@@ -1,21 +0,0 @@
-module RipperRubyParser
-  module SexpHandlers
-    # Sexp handlers for array literals
-    module Arrays
-      def process_array(exp)
-        _, elems = exp.shift 2
-        return s(:array) if elems.nil?
-        s(:array, *handle_array_elements(elems))
-      end
-
-      def process_aref(exp)
-        _, coll, idx = exp.shift 3
-
-        coll = process(coll)
-        idx = process(idx) || s(:arglist)
-        idx.shift
-        s(:call, coll, :[], *idx)
-      end
-    end
-  end
-end

data/lib/ripper_ruby_parser/sexp_handlers/hashes.rb

@@ -1,48 +0,0 @@
-module RipperRubyParser
-  module SexpHandlers
-    # Sexp handlers for hash literals
-    module Hashes
-      # Handle hash literals sexps. These can be either empty, or contain a
-      # nested :assoclist_from_args Sexp.
-      #
-      # @example Empty hash
-      #   s(:hash, nil)
-      # @example Hash with contents
-      #   s(:hash, s(:assoclist_from_args, ...))
-      def process_hash(exp)
-        _, body = exp.shift 2
-        return s(:hash) unless body
-        _, elems = body
-        s(:hash, *make_hash_items(elems))
-      end
-
-      # @example
-      #   s(:assoc_splat, s(:vcall, s(:@ident, "bar")))
-      def process_assoc_splat(exp)
-        _, param = exp.shift 2
-        s(:kwsplat, process(param))
-      end
-
-      # Handle implied hashes, such as at the end of argument lists.
-      def process_bare_assoc_hash(exp)
-        _, elems = exp.shift 2
-        s(:hash, *make_hash_items(elems))
-      end
-
-      private
-
-      # Process list of items that can be either :assoc_new or :assoc_splat
-      def make_hash_items(elems)
-        result = s()
-        elems.each do |sub_exp|
-          if sub_exp.sexp_type == :assoc_new
-            sub_exp.sexp_body.each { |elem| result << process(elem) }
-          else # :assoc_splat
-            result << process(sub_exp)
-          end
-        end
-        result
-      end
-    end
-  end
-end