ruby_parser 3.6.5 → 3.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6eb0d6e0579b323fc21cdc6105397a480bac14d
-  data.tar.gz: 3a8c2361d645fb32c5107670e05522d4d9f42023
+  metadata.gz: 09754494e04948801beb28a7a2f32a8e53ba20c5
+  data.tar.gz: d24103e108f923b0f0665b3bf9e367f1618f9b73
 SHA512:
-  metadata.gz: 429098576dc2f8ca764cf19de30a756f15b6efe8845e1dee0e25e1aeb1c5bafc9247199bf759b200582f6ad9e4eaf89d0caa4db1ab8a0563b74eed5d491bfed3
-  data.tar.gz: e2c3c8c523e35a40f27adc89506a7e93113aac369b48c9f61f03df4770c8e114c7c9226d309a613b79d3eeee3da9b11755788af01f7183cff3bc669558f6b0f4
+  metadata.gz: f0c22a3e4dd845e6df193ccef9cd23cb9b461070b2964a11413b6e8c30d3851d69a8cee31e472fb48d9a3e5b0ac42d0adbd6ccf1456260d7f87d8ef526588147
+  data.tar.gz: 43f5cfddfe50a2c212536d002f99b7bef6bca40c9e92493bca0a1caea8a8ed2847eb66be041661d7f1ab171980a75b9d33609bf24e4e7f74babcb95e86ac6c78

checksums.yaml.gz.sig

@@ -1,2 +1,4 @@
-��`ś(T���]Z:�ly���1ѿ��!
-�|-�(o�¡��O�dI)5���͢��g���_�B`����h"�O�lO�Y��xB���W�hw�NK�aШ��ΠQiu�[�.�N+�~XSF��U����-Lk�M�e[�g�en��&Tcf|��_uPOm�i��k�s�_�$��ۚo�f؈ڑ�N(����
���#pQ��T��H���h���@݄�v�Z%�&W�+ʒB
�Z���7Vy�m�8�����
+O�#f��-Ց)�ewqﳮ�*�L;�;�b"�jLR���
+
+�
+��Q�!�f(S�tk��QG�k)WO��Eo��mZ�!�i<O����&V7g��8��2���ir=Ɍ^'��oF�̻��J��%k���h��0�B�En��d���D$ĝ�/�9�&k�980w44<�_=�@��ލ)VmK�	D���Bn6@7��Ki�����O"$�Z\�RN21�~D�J�9Z�A8��w��[3�4��O۲oYf�@1�~���

data/History.txt

@@ -1,3 +1,17 @@
+=== 3.6.6 / 2015-04-13
+
+* 1 minor enhancement:
+
+  * Added expr_labelarg state (eg: a:1)
+
+* 5 bug fixes:
+
+  * Fix scan logging backtrace when DEBUG=1
+  * Fixed kwsplat on 2.0 & 2.1.
+  * Fixed mandatory keyword block args. (cvortmann)
+  * Handle #$<x> in expanded strings/regexps where x is NOT a valid gvar name.
+  * Invalid gvar names raise a compile error.
+
 === 3.6.5 / 2015-03-12
 
 * 1 minor enhancement:

data/Rakefile

@@ -79,9 +79,9 @@ task :isolate => :phony
   task "compare#{v}" do
     sh "./yack.rb lib/ruby#{v}_parser.output > racc#{v}.txt"
     sh "./yack.rb parse#{v}.output > yacc#{v}.txt"
-    sh "diff -du racc#{v}.txt yacc#{v}.txt || true"
+    sh "diff -du yacc#{v}.txt racc#{v}.txt || true"
     puts
-    sh "diff -du racc#{v}.txt yacc#{v}.txt | wc -l"
+    sh "diff -du yacc#{v}.txt racc#{v}.txt | wc -l"
   end
 end
 

data/lib/ruby20_parser.rb

@@ -6584,7 +6584,7 @@ def _reduce_589(val, _values, result)
 end
 
 def _reduce_590(val, _values, result)
