ruby_parser 3.1.0 → 3.1.1

data/History.txt

@@ -1,3 +1,16 @@
+=== 3.1.1 / 2012-12-19
+
+* 1 minor enhancement:
+
+  * Added MOVE_TIMEOUT env var for ruby_parse_extract_error to move slow files to a sibling directory
+
+* 4 bug fixes:
+
+  * 1.9: Fixed lexing of "0o". (whitequark)
+  * 1.9: Fixed parsing of unary plus on literals. (whitequark)
+  * Added timeout arg to RubyParser#process to pass through to the real parser
+  * Updated Synopsis to reflect new options for running RP. (louismullie)
+
 === 3.1.0 / 2012-12-06
 
 * 2 minor enhancements:

data/README.txt

@@ -43,7 +43,12 @@ becomes:
 
 == SYNOPSIS:
 
-  Ruby19Parser.new.parse "1+1"
+  RubyParser.new.parse "1+1"
+  # => s(:call, s(:lit, 1), :+, s(:lit, 1))
+
+You can also use Ruby19Parser, Ruby18Parser, or RubyParser.for_current_ruby:
+
+  RubyParser.for_current_ruby.parse "1+1"
   # => s(:call, s(:lit, 1), :+, s(:lit, 1))
 
 == REQUIREMENTS:

data/bin/ruby_parse_extract_error

@@ -4,11 +4,14 @@ $d ||= false
 $d ||= ENV["DELETE"]
 $t ||= false
 $t ||= ENV["DELETE_TIMEOUT"]
+$m ||= false
+$m ||= ENV["MOVE_TIMEOUT"]
 $q ||= false
 $q ||= ENV["QUIET"]
 
 require 'rubygems'
 require 'ruby_parser'
+require 'fileutils'
 
 ARGV.push "-" if ARGV.empty?
 
@@ -96,7 +99,14 @@ def process file
 rescue Timeout::Error
   $exit = 1
   warn "TIMEOUT parsing #{file}. Skipping."
-  File.unlink file if $t
+
+  if $m then
+    dir = File.join $m, File.dirname(file)
+    FileUtils.mkdir_p dir
+    FileUtils.move file, dir
+  elsif $t then
+    File.unlink file
+  end
 rescue StandardError, SyntaxError, Racc::ParseError => e
   $exit = 1
   warn ""

data/lib/ruby19_parser.rb

@@ -4117,11 +4117,7 @@ def _reduce_215(val, _values, result)
 end
 
 def _reduce_216(val, _values, result)
-                      if val[1][0] == :lit then
-                        result = val[1]
-                      else
-                        result = new_call val[1], :"+@"
-                      end
+                      result = new_call val[1], :"+@"
                     
     result
 end

data/lib/ruby19_parser.y

@@ -671,11 +671,7 @@ rule
                     }
                 | tUPLUS arg
                     {
-                      if val[1][0] == :lit then
-                        result = val[1]
-                      else
-                        result = new_call val[1], :"+@"
-                      end
+                      result = new_call val[1], :"+@"
                     }
                 | tUMINUS arg
                     {

data/lib/ruby_lexer.rb

@@ -188,7 +188,7 @@ class RubyLexer
     self.string_buffer = []
 
     case
-    when src.scan(/(-?)(['"`])(.*?)\2/) then
+    when src.scan(/(-?)([\'\"\`])(.*?)\2/) then
       term = src[2]
       func |= STR_FUNC_INDENT unless src[1].empty?
       func |= case term
@@ -200,7 +200,7 @@ class RubyLexer
                 STR_XQUOTE
               end
       string_buffer << src[3]
-    when src.scan(/-?(['"`])(?!\1*\Z)/) then
+    when src.scan(/-?([\'\"\`])(?!\1*\Z)/) then
       rb_compile_error "unterminated here document identifier"
     when src.scan(/(-?)(\w+)/) then
       term = '"'
@@ -249,6 +249,9 @@ class RubyLexer
 
   def int_with_base base
     rb_compile_error "Invalid numeric format" if src.matched =~ /__/
+    rb_compile_error "numeric literal without digits" if
+      ruby19 and src.matched =~ /0o/i
+
     self.yacc_value = src.matched.to_i(base)
     return :tINTEGER
   end

data/lib/ruby_parser_extras.rb

@@ -108,7 +108,7 @@ class RPStringScanner < StringScanner
 end
 
 module RubyParserStuff
-  VERSION = '3.1.0' unless constants.include? "VERSION" # SIGH
+  VERSION = '3.1.1' unless constants.include? "VERSION" # SIGH
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments
@@ -1286,10 +1286,10 @@ class RubyParser
     @p19 = Ruby19Parser.new
   end
 
-  def process(s, f = "(string)") # parens for emacs *sigh*
-    @p19.process s, f
+  def process(s, f = "(string)", t = 10) # parens for emacs *sigh*
+    @p19.process s, f, t
   rescue Racc::ParseError
-    @p18.process s, f
+    @p18.process s, f, t
   end
 
   alias :parse :process

data/test/test_ruby_parser.rb

@@ -1764,4 +1764,11 @@ class TestRuby19Parser < RubyParserTestCase
     rb = "f::(42)"
     assert_parse rb, pt
   end
+
+  def test_unary_plus_on_literal
+    rb = "+:a"
+    pt = s(:call, s(:lit, :a), :+@)
+
+    assert_parse rb, pt
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_parser
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  version: 3.1.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-12-07 00:00:00 Z
+date: 2012-12-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
@@ -107,11 +107,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 15
         segments: 
         - 3
-        - 3
-        version: "3.3"
+        - 4
+        version: "3.4"
   type: :development
   version_requirements: *id005
 description: |-

metadata.gz.sig

@@ -1 +1,2 @@
-�ۇ�o�����?�^iu�vS�?��bx
+�����”߱PjGdz�ޠ�;�?��Ns2��'rB;�]�%�a��eEJ�9v�^_ޅ��s�Y-d>`ٸ=�,�=	/0�'�`�6�x3	Fķ�7Z�5�)�9��pY���zvnh�H��x)b:!H�.	���(����`��uom�W�S>C����_E���(!��p�=��"c����Bg!�V1���[r����:
+�*�k�ӒV禈�P