ruby_parser 3.13.1 → 3.14.0

data/test/test_ruby_parser_extras.rb

@@ -16,11 +16,11 @@ class TestStackState < Minitest::Test
     p = RubyParser.latest
     s = nil
 
-    out, err = capture_io do
+    out, err = capture_io {
       s = p.handle_encoding str
-    end
+    }
 
-    assert_equal orig_str.sub(/\357\273\277/, ''), s
+    assert_equal orig_str.sub(/\357\273\277/, ""), s
 
     exp_err = ""
 
@@ -162,7 +162,7 @@ end
 
 class TestEnvironment < Minitest::Test
   def deny t
-    assert ! t
+    assert !t
   end
 
   def setup
@@ -224,3 +224,38 @@ class TestEnvironment < Minitest::Test
     assert_equal expected0, @env.all
   end
 end
+
+class Fake20
+  include RubyParserStuff
+
+  def initialize
+  end
+
+  def s(*a) # bypass lexer/lineno stuff that RP overrides in
+    Kernel.send :s, *a
+  end
+end
+
+class TestValueExpr < Minitest::Test
+  def assert_value_expr exp, input
+    assert_equal exp, Fake20.new.value_expr(input.line(1))
+  end
+
+  def assert_remove_begin exp, input
+    assert_equal exp, Fake20.new.remove_begin(input.line(1))
+  end
+
+  def test_value_expr
+    assert_value_expr s(:nil),                     s(:begin)
+    assert_value_expr s(:nil),                     s(:begin, s(:nil))
+    assert_value_expr s(:nil),                     s(:begin, s(:begin, s(:nil)))
+    assert_value_expr s(:begin, s(:nil), s(:nil)), s(:begin, s(:nil), s(:nil))
+  end
+
+  def test_remove_begin
+    assert_remove_begin s(:nil),                     s(:begin)
+    assert_remove_begin s(:nil),                     s(:begin, s(:nil))
+    assert_remove_begin s(:nil),                     s(:begin, s(:begin, s(:nil)))
+    assert_remove_begin s(:begin, s(:nil), s(:nil)), s(:begin, s(:nil), s(:nil))
+  end
+end

data/tools/munge.rb

@@ -151,7 +151,7 @@ ARGF.each_line do |line|
     next if last_token == token
     puts "next token is %p (%p)" % [token, last_token]
     last_token = token
-  when /^Next token is token (\S+)/ then
+  when /^Next token is token ("[^"]+"|\S+)/ then
     token = munge $1
     next if last_token == token
     puts "next token is %p (%p)" % [token, last_token]

data/tools/ripper.rb

@@ -11,14 +11,25 @@ if ARGV.empty? then
   ARGV << "-"
 end
 
+class MySexpBuilder < Ripper::SexpBuilderPP
+  def on_parse_error msg
+    Kernel.warn msg
+  end
+end
+
 ARGV.each do |path|
   src = path == "-" ? $stdin.read : File.read(path)
-  rip = Ripper::SexpBuilderPP.new src
+  rip = MySexpBuilder.new src
   rip.yydebug = $d
 
   sexp = rip.parse
 
-  puts "accept" unless rip.error?
+  if rip.error? then
+    warn "skipping"
+    next
+  end
+
+  puts "accept"
 
   if $p then
     pp sexp

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.13.1
+  version: 3.14.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Em82dBUFsipwMLCYj39kcyHWAxyl6Ae1Cn9r/ItVBCxoeFdrHjfavnrIEoXUt4bU
   UfBugfLD19bu3nvL+zTAGx/U
   -----END CERTIFICATE-----
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -113,19 +113,19 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: '3.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: '3.18'
 description: |-
   ruby_parser (RP) is a ruby parser written in pure ruby (utilizing
-  racc--which does by default use a C extension). RP's output is
-  the same as ParseTree's output: s-expressions using ruby's arrays and
-  base types.
+  racc--which does by default use a C extension). It outputs
+  s-expressions which can be manipulated and converted back to ruby via
+  the ruby2ruby gem.
 
   As an example:
 
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ruby_parser (RP) is a ruby parser written in pure ruby (utilizing racc--which