ruby_parser 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c54a714696b5a3055f3f423bb81b3a6f4ecc2584
-  data.tar.gz: 5215e8bb9dccbd5f4dd6b515844fc1525ad56334
+  metadata.gz: 2598e7edcb4727f2807cb9f9dde630da1d1b30b6
+  data.tar.gz: 23661bce5d836c1ad68a13bf1688e0ca7405df5b
 SHA512:
-  metadata.gz: ed81b97bf7ec8fc1800ab0c247cbb22850cb5e0559f9372eb19061f2d361237bc2c88cd2512ccfe7896c1515da4ded3bcadd8357b22028c9fd186ef4cbb55ed4
-  data.tar.gz: adc086eee5342a953f578aae3daf22685b1462f7e5444476f83babb09ff2b1940b40de5dc7a83cf249b56915057f594612849c9b2155074156cb80568e6c5d19
+  metadata.gz: 53430c570a2ce9c8967def00bb7a2022c431332976047b6f77226bc8add5e6b5641ab9d822618cdcafd0f9be35d8857a662aefba1f5914da66b30fb6e304bd65
+  data.tar.gz: 0b1c66ba0ebd5decd0fbec1b3f5fc08d7a07c21dae9a8524751f7de37106ef0cb3d6392529e04bd747f76a4b03c74895e59d3fbb6e1e70e94732deab3754979c

data/History.txt

@@ -1,3 +1,13 @@
+=== 3.4.1 / 2014-02-14
+
+* 1 minor enhancement:
+
+  * Added StackState#store and #restore.
+
+* 1 bug fix:
+
+  * 1.8/1.9/2.0: Fixed tSTRING_DBEG w/ f'd up amounts of nesting + braces + do/end. yeah. I'm as confused as you are.
+
 === 3.4.0 / 2014-02-04
 
 * 1 major enhancement:

data/Rakefile

@@ -188,7 +188,7 @@ end
 
 task :debug_ruby do
   file = ENV["F"] || ENV["FILE"]
-  sh "#{ruby20} -cwy #{file} 2>&1 | ./yuck.rb"
+  sh "/Users/ryan/Desktop/DVDs/debugparser/miniruby -cwy #{file} 2>&1 | ./yuck.rb"
 end
 
 task :extract => :isolate do

data/lib/ruby18_parser.rb

@@ -5266,15 +5266,16 @@ def _reduce_420(val, _values, result)
 end
 
 def _reduce_421(val, _values, result)
-                      result = [lexer.lex_strterm, lexer.brace_nest, lexer.string_nest]
+                      result = [lexer.lex_strterm, 
+                                lexer.brace_nest, 
+                                lexer.string_nest, # TODO: remove
+                                lexer.cond.store, 
+                                lexer.cmdarg.store]
 
                       lexer.lex_strterm = nil
                       lexer.brace_nest  = 0
                       lexer.string_nest = 0
 
-                      lexer.cond.push false
-                      lexer.cmdarg.push false
-
                       lexer.lex_state   = :expr_beg
                     
     result
@@ -5283,14 +5284,14 @@ end
 def _reduce_422(val, _values, result)
                       _, memo, stmt, _ = val
 
-                      lex_strterm, brace_nest, string_nest = memo
+                      lex_strterm, brace_nest, string_nest, oldcond, oldcmdarg = memo
 
                       lexer.lex_strterm = lex_strterm
                       lexer.brace_nest  = brace_nest
                       lexer.string_nest = string_nest
 
-                      lexer.cond.lexpop
-                      lexer.cmdarg.lexpop
+                      lexer.cond.restore oldcond
+                      lexer.cmdarg.restore oldcmdarg
 
                       case stmt
                       when Sexp then

data/lib/ruby18_parser.y

@@ -1563,29 +1563,30 @@ xstring_contents: none
                     }
                 | tSTRING_DBEG
                     {
-                      result = [lexer.lex_strterm, lexer.brace_nest, lexer.string_nest]
+                      result = [lexer.lex_strterm, 
+                                lexer.brace_nest, 
+                                lexer.string_nest, # TODO: remove
+                                lexer.cond.store, 
+                                lexer.cmdarg.store]
 
                       lexer.lex_strterm = nil
                       lexer.brace_nest  = 0
                       lexer.string_nest = 0
 
-                      lexer.cond.push false
-                      lexer.cmdarg.push false
-
                       lexer.lex_state   = :expr_beg
                     }
                     compstmt tRCURLY
                     {
                       _, memo, stmt, _ = val
 
-                      lex_strterm, brace_nest, string_nest = memo
+                      lex_strterm, brace_nest, string_nest, oldcond, oldcmdarg = memo
 
                       lexer.lex_strterm = lex_strterm
                       lexer.brace_nest  = brace_nest
                       lexer.string_nest = string_nest
 
-                      lexer.cond.lexpop
-                      lexer.cmdarg.lexpop
+                      lexer.cond.restore oldcond
+                      lexer.cmdarg.restore oldcmdarg
 
                       case stmt
                       when Sexp then

data/lib/ruby19_parser.rb

@@ -5559,15 +5559,16 @@ def _reduce_462(val, _values, result)
 end
 
 def _reduce_463(val, _values, result)
-                      result = [lexer.lex_strterm, lexer.brace_nest, lexer.string_nest]
+                      result = [lexer.lex_strterm, 
+                                lexer.brace_nest, 
+                                lexer.string_nest, # TODO: remove
+                                lexer.cond.store, 
+                                lexer.cmdarg.store]
 
                       lexer.lex_strterm = nil
                       lexer.brace_nest  = 0
                       lexer.string_nest = 0
 
-                      lexer.cond.push false
-                      lexer.cmdarg.push false
-
                       lexer.lex_state   = :expr_beg
                     
     result
@@ -5576,14 +5577,14 @@ end
 def _reduce_464(val, _values, result)
                       _, memo, stmt, _ = val
 
-                      lex_strterm, brace_nest, string_nest = memo
+                      lex_strterm, brace_nest, string_nest, oldcond, oldcmdarg = memo
 
                       lexer.lex_strterm = lex_strterm
                       lexer.brace_nest  = brace_nest
                       lexer.string_nest = string_nest
 
-                      lexer.cond.lexpop
-                      lexer.cmdarg.lexpop
+                      lexer.cond.restore oldcond
+                      lexer.cmdarg.restore oldcmdarg
 
                       case stmt
                       when Sexp then

data/lib/ruby19_parser.y

@@ -1694,29 +1694,30 @@ regexp_contents: none
                     }
                 | tSTRING_DBEG
                     {
-                      result = [lexer.lex_strterm, lexer.brace_nest, lexer.string_nest]
+                      result = [lexer.lex_strterm, 
+                                lexer.brace_nest, 
+                                lexer.string_nest, # TODO: remove
+                                lexer.cond.store, 
+                                lexer.cmdarg.store]
 
                       lexer.lex_strterm = nil
                       lexer.brace_nest  = 0
                       lexer.string_nest = 0
 
-                      lexer.cond.push false
-                      lexer.cmdarg.push false
-
                       lexer.lex_state   = :expr_beg
                     }
                     compstmt tRCURLY
                     {
                       _, memo, stmt, _ = val
 
-                      lex_strterm, brace_nest, string_nest = memo
+                      lex_strterm, brace_nest, string_nest, oldcond, oldcmdarg = memo
 
                       lexer.lex_strterm = lex_strterm
                       lexer.brace_nest  = brace_nest
                       lexer.string_nest = string_nest
 
-                      lexer.cond.lexpop
-                      lexer.cmdarg.lexpop
+                      lexer.cond.restore oldcond
+                      lexer.cmdarg.restore oldcmdarg
 
                       case stmt
                       when Sexp then

data/lib/ruby20_parser.rb

@@ -5945,15 +5945,16 @@ def _reduce_483(val, _values, result)
 end
 
 def _reduce_484(val, _values, result)
-                      result = [lexer.lex_strterm, lexer.brace_nest, lexer.string_nest]
+                      result = [lexer.lex_strterm, 
+                                lexer.brace_nest, 
+                                lexer.string_nest, # TODO: remove
+                                lexer.cond.store, 
+                                lexer.cmdarg.store]
 
                       lexer.lex_strterm = nil
                       lexer.brace_nest  = 0
                       lexer.string_nest = 0
 
-                      lexer.cond.push false
-                      lexer.cmdarg.push false
-
                       lexer.lex_state   = :expr_beg
                     
     result
@@ -5963,14 +5964,14 @@ def _reduce_485(val, _values, result)
                       # TODO: tRCURLY -> tSTRING_DEND
                       _, memo, stmt, _ = val
 
-                      lex_strterm, brace_nest, string_nest = memo
+                      lex_strterm, brace_nest, string_nest, oldcond, oldcmdarg = memo
 
                       lexer.lex_strterm = lex_strterm
                       lexer.brace_nest  = brace_nest
                       lexer.string_nest = string_nest
 
-                      lexer.cond.lexpop
-                      lexer.cmdarg.lexpop
+                      lexer.cond.restore oldcond
+                      lexer.cmdarg.restore oldcmdarg
 
                       case stmt
                       when Sexp then

data/lib/ruby20_parser.y

@@ -1829,15 +1829,16 @@ regexp_contents: none
                     }
                 | tSTRING_DBEG
                     {
-                      result = [lexer.lex_strterm, lexer.brace_nest, lexer.string_nest]
+                      result = [lexer.lex_strterm, 
+                                lexer.brace_nest, 
+                                lexer.string_nest, # TODO: remove
+                                lexer.cond.store, 
+                                lexer.cmdarg.store]
 
                       lexer.lex_strterm = nil
                       lexer.brace_nest  = 0
                       lexer.string_nest = 0
 
-                      lexer.cond.push false
-                      lexer.cmdarg.push false
-
                       lexer.lex_state   = :expr_beg
                     }
                     compstmt tRCURLY
@@ -1845,14 +1846,14 @@ regexp_contents: none
                       # TODO: tRCURLY -> tSTRING_DEND
                       _, memo, stmt, _ = val
 
-                      lex_strterm, brace_nest, string_nest = memo
+                      lex_strterm, brace_nest, string_nest, oldcond, oldcmdarg = memo
 
                       lexer.lex_strterm = lex_strterm
                       lexer.brace_nest  = brace_nest
                       lexer.string_nest = string_nest
 
-                      lexer.cond.lexpop
-                      lexer.cmdarg.lexpop
+                      lexer.cond.restore oldcond
+                      lexer.cmdarg.restore oldcmdarg
 
                       case stmt
                       when Sexp then

data/lib/ruby_parser_extras.rb

@@ -91,7 +91,7 @@ class RPStringScanner < StringScanner
 end
 
 module RubyParserStuff
-  VERSION = "3.4.0" unless constants.include? "VERSION" # SIGH
+  VERSION = "3.4.1" unless constants.include? "VERSION" # SIGH
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments
@@ -1277,6 +1277,16 @@ module RubyParserStuff
       p :stack_push => [name, @stack, caller.first] if debug
       nil
     end
+
+    def store
+      result = @stack.dup
+      @stack.replace [false]
+      result
+    end
+
+    def restore oldstate
+      @stack.replace oldstate
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
   xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-14 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.8'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
 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