-                      result = s(:kwsplat, val[1])
+                      result = s(:array, s(:kwsplat, val[1]))
                     
     result
 end

data/lib/ruby20_parser.y

@@ -2292,7 +2292,7 @@ keyword_variable: kNIL      { result = s(:nil)   }
                     }
                 | tDSTAR arg_value
                     {
-                      result = s(:kwsplat, val[1])
+                      result = s(:array, s(:kwsplat, val[1]))
                     }
 
        operation: tIDENTIFIER | tCONSTANT | tFID

data/lib/ruby21_parser.rb

@@ -6479,7 +6479,11 @@ def _reduce_560(val, _values, result)
 end
 
 def _reduce_561(val, _values, result)
-                      raise "fuck 11"
+                      label, _ = val[0] # TODO: fix lineno?
+                      identifier = label.to_sym
+                      self.env[identifier] = :lvar
+
+                      result = s(:array, s(:kwarg, identifier))
                     
     result
 end
@@ -6655,7 +6659,7 @@ def _reduce_593(val, _values, result)
 end
 
 def _reduce_594(val, _values, result)
-                      result = s(:kwsplat, val[1])
+                      result = s(:array, s(:kwsplat, val[1]))
                     
     result
 end

data/lib/ruby21_parser.y

@@ -2172,7 +2172,11 @@ keyword_variable: kNIL      { result = s(:nil)   }
                     }
                 | f_label
                     {
-                      raise "fuck 11"
+                      label, _ = val[0] # TODO: fix lineno?
+                      identifier = label.to_sym
+                      self.env[identifier] = :lvar
+
+                      result = s(:array, s(:kwarg, identifier))
                     }
 
    f_block_kwarg: f_block_kw
@@ -2307,7 +2311,7 @@ keyword_variable: kNIL      { result = s(:nil)   }
                     }
                 | tDSTAR arg_value
                     {
-                      result = s(:kwsplat, val[1])
+                      result = s(:array, s(:kwsplat, val[1]))
                     }
 
        operation: tIDENTIFIER | tCONSTANT | tFID

data/lib/ruby_lexer.rb

@@ -271,7 +271,7 @@ class RubyLexer
   end
 
   def is_beg?
-    in_lex_state? :expr_beg, :expr_value, :expr_mid, :expr_class
+    in_lex_state? :expr_beg, :expr_value, :expr_mid, :expr_class, :expr_labelarg
   end
 
   def is_end?
@@ -406,7 +406,8 @@ class RubyLexer
   end
 
   def process_gvar_oddity text
-    result :expr_end, "$", "$" # TODO: wtf is this?
+    return result :expr_end, "$", "$" if text == "$" # TODO: wtf is this?
+    rb_compile_error "#{text.inspect} is not allowed as a global variable name"
   end
 
   def process_ivar text
@@ -673,7 +674,7 @@ class RubyLexer
       end
 
     if !ruby18 and is_label_possible? and scan(/:(?!:)/) then
-      return result(:expr_beg, :tLABEL, [token, self.lineno])
+      return result(:expr_labelarg, :tLABEL, [token, self.lineno])
     end
 
     unless in_lex_state? :expr_dot then
@@ -1144,7 +1145,12 @@ class RubyLexer
 
     if expand
       case
