ruby_parser 3.13.0 → 3.15.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

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -ws
+#!/usr/bin/env ruby -ws
 
 $v ||= false
 
@@ -107,6 +107,7 @@ def munge s
 
              '"defined?"',     "kDEFINED",
 
+             "<none>",         "none",
 
              '"do (for condition)"', "kDO_COND",
              '"do (for lambda)"',    "kDO_LAMBDA",
@@ -117,6 +118,8 @@ def munge s
 
              /@(\d+)(\s+|$)/,       "",
              /\$?@(\d+) */,         "", # TODO: remove?
+
+             /_EXPR/,               "",
             ]
 
   renames.each_slice(2) do |(a, b)|
@@ -150,7 +153,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]
@@ -167,7 +170,7 @@ ARGF.each_line do |line|
     item = $1
     stack << munge(item)
   when /^-> \$\$ = (?:token|nterm) (.+) \(.*\)/ then
-    stack << "<none>" if stack.empty?
+    stack << "none" if stack.empty?
     item = munge $1
     x = stack.map { |s| s.strip }.join " "
     if x != item then # prevent kdef -> kdef
@@ -193,10 +196,13 @@ ARGF.each_line do |line|
     # TODO: make pretty, but still informative w/ line numbers etc
     puts line.gsub("true", "1").gsub("false", "0")
   when /^lex_state: :?([\w|]+) -> :?([\w|]+)(?: (?:at|from) (.*))?/ then
-    if $3 && $v then
-      puts "lex_state: #{$1.upcase} -> #{$2.upcase} at #{$3}"
+    a, b, c = $1.upcase, $2.upcase, $3
+    a.gsub! /EXPR_/, ""
+    b.gsub! /EXPR_/, ""
+    if c && $v then
+      puts "lex_state: #{a} -> #{b} at #{c}"
     else
-      puts "lex_state: #{$1.upcase} -> #{$2.upcase}"
+      puts "lex_state: #{a} -> #{b}"
     end
   when /debug|FUCK/ then
     puts line.chomp

data/tools/ripper.rb

@@ -6,14 +6,30 @@ $p ||= false
 require "ripper/sexp"
 require "pp" if $p
 
+if ARGV.empty? then
+  warn "reading from stdin"
+  ARGV << "-"
+end
+
+class MySexpBuilder < Ripper::SexpBuilderPP
+  def on_parse_error msg
+    Kernel.warn msg
+  end
+end
+
 ARGV.each do |path|
-  src = File.read path
-  rip = Ripper::SexpBuilderPP.new src
+  src = path == "-" ? $stdin.read : File.read(path)
+  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.0
+  version: 3.15.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBDANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE4MTIwNDIxMzAxNFoXDTE5MTIwNDIxMzAxNFowRTETMBEGA1UE
+  GRYDY29tMB4XDTE5MTIxMzAwMDIwNFoXDTIwMTIxMjAwMDIwNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQCbJwLmpJR2PomLU+Zzw3KRzH/hbyUWc/ftru71AopZ1fy4iY9J/BW5QYKVYwbP
-  V0FSBWtvfI/RdwfKGtuGhPKECZgmLieGuZ3XCc09qPu1bdg7i/tu1p0t0c6163ku
-  nDMDIC/t/DAFK0TY9I3HswuyZGbLW7rgF0DmiuZdN/RPhHq2pOLMLXJmFclCb/im
-  9yToml/06TJdUJ5p64mkBs0TzaK66DIB1Smd3PdtfZqoRV+EwaXMdx0Hb3zdR1JR
-  Em82dBUFsipwMLCYj39kcyHWAxyl6Ae1Cn9r/ItVBCxoeFdrHjfavnrIEoXUt4bU
-  UfBugfLD19bu3nvL+zTAGx/U
+  AQCkkcHqAa6IKLYGl93rn78J3L+LnqyxaA059n4IGMHWN5bv9KBQnIjOrpLadtYZ
+  vhWkunWDKdfVapBEq5+T4HzqnsEXC3aCv6JEKJY6Zw7iSzl0M8hozuzRr+w46wvT
+  fV2yTN6QTVxqbMsJJyjosks4ZdQYov2zdvQpt1HsLi+Qmckmg8SPZsd+T8uiiBCf
+  b+1ORSM5eEfBQenPXy83LZcoQz8i6zVB4aAfTGGdhxjoMGUEmSZ6xpkOzmnGa9QK
+  m5x9IDiApM+vCELNwDXXGNFEnQBBK+wAe4Pek8o1V1TTOxL1kGPewVOitX1p3xoN
+  h7iEjga8iM1LbZUfiISZ+WrB
   -----END CERTIFICATE-----
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2020-09-01 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.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: '3.22'
 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:
 
@@ -186,6 +186,8 @@ files:
 - lib/ruby25_parser.y
 - lib/ruby26_parser.rb
 - lib/ruby26_parser.y
+- lib/ruby27_parser.rb
+- lib/ruby27_parser.y
 - lib/ruby_lexer.rb
 - lib/ruby_lexer.rex
 - lib/ruby_lexer.rex.rb
@@ -200,7 +202,9 @@ files:
 homepage: https://github.com/seattlerb/ruby_parser
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/seattlerb/ruby_parser
+  bug_tracker_uri: https://github.com/seattlerb/ruby_parser/issues
 post_install_message: 
 rdoc_options:
 - "--main"
@@ -211,14 +215,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ruby_parser (RP) is a ruby parser written in pure ruby (utilizing racc--which

metadata.gz.sig

@@ -1 +1,4 @@
-�]��|F�H�SU��(�H����>w�Z�a��S���F���X��
P��-E��Q�qM����H�H����̠�u��ZG����B���oXOp1��QZ�)Elܧ�H6�Q���ղ�	��8[�dO���������A�-N`�=��m9t��j��n9�Pٻ�۲ja��;s8;j�w�n�a���I��Fξ��̊+C|��/��1�z�}'�MZ8,��$��B�T5�9b�O�\¾��y)5+H�[���/��
+Y9~��:��
+X�����-�)4Or[�#���C-�����pZs3W���حg���ۼL}�m�A'�G��ka���%I�N��B�N�>e���:��
��n�P�Kĉ�'���-�6p�������`��[je2�A���K�p�(<ˆ0(�}6E2 ��D��56W��R+���hPՎP�;��� �t�*��1]�.9�f��#=���?cW�pN�ͧ��DM���g�qxj3�!eP!���H��X�/�
+��
+�f