ruby_parser 3.19.0 → 3.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e8b4b78bfb538253820b4ff34d49ebf7a91f9722c0ecfb63e3dadb3067530cb
-  data.tar.gz: e8e6e9cc42513094304d79a10fb4802706b10cb147084683c5dd3315c2ecde9a
+  metadata.gz: 2901404db3548ad6415060c14df20ae11431fff4a97420659187601a534eb256
+  data.tar.gz: 69705481ccbd6a8ffafbb81c25c40890a4683a19440196a19bbcc119f093612a
 SHA512:
-  metadata.gz: dd72b30995fbc5ad74f04dedc341572d03b73b962ddd2dd3ecd255c8d1babe1b4e190b780588b846f2c8b8942327ac4a50bda0e8401d02037299f9b16965e69b
-  data.tar.gz: 5793d0f9bf5e11f56db8eb5b53fd4b603664e72818b4bc43a3bfb61cf3c4a0c61f9ecee3757350a684271ae9e0c434782ef739ef0f075b3897fa338bcd2680c5
+  metadata.gz: 1a5d89ba1fed1a0a49b5eb71eeb8cc6f80a396d6eaf49bec5742d62cd503916b90136ae689de4fa3a5de180544ba3ef6e8fca03e52bd8349b32c65dfa7962a28
+  data.tar.gz: c68ae86de3cbd9a1b86b6c5acbd0ecc8d809a30c42f7b50217d5038f262a6f61a3baa739332285d59158af9d3c9c3c8d8742e2eca499cf41536f14332e9f7eb9

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 3.19.1 / 2022-04-05
+
+* 2 bug fixes:
+
+  * Added comments to endless defn and defs. (mvz)
+  * Fixed endless method bug handling attrset names.
+
 === 3.19.0 / 2022-03-29
 
 * 1 major enhancement:

data/gauntlet.md

@@ -42,8 +42,7 @@ using `unpack_gems.rb`.
 ... waaaait ...
 % DIR=gauntlet.$(today).(all|new).noindex
 % mv hashed.noindex $DIR
-% tar c $DIR | zstd -5 -T0 --long > archives/$DIR.tar.zst
-% tar vc -T <(fd . $DIR | sort) | zstd -5 -T0 --long > archives/$DIR.tar.zst
+% tar vc -T <(fd -tf . $DIR | sort) | zstd -5 -T0 --long > archives/$DIR.tar.zst ; say done
 % ./bin/sync.sh
 ```
 
@@ -66,8 +65,8 @@ Unpacking, validating, SHA'ing everything is disk and CPU intensive.
 The `.noindex` extension stops spotlight from indexing the continous
 churn of files being unpacked and moved and saves time.
 
-Finally, I rename and archive it all up (currently using lrztar, but
-I'm not in love with it).
+Finally, I rename and archive it all up (currently using zstd to
+compress).
 
 ### Stats
 
@@ -75,7 +74,7 @@ I'm not in love with it).
 9696 % find gauntlet.$(today).noindex -type f | lc
   561270
 3.5G gauntlet.2021-08-06.noindex
-239M gauntlet.2021-08-06.noindex.tar.lrz
+239M gauntlet.2021-08-06.noindex.tar.zst
 ```
 
 So I wind up with a little over half a million unique ruby files to
@@ -86,7 +85,7 @@ parse. It's about 3.5g but compresses very nicely down to 240m
 Assuming you're starting from scratch, unpack the archive once:
 
 ```
-% lrzuntar gauntlet.$(today).noindex.lrz
+% zstdcat gauntlet.$(today).noindex.tar.zst | tar x
 ```
 
 Then, either run a single process (easier to read):
@@ -98,7 +97,7 @@ Then, either run a single process (easier to read):
 Or max out your machine using xargs (note the `-P 16` and choose accordingly):
 
 ```
-% ls -d gauntlet/*.noindex/?/? | xargs -n 1 -P 16 ./gauntlet/bin/gauntlet.rb
+% ls -d gauntlet/*.noindex/?/? | time xargs -n 1 -P 16 ./gauntlet/bin/gauntlet.rb
 ```
 
 In another terminal I usually monitor the progress like so:

data/lib/ruby_parser_extras.rb

@@ -30,7 +30,7 @@ class Sexp
 end
 
 module RubyParserStuff
-  VERSION = "3.19.0"
+  VERSION = "3.19.1"
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_accessor :in_kwarg
@@ -218,11 +218,15 @@ module RubyParserStuff
     self.args args
   end
 
