ruby_parser 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ca41acf88ce38e4b41f66711a3c1ebcceecabc8
-  data.tar.gz: 92d9aa6618b103873d5aa3b15e651799416aad94
+  metadata.gz: fc83f0af1f2d5f783903eafe8a07f6509ea2b796
+  data.tar.gz: cdec9932c8de7c085557a5b581c7e450065f86a5
 SHA512:
-  metadata.gz: 62dc4f09115003fe567001d472d2391df4a0ed7187841edca357e4378f18626903097f0434759f8d1ac4f9b384664240216207fbfe0813f72994a731ab78bdac
-  data.tar.gz: 461857d0405eee3b2fd591aef07e61478274c003948e67a1cb193402304f39e450f4de5f21c10d2987ebb3b50b5ad226cc6c01ae0ebb7024f1d0ef2769bfaa95
+  metadata.gz: b847d6798ceac71dba5045e33b3e7a84d113ef0b513e767d24cd4edd27a18b43e29e47397813e970ff03d76080b32baa3e9c01af4a6568863f8595b6ba721e36
+  data.tar.gz: 277d8e78c6b52e0959f346515b043829af531105b51adb156f2f2b09fcee670fee97f48c9222a37d727f7005973ec86d168c9a05603b77cff42ea800cbec552b

data/History.txt

@@ -1,3 +1,13 @@
+=== 3.6.0 / 2014-04-23
+
+* 1 minor enhancement:
+
+  * Added new_string and switched all parsers to it.
+
+* 1 bug fix:
+
+  * Fixed line numbers of nodes following multi-line strings. (presidentbeef)
+
 === 3.5.0 / 2014-03-24
 
 * 1 major enhancement:

data/lib/ruby18_parser.rb

@@ -5145,7 +5145,7 @@ def _reduce_400(val, _values, result)
 end
 
 def _reduce_401(val, _values, result)
-                      result = s(:str, val[0])
+                      result = new_string val
                     
     result
 end
@@ -5244,7 +5244,7 @@ def _reduce_417(val, _values, result)
 end
 
 def _reduce_418(val, _values, result)
-                      result = s(:str, val[0])
+                      result = new_string val
                     
     result
 end

data/lib/ruby18_parser.y

@@ -1471,7 +1471,7 @@ rule
                     }
                 | tSTRING
                     {
-                      result = s(:str, val[0])
+                      result = new_string val
                     }
 
          xstring: tXSTRING_BEG xstring_contents tSTRING_END
@@ -1547,7 +1547,7 @@ xstring_contents: none
 
   string_content: tSTRING_CONTENT
                     {
-                      result = s(:str, val[0])
+                      result = new_string val
                     }
                 | tSTRING_DVAR
                     {

data/lib/ruby19_parser.rb

@@ -5426,7 +5426,7 @@ def _reduce_440(val, _values, result)
 end
 
 def _reduce_441(val, _values, result)
-                      result = s(:str, val[0])
+                      result = new_string val
                     
     result
 end
@@ -5537,7 +5537,7 @@ def _reduce_459(val, _values, result)
 end
 
 def _reduce_460(val, _values, result)
-                      result = s(:str, val[0])
+                      result = new_string val
                     
     result
 end

data/lib/ruby19_parser.y

@@ -1593,7 +1593,7 @@ rule
                     }
                 | tSTRING
                     {
-                      result = s(:str, val[0])
+                      result = new_string val
                     }
 
          xstring: tXSTRING_BEG xstring_contents tSTRING_END
@@ -1678,7 +1678,7 @@ regexp_contents: none
 
   string_content: tSTRING_CONTENT
                     {
-                      result = s(:str, val[0])
+                      result = new_string val
                     }
                 | tSTRING_DVAR
                     {

data/lib/ruby20_parser.rb

@@ -5752,7 +5752,7 @@ def _reduce_453(val, _values, result)
 end
 
 def _reduce_454(val, _values, result)
-                      result = s(:str, val[0])
+                      result = new_string val
                     
     result
 end
@@ -5923,7 +5923,7 @@ def _reduce_480(val, _values, result)
 end
 
 def _reduce_481(val, _values, result)
-                      result = s(:str, val[0])
+                      result = new_string val
                     
     result
 end

data/lib/ruby20_parser.y

@@ -1680,7 +1680,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                     }
                 | tSTRING
                     {
-                      result = s(:str, val[0])
+                      result = new_string val
                     }
 
          xstring: tXSTRING_BEG xstring_contents tSTRING_END
@@ -1813,7 +1813,7 @@ regexp_contents: none
 
   string_content: tSTRING_CONTENT
                     {
-                      result = s(:str, val[0])
+                      result = new_string val
                     }
                 | tSTRING_DVAR
                     {

data/lib/ruby21_parser.rb

@@ -5805,7 +5805,7 @@ def _reduce_452(val, _values, result)
 end
 
 def _reduce_453(val, _values, result)
-                      result = s(:str, val[0])
+                      result = new_string val
                     
     result
 end
@@ -5976,7 +5976,7 @@ def _reduce_479(val, _values, result)
 end
 
 def _reduce_480(val, _values, result)
-                      result = s(:str, val[0])
+                      result = new_string val
                     
     result
 end

data/lib/ruby21_parser.y

@@ -1681,7 +1681,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                     }
                 | tSTRING
                     {
-                      result = s(:str, val[0])
+                      result = new_string val
                     }
 
          xstring: tXSTRING_BEG xstring_contents tSTRING_END
@@ -1814,7 +1814,7 @@ regexp_contents: none
 
   string_content: tSTRING_CONTENT
                     {
-                      result = s(:str, val[0])
+                      result = new_string val
                     }
                 | tSTRING_DVAR
                     {

data/lib/ruby_lexer.rb

@@ -73,6 +73,7 @@ class RubyLexer
   attr_accessor :command_state
   attr_accessor :last_state
   attr_accessor :cond
+  attr_accessor :extra_lineno
 
   ##
   # Additional context surrounding tokens that both the lexer and
@@ -184,7 +185,6 @@ class RubyLexer
         if c != "\n" then
           return :tSTRING_CONTENT, string_buffer.join.delete("\r")
         else
-          self.lineno += 1
           string_buffer << scan(/\n/)
         end
 
@@ -839,6 +839,7 @@ class RubyLexer
     self.space_seen    = false
     self.string_nest   = 0
     self.token         = nil
+    self.extra_lineno  = 0
 
     self.cmdarg = RubyParserStuff::StackState.new(:cmdarg)
     self.cond   = RubyParserStuff::StackState.new(:cond)
@@ -1002,6 +1003,8 @@ class RubyLexer
   def unescape s
     r = ESCAPES[s]
 
+    self.extra_lineno -= 1 if r && s == "n"
+
     return r if r
 
     x = case s

data/lib/ruby_lexer.rex

@@ -123,7 +123,7 @@ rule
 |               /\>\>/                  { result :arg_state, :tRSHFT, ">>"   }
 |               /\>/                    { result :arg_state, :tGT, ">"       }
 
-: /`/
+: /\`/
 | expr_fname?   /\`/                   { result(:expr_end, :tBACK_REF2, "`") }
 | expr_dot?     /\`/                   { result((command_state ? :expr_cmdarg : :expr_arg), :tBACK_REF2, "`") }
 |               /\`/                   { string STR_XQUOTE, '`'; result(nil, :tXSTRING_BEG, "`") }

data/lib/ruby_lexer.rex.rb

@@ -1,6 +1,6 @@
 #--
 # This file is automatically generated. Do not modify it.
-# Generated by: oedipus_lex version 2.2.0.
+# Generated by: oedipus_lex version 2.2.1.
 # Source: lib/ruby_lexer.rex
 #++
 
@@ -214,7 +214,7 @@ class RubyLexer
             when text = ss.scan(/\>/) then
               action { result :arg_state, :tGT, ">"       }
             end # group />/
-          when ss.check(/`/) then
+          when ss.check(/\`/) then
             case
             when expr_fname? && (text = ss.scan(/\`/)) then
               action { result(:expr_end, :tBACK_REF2, "`") }
@@ -222,7 +222,7 @@ class RubyLexer
               action { result((command_state ? :expr_cmdarg : :expr_arg), :tBACK_REF2, "`") }
             when text = ss.scan(/\`/) then
               action { string STR_XQUOTE, '`'; result(nil, :tXSTRING_BEG, "`") }
-            end # group /`/
+            end # group /\`/
           when text = ss.scan(/\?/) then
             process_questionmark text
           when ss.check(/&/) then
@@ -312,5 +312,5 @@ class RubyLexer
     self.state = token.last if token && token.first == :state
 
     token
-  end # def _next_token
+  end # def next_token
 end # class

data/lib/ruby_parser_extras.rb

@@ -91,7 +91,7 @@ class RPStringScanner < StringScanner
 end
 
 module RubyParserStuff
-  VERSION = "3.5.0" unless constants.include? "VERSION" # SIGH
+  VERSION = "3.6.0" unless constants.include? "VERSION" # SIGH
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments
@@ -830,6 +830,14 @@ module RubyParserStuff
     result
   end
 
+  def new_string val
+    str = val[0]
+    result = s(:str, str)
+    self.lexer.lineno += str.count("\n") + self.lexer.extra_lineno
+    self.lexer.extra_lineno = 0
+    result
+  end
+
   def new_super args
     if args && args.node_type == :block_pass then
       s(:super, args)

data/test/test_ruby_parser.rb

@@ -720,6 +720,23 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_parse_line_dstr_newline
+    skip "dstr line numbers are just gonna be screwed for a while..."
+
+    rb = <<-'CODE'
+            "a\n#{
+            }"
+            true
+    CODE
+
+    pt = s(:block,
+           s(:dstr, "a\n",
+             s(:evstr)).line(1),
+           s(:true).line(3))
+
+    assert_parse rb, pt
+  end
+
   def test_parse_line_heredoc_evstr
     skip "heredoc line numbers are just gonna be screwed for a while..."
 
@@ -732,6 +749,15 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_parse_line_multiline_str
+    rb = "\"a\nb\"\n1"
+    pt = s(:block,
+           s(:str, "a\nb").line(1),
+           s(:lit, 1).line(3)).line(1)
+
+    assert_parse rb, pt
+  end
+
   def test_parse_line_iter_call_parens
     rb = "f(a) do |x, y|\n  x + y\nend"
 
@@ -818,6 +844,15 @@ module TestRubyParserShared
     assert_equal 3, result.if.return.lit.line
   end
 
+  def test_parse_line_str_with_newline_escape
+    rb = 'a("\n", true)'
+    pt = s(:call, nil, :a,
+           s(:str, "\n").line(1),
+           s(:true).line(1))
+
+    assert_parse rb, pt
+  end
+
   def test_parse_line_trailing_newlines
     rb = "a \nb"
     pt = s(:block,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
   xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -121,14 +121,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
 description: |-
   ruby_parser (RP) is a ruby parser written in pure ruby (utilizing
   racc--which does by default use a C extension). RP's output is