-      when scan(/#(?=[$@])/) then
+      when scan(/#(?=\$(-.|[a-zA-Z_0-9~\*\$\?!@\/\\;,\.=:<>\"\&\`\'+]))/) then
+        # TODO: !ISASCII
+        # ?! see parser_peek_variable_name
+        return :tSTRING_DVAR, nil
+      when scan(/#(?=\@\@?[a-zA-Z_])/) then
+        # TODO: !ISASCII
         return :tSTRING_DVAR, nil
       when scan(/#[{]/) then
         return :tSTRING_DBEG, nil

data/lib/ruby_lexer.rex

@@ -92,6 +92,7 @@ rule
 
                 /\[/                    process_square_bracket
 
+# 2.2:          /\'#{SSTRING}\':/o      process_symbol
                 /\'#{SSTRING}\'/o       { result :expr_end, :tSTRING, matched[1..-2].gsub(/\\\\/, "\\").gsub(/\\'/, "'") } # " stupid emacs
 
 : /\|/

data/lib/ruby_parser_extras.rb

@@ -79,7 +79,7 @@ class RPStringScanner < StringScanner
     alias :old_scan :scan
     def scan re
       s = old_scan re
-      where = caller.first.split(/:/).first(2).join(":")
+      where = caller[1].split(/:/).first(2).join(":")
       d :scan => [s, where] if s
       s
     end
@@ -91,7 +91,7 @@ class RPStringScanner < StringScanner
 end
 
 module RubyParserStuff
-  VERSION = "3.6.5" unless constants.include? "VERSION" # SIGH
+  VERSION = "3.6.6" unless constants.include? "VERSION" # SIGH
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments

data/test/test_ruby_lexer.rb

@@ -298,7 +298,7 @@ class TestRubyLexer < Minitest::Test
     assert_lex3("{a:",
                 nil,
                 :tLBRACE, "{", :expr_beg,
-                :tLABEL,  "a", :expr_beg)
+                :tLABEL,  "a", :expr_labelarg)
   end
 
   def test_yylex_label_in_params__19
@@ -308,7 +308,7 @@ class TestRubyLexer < Minitest::Test
                 nil,
                 :tIDENTIFIER, "foo", :expr_cmdarg,
                 :tLPAREN2,    "(",   :expr_beg,
-                :tLABEL,      "a",   :expr_beg)
+                :tLABEL,      "a",   :expr_labelarg)
   end
 
   def test_yylex_paren_string_parens_interpolated
@@ -852,9 +852,13 @@ class TestRubyLexer < Minitest::Test
     end
   end
 
-  def test_yylex_dollar
-    assert_lex3("$", nil, "$", "$", :expr_end)
-    # FIX: wtf is this?!?
+  def test_yylex_dollar_bad
+    e = refute_lex("$%")
+    assert_includes(e.message, "is not allowed as a global variable name")
+  end
+
+  def test_yylex_dollar_eos
+    assert_lex3("$", nil, "$", "$", :expr_end) # FIX: wtf is this?!?
   end
 
   def test_yylex_dot # HINT message sends
@@ -2289,6 +2293,14 @@ class TestRubyLexer < Minitest::Test
                 :tSTRING_END,     "\"",         :expr_end)
   end
 
+  def test_yylex_string_double_pound_dollar_bad
+    assert_lex3('"#$%"', nil,
+
+                :tSTRING_BEG,     "\"",  :expr_beg,
+                :tSTRING_CONTENT, "#$%", :expr_beg,
+                :tSTRING_END,     "\"",  :expr_end)
+  end
+
   def test_yylex_string_double_nested_curlies
     assert_lex3("%{nest{one{two}one}nest}",
                 nil,
@@ -2611,6 +2623,35 @@ class TestRubyLexer < Minitest::Test
     end
   end
 
+  def test_yylex_sym_quoted
+    assert_lex(":'a'",
+               s(:lit, :a),
+
+               :tSYMBOL, "a", :expr_end, 0, 0)
+  end
+
+  def test_yylex_hash_colon
+    assert_lex("{a:1}",
+               s(:hash, s(:lit, :a), s(:lit, 1)),
+
+               :tLBRACE, "{", :expr_beg,      0, 1,
+               :tLABEL,  "a", :expr_labelarg, 0, 1,
+               :tINTEGER, 1,  :expr_end,      0, 1,
+               :tRCURLY, "}", :expr_endarg,   0, 0)
+  end
+
+  def test_yylex_hash_colon_quoted_22
+    skip "Waiting for 2.2 parser"
+
+    assert_lex("{'a':1}",
+               s(:hash, s(:lit, :a), s(:lit, 1)),
+
+               :tLBRACE, "{", :expr_beg,    0, 1,
+               :tSYMBOL, "a", :expr_end,    0, 1,
+               :tINTEGER, 1,  :expr_end,    0, 1,
+               :tRCURLY, "}", :expr_endarg, 0, 0)
+  end
+
   def test_ruby21_new_numbers
     skip "Don't have imaginary and rational literal lexing yet"
 

data/test/test_ruby_parser.rb

@@ -2142,21 +2142,30 @@ module TestRubyParserShared20to21
   def test_defn_kwarg_env
     rb = "def test(**testing) test_splat(**testing) end"
     pt = s(:defn, :test, s(:args, :"**testing"),
-           s(:call, nil, :test_splat, s(:kwsplat, s(:lvar, :testing))))
+           s(:call, nil, :test_splat, s(:hash, s(:kwsplat, s(:lvar, :testing)))))
 
     assert_parse rb, pt
   end
 
   def test_call_arg_kwsplat
     rb = "a(b, **1)"