+  def attrset_id? id
+    id =~ /^\[\]=$|^\w+=$/
+  end
+
   def endless_method_name defn_or_defs
     name = defn_or_defs[1]
     name = defn_or_defs[2] unless Symbol === name
 
-    if name.end_with? "=" then
+    if attrset_id? name then
       yyerror "setter method cannot be defined in an endless method definition"
     end
 
@@ -994,6 +998,8 @@ module RubyParserStuff
     local_pop in_def
     endless_method_name result
 
+    result.comments = self.comments.pop
+
     result
   end
 
@@ -1014,6 +1020,8 @@ module RubyParserStuff
     local_pop in_def
     endless_method_name result
 
+    result.comments = self.comments.pop
+
     result
   end
 

data/test/test_ruby_parser.rb

@@ -5272,6 +5272,15 @@ module TestRubyParserShared30Plus
     assert_parse rb, pt.deep_each { |s| s.line = 1 }
   end
 
+  def test_defn_oneliner_comment
+    p = RubyParser.new
+    rb = "# blah\ndef exec(cmd) = system(cmd)"
+    sexp = p.parse rb
+
+    assert_equal :defn, sexp.sexp_type
+    assert_equal "# blah\n", sexp.comments
+  end
+
   def test_defs_oneliner
     rb = "def self.exec(cmd) = system(cmd)"
     pt = s(:defs, s(:self), :exec, s(:args, :cmd),
@@ -5295,17 +5304,54 @@ module TestRubyParserShared30Plus
     assert_parse rb, pt.deep_each { |s| s.line = 1 }
   end
 
+  def test_defs_oneliner_comment
+    p = RubyParser.new
+    rb = "# blah\ndef self.exec(cmd) = system(cmd)"
+    sexp = p.parse rb
+
+    assert_equal :defs, sexp.sexp_type
+    assert_equal "# blah\n", sexp.comments
+  end
+
   def test_defn_oneliner_setter
     rb = "class X\n  def x=(o) = 42\nend"
 
     assert_syntax_error rb, /setter method cannot be defined/
+
+    rb = "class X\n  def []=(k, v) = 42\nend"
+
+    assert_syntax_error rb, /setter method cannot be defined/
   end
 
   def test_defs_oneliner_setter
-    rb = "class X\n  def self.x= = 42\nend"
+    rb = "class X\n  def self.x=(o) = 42\nend"
+
+    assert_syntax_error rb, /setter method cannot be defined/
+
+    rb = "class X\n  def self.[]=(k, v) = 42\nend"
 
     assert_syntax_error rb, /setter method cannot be defined/
   end
+
+  def test_defn_oneliner_eq2
+    rb = "class X\n  def ==(o) = 42\nend"
+    pt = s(:class, :X, nil,
+           s(:defn, :==, s(:args, :o).line(2),
+             s(:lit, 42).line(2)).line(2)
+          ).line(1)
+
+    assert_parse rb, pt
+  end
+
+  def test_defs_oneliner_eq2
+    rb = "class X\n  def self.==(o) = 42\nend"
+    pt = s(:class, :X, nil,
+           s(:defs, s(:self).line(2), :==, s(:args, :o).line(2),
+             s(:lit, 42).line(2)).line(2)
+          ).line(1)
+
+    assert_parse rb, pt
+  end
 end
 
 module TestRubyParserShared31Plus

data.tar.gz.sig

@@ -1,6 +1 @@
-#���ө
-D+� Ps4��@VHXhoSv�|Ý[�=�����U�w�F�@Ju��%�GS=��@p�;
-��*A05Yx�&�q�	�.�QQ:a>�0mZ���� �w�j�b���sA���*b�d��?3��4��x�Qw!���
-e�
-��z*�������Pp��/���F~J{W:4
-�U�/ѯ5�,u	�#ɓ���-
+��C-]̓�˺��)5J��������I�[���Y5��S�t?���e��z�1�Q����e��i��ł��^���BU4�'b�����o!_�ٝ:�Q�"l�l�$c��5n�V6L5{І���	0�}���By�p3�^�H�{���5�����j�y���
I�N^�6�����IZ�DQ݆M�	2w|(|x�uaP�F��L�i���6��M�>5s��@_�%�|�P����[��GP��i���

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.19.0
+  version: 3.19.1
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   JFmxn4h9YO/pVdB962BdBNNDia0kgIjI3ENnkLq0dKpYU3+F3KhEuTksLO0L6X/V
   YsuyUzsMz6GQA4khyaMgKNSD
   -----END CERTIFICATE-----
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor