ruby_parser 3.14.0 → 3.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7293d43033177f04deb6a7f28ebd39a495b56360e8ddd8386e468b76f931f367
-  data.tar.gz: 46aaa402559b7b037d2309cc721f6c3664ec6998dd1a6a2d0cd6cb4fc266bcb1
+  metadata.gz: 80b91fff73fd2b78aa0e9218f7f975247d0f281c04820b28c99f3b2b378d85c7
+  data.tar.gz: 85fee306db91c8f29cfe45728dea537ef068bf1dee3055c5f88395adc335eb71
 SHA512:
-  metadata.gz: d4f7a1cab958547867b0ba7d6905b3845b19eca923cf01b16329668f7185ab500b90efd8b9bf04278d747f270a75ad2e5099e7e3a3e39bc25bf883189d7ecd5f
-  data.tar.gz: a7ed89f3cc668ed8c04912e97145130e5b7a2014bec06680c29a6baadeae0ad17559fed244d38670ef62b49bb749ff1b25553e652217d7c6c8fc7c2ecf56b63b
+  metadata.gz: ac46d9e8261e7ad6e182e4fd81551ce357b5b4d39ba3a361f19d8a86f67e40d5645b3fe4fffe47ecf544eb2c8b66fa92aba032ff8663def56490e337a192ffa6
+  data.tar.gz: 1070b7d4b64dc73e551ea1d0a0de17f75e21f313e549ac6e735bdf235777e17ec67373c67fec2f31413224c1182eb5ca797fecdd2c1d36219b9586b9c960d838

data/History.rdoc

@@ -1,3 +1,15 @@
+=== 3.14.1 / 2019-10-29
+
+* 1 minor enhancement:
+
+  * Declared that ruby_parser supports ruby 2.2 and up.
+
+* 3 bug fixes:
+
+  * Fixed a problem with %W with a null-byte terminator. (wtf?) (spohlenz)
+  * Fixed line numbering for command (eg methods without parentheses) arguments. (mvz)
+  * Fixed lineno on new dxstrs. (presidentbeef)
+
 === 3.14.0 / 2019-09-24
 
 * 8 minor enhancements:

data/Rakefile

@@ -24,6 +24,8 @@ Hoe.spec "ruby_parser" do
   dependency "rake", "< 11", :developer
   dependency "oedipus_lex", "~> 2.5", :developer
 
+  require_ruby_version "~> 2.2"
+
   if plugin? :perforce then     # generated files
     V2.each do |n|
       self.perforce_ignore << "lib/ruby#{n}_parser.rb"

data/lib/ruby_lexer.rb

@@ -1177,8 +1177,6 @@ class RubyLexer
       handled = true
 
       case
-      when paren_re && scan(paren_re) then
-        self.string_nest += 1
       when scan(term_re) then
         if self.string_nest == 0 then
           ss.pos -= 1
@@ -1186,6 +1184,8 @@ class RubyLexer
         else
           self.string_nest -= 1
         end
+      when paren_re && scan(paren_re) then
+        self.string_nest += 1
       when expand && scan(/#(?=[\$\@\{])/) then # TODO: this seems wrong
         ss.pos -= 1
         break
@@ -1232,9 +1232,9 @@ class RubyLexer
             end
         x = Regexp.escape paren if paren && paren != "\000"
         re = if qwords then
-               /[^#{t}#{x}\#\0\\\s]+|./ # |. to pick up whatever
+               /[^#{t}#{x}\#\\\s]+|./ # |. to pick up whatever
              else
-               /[^#{t}#{x}\#\0\\]+|./
+               /[^#{t}#{x}\#\\]+|./
              end
 
         scan re

data/lib/ruby_parser_extras.rb

@@ -28,7 +28,7 @@ class Sexp
 end
 
 module RubyParserStuff
-  VERSION = "3.14.0"
+  VERSION = "3.14.1"
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_accessor :in_kwarg
@@ -831,6 +831,8 @@ module RubyParserStuff
     (_, line), name, _, args, body, nil_body_line, * = val
     body ||= s(:nil).line nil_body_line
 
+    args.line line
+
     result = s(:defn, name.to_sym, args).line line
 
     if body then
@@ -1240,7 +1242,7 @@ module RubyParserStuff
       when :dstr
         str.sexp_type = :dxstr
       else
-        str = s(:dxstr, "", str)
+        str = s(:dxstr, "", str).line str.line
       end
       str
     else

data/test/test_ruby_lexer.rb

@@ -2657,6 +2657,22 @@ class TestRubyLexer < Minitest::Test
                 :tSTRING_END,     "]",     EXPR_LIT)
   end
 
+  def test_yylex_string_pct_Q_null_wtf?
+    assert_lex3("%Q\0s1 s2\0",
+                nil,
+                :tSTRING_BEG,     "%Q\0",  EXPR_BEG,
+                :tSTRING_CONTENT, "s1 s2", EXPR_BEG,
+                :tSTRING_END,     "\0",    EXPR_LIT)
+  end
+
+  def test_yylex_string_pct_Q_bang
+    assert_lex3("%Q!s1 s2!",
+                nil,
+                :tSTRING_BEG,     "%Q\0",  EXPR_BEG,
+                :tSTRING_CONTENT, "s1 s2", EXPR_BEG,
+                :tSTRING_END,     "!",     EXPR_LIT)
+  end
+
   def test_yylex_string_pct_W
     assert_lex3("%W[s1 s2\ns3]", # TODO: add interpolation to these
                 nil,

data/test/test_ruby_parser.rb

@@ -162,6 +162,16 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_backticks_interpolation_line
+    rb = 'x `#{y}`'
+    pt = s(:call, nil, :x,
+           s(:dxstr, "",
+             s(:evstr,
+               s(:call, nil, :y).line(1)).line(1))).line(1)
+
+    assert_parse rb, pt
+  end
+
   def test_bang_eq
     rb = "1 != 2"
     pt = s(:not, s(:call, s(:lit, 1), :"==", s(:lit, 2)))
@@ -1514,6 +1524,13 @@ module TestRubyParserShared
     assert_equal 2, c.line,   "call should have line number"
   end
 
+  def test_parse_line_defn_no_parens_args
+    rb = "def f a\nend"
+    pt = s(:defn, :f, s(:args, :a).line(1), s(:nil).line(2)).line(1)
+
+    assert_parse_line rb, pt, 1
+  end
+
   def test_parse_line_defn_complex
     rb = "def x(y)\n  p(y)\n  y *= 2\n  return y;\nend" # TODO: remove () & ;
     pt = s(:defn, :x, s(:args, :y),
@@ -1530,7 +1547,7 @@ module TestRubyParserShared
   end
 
   def test_parse_line_defn_no_parens
-    pt = s(:defn, :f, s(:args), s(:nil))
+    pt = s(:defn, :f, s(:args).line(1), s(:nil)).line(1)
 
     rb = "def f\nend"
     assert_parse_line rb, pt, 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.14.0
+  version: 3.14.1
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Em82dBUFsipwMLCYj39kcyHWAxyl6Ae1Cn9r/ItVBCxoeFdrHjfavnrIEoXUt4bU
   UfBugfLD19bu3nvL+zTAGx/U
   -----END CERTIFICATE-----
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -209,9 +209,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="