-    pt = s(:call, nil, :a, s(:call, nil, :b), s(:kwsplat, s(:lit, 1)))
+    pt = s(:call, nil, :a, s(:call, nil, :b), s(:hash, s(:kwsplat, s(:lit, 1))))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_arg_assoc_kwsplat
+    rb = "f(1, kw: 2, **3)"
+    pt = s(:call, nil, :f,
+           s(:lit, 1),
+           s(:hash, s(:lit, :kw), s(:lit, 2), s(:kwsplat, s(:lit, 3))))
 
     assert_parse rb, pt
   end
 
   def test_call_kwsplat
     rb = "a(**1)"
-    pt = s(:call, nil, :a, s(:kwsplat, s(:lit, 1)))
+    pt = s(:call, nil, :a, s(:hash, s(:kwsplat, s(:lit, 1))))
 
     assert_parse rb, pt
   end
@@ -3228,16 +3237,55 @@ class TestRuby21Parser < RubyParserTestCase
   end
 
   def test_block_kw
+    rb = "blah { |k:42| }"
+    pt = s(:iter, s(:call, nil, :blah), s(:args, s(:kwarg, :k, s(:lit, 42))))
+
+    assert_parse rb, pt
+
+    rb = "blah { |k:42| }"
+    assert_parse rb, pt
+  end
+
+  def test_block_kw__required
+    rb = "blah do |k:| end"
+    pt = s(:iter, s(:call, nil, :blah), s(:args, s(:kwarg, :k)))
+
+    assert_parse rb, pt
+
+    rb = "blah do |k:| end"
+    assert_parse rb, pt
+  end
+
+  def test_stabby_block_kw
     rb = "-> (k:42) { }"
     pt = s(:iter, s(:call, nil, :lambda), s(:args, s(:kwarg, :k, s(:lit, 42))))
 
     assert_parse rb, pt
   end
 
-  def test_block_kw__required
+  def test_stabby_block_kw__required
     rb = "-> (k:) { }"
     pt = s(:iter, s(:call, nil, :lambda), s(:args, s(:kwarg, :k)))
 
     assert_parse rb, pt
   end
+
+  def test_parse_line_heredoc_hardnewline
+    skip "not yet"
+
+    rb = <<-'CODE'.gsub(/^      /, '')
+      <<-EOFOO
+      \n\n\n\n\n\n\n\n\n
+      EOFOO
+
+      class Foo
+      end
+    CODE
+
+    pt = s(:block,
+           s(:str, "\n\n\n\n\n\n\n\n\n\n").line(1),
+           s(:class, :Foo, nil).line(5)).line(1)
+
+    assert_parse rb, pt
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.6.5
+  version: 3.6.6
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   xJcC6UN6NHMOVMyAXsr2HR0gRRx4ofN1LoP2KhXzSr8UMvQYlwPmE0N5GQv1b5AO
   VpzF30vNaJK6ZT7xlIsIlwmH
   -----END CERTIFICATE-----
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '5.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '5.6'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement