ruby_parser 3.1.2 → 3.1.3

data.tar.gz.sig

@@ -1,2 +1,2 @@
-9[�<��kS�M/��5s� p�,&+�S%�U2eS�a�t9���Kɦ�7�N9����F"��FYJ�ɣ�X�G��	
-���Nrd�O)��U��϶ъ��Q{�����X����=oL�Um]|���C�����iϾ;e�[� g)>�u{@��pJS�E�0걆ӑ֤Ӱ~i*;Ŋ�v9�� #�N^�͊���,�������T-Ub�S]Ux�{�l��c��[��	Nʕ����`�3�ʰ��8��Q<
+��)E�hs�t��)��3Z�-�4h���� (L'&@E�-6�)�.����EN1'�Pћ�ۓ�1DnS;�GEz�]h
+Pk����D��9w���$�����ԉ�Y��Iޮf0Ǭ�Mx�m�G�<lrZ�K*ʍ�A����O��㸌�(4�������v�u=��|T6�]�D6�	��Zn䤧-�g�������h���EI@S^��T���+�QҘR��Ι���Jh�ҡ�@���|�Ni5Я{�W�

data/History.txt

@@ -1,3 +1,10 @@
+=== 3.1.3 / 2013-04-09
+
+* 2 bug fixes:
+
+  * Fixed begin w/ else but no rescue. (whitequark)
+  * Removed literal stripping from block_append. Not its job.
+
 === 3.1.2 / 2013-03-18
 
 * 1 minor enhancement:

data/lib/ruby18_parser.rb

@@ -11,6 +11,8 @@ class Ruby18Parser < Racc::Parser
 require "ruby_lexer"
 require "ruby_parser_extras"
 
+# :stopdoc:
+
 # Local Variables: **
 # racc-token-length-max:14 **
 # End: **

data/lib/ruby18_parser.y

@@ -1872,6 +1872,8 @@ end
 require "ruby_lexer"
 require "ruby_parser_extras"
 
+# :stopdoc:
+
 # Local Variables: **
 # racc-token-length-max:14 **
 # End: **

data/lib/ruby19_parser.rb

@@ -11,6 +11,8 @@ class Ruby19Parser < Racc::Parser
 require "ruby_lexer"
 require "ruby_parser_extras"
 
+# :stopdoc:
+
 # Local Variables: **
 # racc-token-length-max:14 **
 # End: **

data/lib/ruby19_parser.y

@@ -2077,6 +2077,8 @@ end
 require "ruby_lexer"
 require "ruby_parser_extras"
 
+# :stopdoc:
+
 # Local Variables: **
 # racc-token-length-max:14 **
 # End: **

data/lib/ruby_lexer.rb

@@ -2,6 +2,7 @@
 
 class RubyLexer
 
+  # :stopdoc:
   RUBY19 = "".respond_to? :encoding
 
   IDENT_CHAR_RE = if RUBY19 then
@@ -19,6 +20,7 @@ class RubyLexer
   attr_accessor :nest
 
   ESC_RE = /\\((?>[0-7]{1,3}|x[0-9a-fA-F]{1,2}|M-[^\\]|(C-|c)[^\\]|[^0-7xMCc]))/
+  # :startdoc:
 
   ##
   # What version of ruby to parse. 18 and 19 are the only valid values
@@ -53,6 +55,8 @@ class RubyLexer
   EOF = :eof_haha!
 
   # ruby constants for strings (should this be moved somewhere else?)
+
+  # :stopdoc:
   STR_FUNC_BORING = 0x00
   STR_FUNC_ESCAPE = 0x01 # TODO: remove and replace with REGEXP
   STR_FUNC_EXPAND = 0x02
@@ -82,6 +86,7 @@ class RubyLexer
     "=~"  => :tMATCH,
     "->"  => :tLAMBDA,
   }
+  # :startdoc:
 
   # How the parser advances to the next token.
   #

data/lib/ruby_parser_extras.rb

@@ -7,6 +7,7 @@ require 'strscan'
 require 'ruby_lexer'
 require "timeout"
 
+# :stopdoc:
 # WHY do I have to do this?!?
 class Regexp
   ONCE = 0 unless defined? ONCE # FIX: remove this - it makes no sense
@@ -25,6 +26,7 @@ class Fixnum
     self
   end
 end unless "a"[0] == "a"
+# :startdoc:
 
 class RPStringScanner < StringScanner
 #   if ENV['TALLY'] then
@@ -108,7 +110,7 @@ class RPStringScanner < StringScanner
 end
 
 module RubyParserStuff
-  VERSION = '3.1.2' unless constants.include? "VERSION" # SIGH
+  VERSION = "3.1.3" unless constants.include? "VERSION" # SIGH
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments
@@ -263,11 +265,6 @@ module RubyParserStuff
     return head if tail.nil?
     return tail if head.nil?
 
-    case head[0]
-    when :lit, :str then
-      return tail
-    end
-
     line = [head.line, tail.line].compact.min
 
     head = remove_begin(head)
@@ -473,29 +470,34 @@ module RubyParserStuff
   end
 
   def new_body val
-    result = val[0]
+    body, resbody, elsebody, ensurebody = val
 
-    if val[1] then
+    result = body
+
+    if resbody then
       result = s(:rescue)
-      result << val[0] if val[0]
+      result << body if body
 
-      resbody = val[1]
+      res = resbody
 
-      while resbody do
-        result << resbody
-        resbody = resbody.resbody(true)
+      while res do
+        result << res
+        res = res.resbody(true)
       end
 
-      result << val[2] if val[2]
+      result << elsebody if elsebody
+
+      result.line = (body || resbody).line
+    end
 
-      result.line = (val[0] || val[1]).line
-    elsif not val[2].nil? then
+    if elsebody and not resbody then
       warning("else without rescue is useless")
-      result = block_append(result, val[2])
+      result = block_append(s(:begin, result), elsebody)
     end
 
-    result = s(:ensure, result, val[3]).compact if val[3]
-    return result
+    result = s(:ensure, result, ensurebody).compact if ensurebody
+
+    result
   end
 
   def argl x

data/test/test_ruby_parser.rb

@@ -275,6 +275,13 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_bug_begin_else
+    rb = "begin 1; else; 2 end"
+    pt = s(:block, s(:lit, 1), s(:lit, 2))
+
+    assert_parse rb, pt
+  end
+
   def test_bug_comment_eq_begin
     rb = "\n\n#\n=begin\nblah\n=end\n\n"
     pt = nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_parser
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 3
   - 1
-  - 2
-  version: 3.1.2
+  - 3
+  version: 3.1.3
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2013-03-18 00:00:00 Z
+date: 2013-04-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
@@ -61,11 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 4
-        - 6
-        version: "4.6"
+        - 7
+        version: "4.7"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -76,11 +76,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 27
         segments: 
-        - 3
-        - 10
-        version: "3.10"
+        - 4
+        - 0
+        version: "4.0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency