ruby_parser - rubygems Package Compare versions

Comparing version 3.5.0 to 3.6.0

History.txt

@@ -0,1 +1,11 @@
+=== 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
@@ -2,0 +12,0 @@

lib/ruby_lexer.rb

@@ -76,2 +76,3 @@ # encoding: UTF-8
   attr_accessor :cond
+  attr_accessor :extra_lineno
 
@@ -188,3 +189,2 @@ ##
         else
-          self.lineno += 1
           string_buffer << scan(/\n/)
@@ -844,2 +844,3 @@ end
     self.token         = nil
+    self.extra_lineno  = 0
 
@@ -1008,2 +1009,4 @@ self.cmdarg = RubyParserStuff::StackState.new(:cmdarg)
 
+    self.extra_lineno -= 1 if r && s == "n"
+
     return r if r
@@ -1010,0 +1013,0 @@

lib/ruby_lexer.rex.rb

 #--
 # 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
@@ -217,3 +217,3 @@ #++
             end # group />/
-          when ss.check(/`/) then
+          when ss.check(/\`/) then
             case
@@ -226,3 +226,3 @@ when expr_fname? && (text = ss.scan(/\`/)) then
               action { string STR_XQUOTE, '`'; result(nil, :tXSTRING_BEG, "`") }
-            end # group /`/
+            end # group /\`/
           when text = ss.scan(/\?/) then
@@ -317,3 +317,3 @@ process_questionmark text
     token
-  end # def _next_token
+  end # def next_token
 end # class

lib/ruby_parser_extras.rb

@@ -94,3 +94,3 @@ # encoding: ASCII-8BIT
 module RubyParserStuff
-  VERSION = "3.5.0" unless constants.include? "VERSION" # SIGH
+  VERSION = "3.6.0" unless constants.include? "VERSION" # SIGH
 
@@ -834,2 +834,10 @@ attr_accessor :lexer, :in_def, :in_single, :file
 
+  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
@@ -836,0 +844,0 @@ if args && args.node_type == :block_pass then

No alert changes

No metric changes