ruby_parser 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41b49f3089bda3758931dcacdbfacfe188099d40
-  data.tar.gz: 16bdfbd9b6b350aadee20337abdc30145df20b01
+  metadata.gz: 54985a83895c86ee90364ad54e7325fb977b40d4
+  data.tar.gz: e5d03de51047979f876706e1da128242fdfa331b
 SHA512:
-  metadata.gz: 54e6bf7dd57d961e29c7378f9779cc0b62d2f3e9f3d8c940605b78306fa6a27bc4bd37d49da2e96e1ca15c324b0d51fc03f861d12ffe8e919b491d9a5e2fcdac
-  data.tar.gz: 31a135b14a05303a46d8f5f227900139bf255ce297f1c1b23fcef382edd2362e77468aa5562588d516a9e8098be0be1bbfd43716e957b6b19e24bcaaf7def85c
+  metadata.gz: b420efaa47bb45a7069312912f537fc33079d3b67f0618c6d3b62adc9a8cfb9b22ca236d1aadb2e12a1d4743624871c9f35152083436a1755073047994d7064b
+  data.tar.gz: c794ff4f9b6906ebaccfdbc0f5b7fd912ada0976360813b2841eade89131375eeb8e0880b05c27e8cc40abca74388b06e772e1ccabcad6944e88d5fc502153fa

data/History.txt

@@ -1,3 +1,14 @@
+=== 3.7.1 / 2015-08-06
+
+* 1 minor enhancement:
+
+  * Improved understandability of lexing postfix symbols.
+
+* 2 bug fixes:
+
+  * Fixed timeout caused by regexp backtracking bug w/ long strings in 2.2 parser. (presidentbeef)
+  * Rename DEBUG env toggle to RB_LINENO_DEBUG. (tenderlove)
+
 === 3.7.0 / 2015-05-28
 
 * 2 major enhancements:

data/lib/ruby_lexer.rb

@@ -662,6 +662,23 @@ class RubyLexer
     return result(:expr_end, :tSYMBOL, symbol)
   end
 
+  def was_label?
+    @was_label = ruby22_label?
+    true
+  end
+
+  def process_label_or_string text
+    if @was_label && text =~ /:$/ then
+      @was_label = nil
+      return process_label text
+    elsif text =~ /:$/ then
+      ss.pos -= 1 # put back ":"
+      text = text[0..-2]
+    end
+
+    result :expr_end, :tSTRING, text[1..-2].gsub(/\\\\/, "\\").gsub(/\\'/, "'")
+  end
+
   def process_label text
     result = process_symbol text
     result[0] = :tLABEL
@@ -1202,7 +1219,7 @@ end
 
 require "ruby_lexer.rex"
 
-if ENV["DEBUG"] then
+if ENV["RP_LINENO_DEBUG"] then
   class RubyLexer
     alias :old_lineno= :lineno=
 

data/lib/ruby_lexer.rex

@@ -93,9 +93,7 @@ ruby22_label?   /\"(#{SIMPLE_STRING})\":/o process_label
 
                 /\[/                    process_square_bracket
 
-# TODO: make this conditional on ruby 2.2
-ruby22_label?   /\'#{SSTRING}\':/o      process_label
-                /\'#{SSTRING}\'/o       { result :expr_end, :tSTRING, matched[1..-2].gsub(/\\\\/, "\\").gsub(/\\'/, "'") } # " stupid emacs
+was_label?        /\'#{SSTRING}\':?/o   process_label_or_string
 
 : /\|/
 |               /\|\|\=/                { result :expr_beg, :tOP_ASGN, "||" }

data/lib/ruby_lexer.rex.rb

@@ -163,10 +163,8 @@ class RubyLexer
             end # group /[+\d]/
           when text = ss.scan(/\[/) then
             process_square_bracket text
-          when ruby22_label? && (text = ss.scan(/\'#{SSTRING}\':/o)) then
-            process_label text
-          when text = ss.scan(/\'#{SSTRING}\'/o) then
-            action { result :expr_end, :tSTRING, matched[1..-2].gsub(/\\\\/, "\\").gsub(/\\'/, "'") } # " stupid emacs
+          when was_label? && (text = ss.scan(/\'#{SSTRING}\':?/o)) then
+            process_label_or_string text
           when ss.check(/\|/) then
             case
             when text = ss.scan(/\|\|\=/) then

data/lib/ruby_parser_extras.rb

@@ -91,7 +91,7 @@ class RPStringScanner < StringScanner
 end
 
 module RubyParserStuff
-  VERSION = "3.7.0" unless constants.include? "VERSION" # SIGH
+  VERSION = "3.7.1" unless constants.include? "VERSION" # SIGH
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments

data/test/test_ruby_parser.rb

@@ -575,6 +575,14 @@ module TestRubyParserShared
     # TODO: add more including interpolation etc
   end
 
+  def test_str_backslashes
+    long_string = '\n' * 100
+    rb = "x '#{long_string}'"
+    pt = s(:call, nil, :x, s(:str, long_string))
+
+    assert_parse rb, pt
+  end
+
   def test_str_pct_Q_nested
     rb = "%Q[before [#\{nest}] after]"
     pt = s(:dstr, "before [", s(:evstr, s(:call, nil, :nest)), s(:str, "] after"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   xJcC6UN6NHMOVMyAXsr2HR0gRRx4ofN1LoP2KhXzSr8UMvQYlwPmE0N5GQv1b5AO
   VpzF30vNaJK6ZT7xlIsIlwmH
   -----END CERTIFICATE-----
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -45,6 +45,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.7'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement