ruby_parser 3.2.0 → 3.2.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 3.2.1 / 2013-07-03
+
+* 1 bug fix:
+
+  * 1.9/2.0: Trailing assocs were being munged into arrays. (presidentbeef)
+
 === 3.2.0 / 2013-07-02
 
 * 1 major enhancement:

data/README.txt

@@ -13,19 +13,25 @@ base types.
 
 As an example:
 
-  def conditional1 arg1
-    return 1 if arg1 == 0
-    return 0
-  end
+    def conditional1 arg1
+      return 1 if arg1 == 0
+      return 0
+    end
 
 becomes:
 
-  s(:defn, :conditional1, s(:args, :arg1),
-    s(:if,
-      s(:call, s(:lvar, :arg1), :==, s(:lit, 0)),
-      s(:return, s(:lit, 1)),
-      nil),
-    s(:return, s(:lit, 0)))
+    s(:defn, :conditional1, s(:args, :arg1),
+      s(:if,
+        s(:call, s(:lvar, :arg1), :==, s(:lit, 0)),
+        s(:return, s(:lit, 1)),
+        nil),
+      s(:return, s(:lit, 0)))
+
+Tested against 801,039 files from the latest of all rubygems (as of 2013-05):
+
+* 1.8 parser is at 99.9739% accuracy, 3.651 sigma
+* 1.9 parser is at 99.9940% accuracy, 4.013 sigma
+* 2.0 parser is at 99.9939% accuracy, 4.008 sigma
 
 == FEATURES/PROBLEMS:
 

data/lib/ruby20_parser.rb

@@ -4510,13 +4510,14 @@ def _reduce_244(val, _values, result)
 end
 
 def _reduce_245(val, _values, result)
-                      result = args [val[0], s(:hash, *val[2].values)]
+                      result = args [val[0], array_to_hash(val[2])]
                     
     result
 end
 
 def _reduce_246(val, _values, result)
-                      result = s(:array, s(:hash, *val[0].values))
+                      result = args [array_to_hash(val[0])]
+                      result[0] = :array # TODO: switch to args?
                     
     result
 end
@@ -4583,7 +4584,8 @@ def _reduce_257(val, _values, result)
 end
 
 def _reduce_258(val, _values, result)
-                      result = call_args val
+                      result = call_args [val[0], array_to_hash(val[2])]
+                      result = self.arg_blk_pass result, val[3]
                     
     result
 end
@@ -4753,7 +4755,7 @@ def _reduce_291(val, _values, result)
 end
 
 def _reduce_292(val, _values, result)
-                      result = s(:hash, *val[1].values)
+                      result = s(:hash, *val[1].values) # TODO: array_to_hash?
                     
     result
 end

data/lib/ruby20_parser.y

@@ -794,11 +794,12 @@ rule
                     }
                 | args tCOMMA assocs trailer
                     {
-                      result = args [val[0], s(:hash, *val[2].values)]
+                      result = args [val[0], array_to_hash(val[2])]
                     }
                 | assocs trailer
                     {
-                      result = s(:array, s(:hash, *val[0].values))
+                      result = args [array_to_hash(val[0])]
+                      result[0] = :array # TODO: switch to args?
                     }
 
       paren_args: tLPAREN2 opt_call_args rparen
@@ -847,7 +848,8 @@ rule
                     }
                 | args tCOMMA assocs opt_block_arg
                     {
-                      result = call_args val
+                      result = call_args [val[0], array_to_hash(val[2])]
+                      result = self.arg_blk_pass result, val[3]
                     }
                 | block_arg
                     {
@@ -965,7 +967,7 @@ rule
                     }
                 | tLBRACE assoc_list tRCURLY
                     {
-                      result = s(:hash, *val[1].values)
+                      result = s(:hash, *val[1].values) # TODO: array_to_hash?
                     }
                 | kRETURN
                     {

data/lib/ruby_parser_extras.rb

@@ -111,7 +111,7 @@ class RPStringScanner < StringScanner
 end
 
 module RubyParserStuff
-  VERSION = "3.2.0" unless constants.include? "VERSION" # SIGH
+  VERSION = "3.2.1" unless constants.include? "VERSION" # SIGH
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments
@@ -214,7 +214,12 @@ module RubyParserStuff
   end
 
   def array_to_hash array
-    s(:hash, *array[1..-1])
+    case array.sexp_type
+    when :kwsplat then
+      array
+    else
+      s(:hash, *array[1..-1])
+    end
   end
 
   def call_args args

data/test/test_ruby_parser.rb

@@ -1681,6 +1681,27 @@ module TestRubyParserShared1920
     assert_parse rb, pt
   end
 
+  def test_call_arg_assoc
+    rb = "f(1, 2=>3)"
+    pt = s(:call, nil, :f, s(:lit, 1), s(:hash, s(:lit, 2), s(:lit, 3)))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_assoc
+    rb = "f(2=>3)"
+    pt = s(:call, nil, :f, s(:hash, s(:lit, 2), s(:lit, 3)))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_assoc_new
+    rb = "f(a:3)"
+    pt = s(:call, nil, :f, s(:hash, s(:lit, :a), s(:lit, 3)))
+
+    assert_parse rb, pt
+  end
+
   def test_do_lambda
     rb = "->() do end"
     pt = s(:iter, s(:call, nil, :lambda), 0)
@@ -2750,6 +2771,13 @@ class TestRuby20Parser < RubyParserTestCase
     assert_parse rb, pt
   end
 
+  def test_call_kwsplat
+    rb = "a(**1)"
+    pt = s(:call, nil, :a, s(:kwsplat, s(:lit, 1)))
+
+    assert_parse rb, pt
+  end
+
   def test_iter_kwarg
     rb = "a { |b: 1| }"
     pt = s(:iter, s(:call, nil, :a), s(:args, s(:kwarg, :b, s(:lit, 1))))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_parser
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 3
   - 2
-  - 0
-  version: 3.2.0
+  - 1
+  version: 3.2.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -136,19 +136,25 @@ description: |-
   
   As an example:
   
-    def conditional1 arg1
-      return 1 if arg1 == 0
-      return 0
-    end
+      def conditional1 arg1
+        return 1 if arg1 == 0
+        return 0
+      end
   
   becomes:
   
-    s(:defn, :conditional1, s(:args, :arg1),
-      s(:if,
-        s(:call, s(:lvar, :arg1), :==, s(:lit, 0)),
-        s(:return, s(:lit, 1)),
-        nil),
-      s(:return, s(:lit, 0)))
+      s(:defn, :conditional1, s(:args, :arg1),
+        s(:if,
+          s(:call, s(:lvar, :arg1), :==, s(:lit, 0)),
+          s(:return, s(:lit, 1)),
+          nil),
+        s(:return, s(:lit, 0)))
+  
+  Tested against 801,039 files from the latest of all rubygems (as of 2013-05):
+  
+  * 1.8 parser is at 99.9739% accuracy, 3.651 sigma
+  * 1.9 parser is at 99.9940% accuracy, 4.013 sigma
+  * 2.0 parser is at 99.9939% accuracy, 4.008 sigma
 email: 
 - ryand-ruby@zenspider.com
 executables: 

metadata.gz.sig

@@ -1 +1,3 @@
-e0�ݡ�,龋}�A� ��k-��Ŭ,2f��ll�w9}"�V7%vH޽�ܫ���P�Q]|�eze�r�e�zG;3�(e縏ӫ3:k��Vy�Fa���Q'୳o����=�7:��!��V6�6��.�Hny��n�U�Oɚsr��GG*�"���&X�׫����?Y��77|�t�o���/�d�"�)V�P���H�E��a���;S�YF!X��^��Y-��sHgA���s��!�ug�����~���r
+5��	�G�s�ڶ��)1�X\5+��BCј&�%'�o�6�g�f7�v�<)�g]?��J7��K���G����exE8
+�g	L�Ún��h��Dl+��p�;�ڟ� ���;[xF�
+~�U�6��8_أ3���	�!4�!xM��k��v�$���R���#��+�*r��