ruby_parser 3.9.0 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db3aec0f342263aec6c4bc598f2af937d889219b
-  data.tar.gz: 0a7300cfcb5109443168aa3432eefb0b103a07a1
+  metadata.gz: 2f40dfeee0e474212f0bfb56c32bfa6ac2c15345
+  data.tar.gz: 3b138c15fc4ccea9cdaeb78a29d735b4ce044075
 SHA512:
-  metadata.gz: c26c726384052dc9ea43d9cb29f982ed03768458c1ff0e64a515026c721be346f009ead616d18c499d449fbf9a6c23234a4c637afb14cf28fb74035a33a743db
-  data.tar.gz: 4f3d570afe84856c5275be5a9eaf9277168a89db5bd3dea605cc86cf8c38492d9ee0b5ec2d32c3413124c068ff57e24a5241d8474463e15018376328fff024ec
+  metadata.gz: eab6b5f51918c84302a104d5f9f6957c4848478a2a52c63a013e50dde8e447d88f384721c699a5fdb2e104fa260c3cfc8ab4af135fccc0a320a09ebc2e876917
+  data.tar.gz: 9dd361bb654390734c54292fe533291c583a202ffde25b417e133abc03cc96b143a0df5669aa4158c4b0938a3aa782d727452778648681eb6b3a2e2495b8358a

data/History.rdoc

@@ -1,3 +1,20 @@
+=== 3.10.0 / 2017-07-17
+
+* 4 minor enhancements:
+
+  * Added support for 'squiggly heredocs' (indented content). (jjoos)
+  * Bumped oedipus_lex to ~> 2.5.
+  * Bumped sexp_processor to ~> 4.9.
+  * Made STRICT_SEXP=1 safe: converted indexed sexps to semantic calls where needed.
+
+* 5 bug fixes:
+
+  * Clear and restore cmdarg stack around defs args and body. (presidentbeef)
+  * Conditionalize use of sexp_body= to make it compatible w/ sexp_processor 4.9.0
+  * Fix up line numbers in strings with newlines and `#`. (presidentbeef)
+  * Fixed line numbers of resbodies.
+  * Fixed some tracking of lexical state. Fixes bug #249.
+
 === 3.9.0 / 2017-04-13
 
 * 1 major enhancement:

data/Rakefile

@@ -23,9 +23,9 @@ Hoe.spec "ruby_parser" do
 
   license "MIT"
 
-  dependency "sexp_processor", "~> 4.1"
+  dependency "sexp_processor", "~> 4.9"
   dependency "rake", "< 11", :developer
-  dependency "oedipus_lex", "~> 2.1", :developer
+  dependency "oedipus_lex", "~> 2.5", :developer
 
   if plugin? :perforce then     # generated files
     V1_2.each do |n|

data/lib/rp_extensions.rb

@@ -38,6 +38,10 @@ class String
   # reduces tIDENTIFIER.
 
   attr_accessor :lineno
+
+  def clean_caller
+    self.sub(File.dirname(__FILE__), ".").sub(/:in.*/, "")
+  end if $DEBUG
 end
 
 require "sexp"
@@ -66,7 +70,7 @@ class Sexp
   end
 
   def block_pass?
-    any? { |s| Sexp === s && s[0] == :block_pass }
+    any? { |s| Sexp === s && s.sexp_type == :block_pass }
   end
 
   alias :node_type :sexp_type

data/lib/ruby18_parser.rb

@@ -3825,7 +3825,7 @@ end
 
 def _reduce_177(val, _values, result)
                       result = s(:op_asgn1, val[0], val[2], val[4].to_sym, val[5])
-                      val[2][0] = :arglist if val[2]
+                      val[2].sexp_type = :arglist if val[2]
                     
     result
 end
@@ -3937,7 +3937,7 @@ def _reduce_193(val, _values, result)
 end
 
 def _reduce_194(val, _values, result)
-                      if val[1][0] == :lit then
+                      if val[1].sexp_type == :lit then
                         result = val[1]
                       else
                         result = new_call val[1], :"+@"
@@ -4723,13 +4723,18 @@ def _reduce_322(val, _values, result)
                       self.in_single += 1
                       self.env.extend
                       lexer.lex_state = :expr_end # force for args
+                      result = [lexer.lineno, self.lexer.cmdarg.stack.dup]
+                      lexer.cmdarg.stack.replace [false]
                     
     result
 end
 
 def _reduce_323(val, _values, result)
+                      line, cmdarg = val[5]
                       result = new_defs val
+                      result[3].line line
 
+                      lexer.cmdarg.stack.replace cmdarg
                       self.env.unextend
                       self.in_single -= 1
                       self.lexer.comments # we don't care about comments in the body
@@ -5082,10 +5087,11 @@ end
 # reduce 385 omitted
 
 def _reduce_386(val, _values, result)
-                      klasses, var, body, rest = val[1], val[2], val[4], val[5]
+                      (_, line), klasses, var, _, body, rest = val
 
                       klasses ||= s(:array)
                       klasses << new_assign(var, s(:gvar, :"$!")) if var
+                      klasses.line line
 
                       result = new_resbody(klasses, body)
                       result << rest if rest # UGH, rewritten above
@@ -5142,7 +5148,7 @@ end
 # reduce 397 omitted
 
 def _reduce_398(val, _values, result)
-                      val[0] = s(:dstr, val[0].value) if val[0][0] == :evstr
+                      val[0] = s(:dstr, val[0].value) if val[0].sexp_type == :evstr
                       result = val[0]
                     
     result
@@ -5312,7 +5318,7 @@ def _reduce_423(val, _values, result)
 
                       case stmt
                       when Sexp then
-                        case stmt[0]
+                        case stmt.sexp_type
                         when :str, :dstr, :evstr then
                           result = stmt
                         else
@@ -5372,9 +5378,9 @@ def _reduce_434(val, _values, result)
                       yyerror "empty symbol literal" if
                         result.nil? or result.empty?
 
-                      case result[0]
+                      case result.sexp_type
                       when :dstr then
-                        result[0] = :dsym
+                        result.sexp_type = :dsym
                       when :str then
                         result = s(:lit, result.last.to_sym)
                       else
@@ -5679,7 +5685,7 @@ end
 def _reduce_490(val, _values, result)
                       result = val[2]
                       yyerror "Can't define single method for literals." if
-                        result[0] == :lit
+                        result.sexp_type == :lit
                     
     result
 end
@@ -5710,7 +5716,7 @@ end
 
 def _reduce_495(val, _values, result)
                       list = val[0].dup
-                      more = val[2][1..-1]
+                      more = val[2].sexp_body
                       list.push(*more) unless more.empty?
                       result = list
                     

data/lib/ruby18_parser.y

@@ -521,7 +521,7 @@ rule
                 | primary_value tLBRACK2 aref_args tRBRACK tOP_ASGN arg
                     {
                       result = s(:op_asgn1, val[0], val[2], val[4].to_sym, val[5])
-                      val[2][0] = :arglist if val[2]
+                      val[2].sexp_type = :arglist if val[2]
                     }
                 | primary_value tDOT tIDENTIFIER tOP_ASGN arg
                     {
@@ -599,7 +599,7 @@ rule
                     }
                 | tUPLUS arg
                     {
-                      if val[1][0] == :lit then
+                      if val[1].sexp_type == :lit then
                         result = val[1]
                       else
                         result = new_call val[1], :"+@"
@@ -1158,11 +1158,16 @@ rule
                       self.in_single += 1
                       self.env.extend
                       lexer.lex_state = :expr_end # force for args
+                      result = [lexer.lineno, self.lexer.cmdarg.stack.dup]
+                      lexer.cmdarg.stack.replace [false]
                     }
                     f_arglist bodystmt kEND
                     {
+                      line, cmdarg = val[5]
                       result = new_defs val
+                      result[3].line line
 
+                      lexer.cmdarg.stack.replace cmdarg
                       self.env.unextend
                       self.in_single -= 1
                       self.lexer.comments # we don't care about comments in the body
@@ -1417,10 +1422,11 @@ rule
 
       opt_rescue: kRESCUE exc_list exc_var then compstmt opt_rescue
                     {
-                      klasses, var, body, rest = val[1], val[2], val[4], val[5]
+                      (_, line), klasses, var, _, body, rest = val
 
                       klasses ||= s(:array)
                       klasses << new_assign(var, s(:gvar, :"$!")) if var
+                      klasses.line line
 
                       result = new_resbody(klasses, body)
                       result << rest if rest # UGH, rewritten above
@@ -1459,7 +1465,7 @@ rule
 
          strings: string
                     {
-                      val[0] = s(:dstr, val[0].value) if val[0][0] == :evstr
+                      val[0] = s(:dstr, val[0].value) if val[0].sexp_type == :evstr
                       result = val[0]
                     }
 
@@ -1593,7 +1599,7 @@ xstring_contents: none
 
                       case stmt
                       when Sexp then
-                        case stmt[0]
+                        case stmt.sexp_type
                         when :str, :dstr, :evstr then
                           result = stmt
                         else
@@ -1631,9 +1637,9 @@ xstring_contents: none
                       yyerror "empty symbol literal" if
                         result.nil? or result.empty?
 
-                      case result[0]
+                      case result.sexp_type
                       when :dstr then
-                        result[0] = :dsym
+                        result.sexp_type = :dsym
                       when :str then
                         result = s(:lit, result.last.to_sym)
                       else
@@ -1838,7 +1844,7 @@ xstring_contents: none
                     {
                       result = val[2]
                       yyerror "Can't define single method for literals." if
-                        result[0] == :lit
+                        result.sexp_type == :lit
                     }
 
       assoc_list: none # [!nil]
@@ -1862,7 +1868,7 @@ xstring_contents: none
                 | assocs tCOMMA assoc
                     {
                       list = val[0].dup
-                      more = val[2][1..-1]
+                      more = val[2].sexp_body
                       list.push(*more) unless more.empty?
                       result = list
                     }

data/lib/ruby19_parser.rb

@@ -3580,7 +3580,7 @@ end
 
 def _reduce_77(val, _values, result)
                       ary = list_append val[0], s(:splat, val[2])
-                      ary.concat val[4][1..-1]
+                      ary.concat val[4].sexp_body
                       result = s(:masgn, ary)
                     
     result
@@ -3594,7 +3594,7 @@ end
 
 def _reduce_79(val, _values, result)
                       ary = list_append val[0], s(:splat)
-                      ary.concat val[3][1..-1]
+                      ary.concat val[3].sexp_body
                       result = s(:masgn, ary)
                     
     result
@@ -3608,7 +3608,7 @@ end
 
 def _reduce_81(val, _values, result)
                       ary = s(:array, s(:splat, val[1]))
-                      ary.concat val[3][1..-1]
+                      ary.concat val[3].sexp_body
                       result = s(:masgn, ary)
                     
     result
@@ -3622,7 +3622,7 @@ end
 
 def _reduce_83(val, _values, result)
                       ary = s(:array, s(:splat))
-                      ary.concat val[2][1..-1]
+                      ary.concat val[2].sexp_body
                       result = s(:masgn, ary)
                     
     result
@@ -4025,7 +4025,7 @@ def _reduce_198(val, _values, result)
 end
 
 def _reduce_199(val, _values, result)
-                      val[2][0] = :arglist if val[2]
+                      val[2].sexp_type = :arglist if val[2]
                       result = s(:op_asgn1, val[0], val[2], val[4].to_sym, val[5])
                     
     result
@@ -4337,7 +4337,7 @@ def _reduce_250(val, _values, result)
 end
 
 def _reduce_251(val, _values, result)
-                      result = val[0] << s(:hash, *val[2][1..-1]) # TODO: self.args
+                      result = val[0] << s(:hash, *val[2].sexp_body) # TODO: self.args
                     
     result
 end
@@ -4798,15 +4798,18 @@ def _reduce_326(val, _values, result)
                       self.in_single += 1
                       self.env.extend
                       lexer.lex_state = :expr_end # force for args
-                      result = lexer.lineno
+                      result = [lexer.lineno, self.lexer.cmdarg.stack.dup]
+                      lexer.cmdarg.stack.replace [false]
                     
     result
 end
 
 def _reduce_327(val, _values, result)
+                      line, cmdarg = val[5]
                       result = new_defs val
-                      result[3].line val[5]
+                      result[3].line line
 
+                      lexer.cmdarg.stack.replace cmdarg
                       self.env.unextend
                       self.in_single -= 1
                       self.lexer.comments # we don't care about comments in the body
@@ -5357,10 +5360,11 @@ end
 # reduce 425 omitted
 
 def _reduce_426(val, _values, result)
-                      _, klasses, var, _, body, rest = val
+                      (_, line), klasses, var, _, body, rest = val
 
                       klasses ||= s(:array)
                       klasses << new_assign(var, s(:gvar, :"$!")) if var
+                      klasses.line line
 
                       result = new_resbody(klasses, body)
                       result << rest if rest # UGH, rewritten above
@@ -5415,7 +5419,7 @@ end
 # reduce 437 omitted
 
 def _reduce_438(val, _values, result)
-                      val[0] = s(:dstr, val[0].value) if val[0][0] == :evstr
+                      val[0] = s(:dstr, val[0].value) if val[0].sexp_type == :evstr
                       result = val[0]
                     
     result
@@ -5597,7 +5601,7 @@ def _reduce_465(val, _values, result)
 
                       case stmt
                       when Sexp then
-                        case stmt[0]
+                        case stmt.sexp_type
                         when :str, :dstr, :evstr then
                           result = stmt
                         else
@@ -5656,9 +5660,9 @@ def _reduce_476(val, _values, result)
 
                       result ||= s(:str, "")
 
-                      case result[0]
+                      case result.sexp_type
                       when :dstr then
-                        result[0] = :dsym
+                        result.sexp_type = :dsym
                       when :str then
                         result = s(:lit, result.last.intern)
                       else
@@ -6066,7 +6070,7 @@ end
 def _reduce_547(val, _values, result)
                       result = val[2]
                       yyerror "Can't define single method for literals." if
-                        result[0] == :lit
+                        result.sexp_type == :lit
                     
     result
 end
@@ -6087,7 +6091,7 @@ end
 
 def _reduce_551(val, _values, result)
                       list = val[0].dup
-                      more = val[2][1..-1]
+                      more = val[2].sexp_body
                       list.push(*more) unless more.empty?
                       result = list
                     

data/lib/ruby19_parser.y

@@ -357,7 +357,7 @@ rule
                 | mlhs_head tSTAR mlhs_node tCOMMA mlhs_post
                     {
                       ary = list_append val[0], s(:splat, val[2])
-                      ary.concat val[4][1..-1]
+                      ary.concat val[4].sexp_body
                       result = s(:masgn, ary)
                     }
                 | mlhs_head tSTAR
@@ -367,7 +367,7 @@ rule
                 | mlhs_head tSTAR tCOMMA mlhs_post
                     {
                       ary = list_append val[0], s(:splat)
-                      ary.concat val[3][1..-1]
+                      ary.concat val[3].sexp_body
                       result = s(:masgn, ary)
                     }
                 | tSTAR mlhs_node
@@ -377,7 +377,7 @@ rule
                 | tSTAR mlhs_node tCOMMA mlhs_post
                     {
                       ary = s(:array, s(:splat, val[1]))
-                      ary.concat val[3][1..-1]
+                      ary.concat val[3].sexp_body
                       result = s(:masgn, ary)
                     }
                 | tSTAR
@@ -387,7 +387,7 @@ rule
                 | tSTAR tCOMMA mlhs_post
                     {
                       ary = s(:array, s(:splat))
-                      ary.concat val[2][1..-1]
+                      ary.concat val[2].sexp_body
                       result = s(:masgn, ary)
                     }
 
@@ -591,7 +591,7 @@ rule
                     }
                 | primary_value tLBRACK2 opt_call_args rbracket tOP_ASGN arg
                     {
-                      val[2][0] = :arglist if val[2]
+                      val[2].sexp_type = :arglist if val[2]
                       result = s(:op_asgn1, val[0], val[2], val[4].to_sym, val[5])
                     }
                 | primary_value tDOT tIDENTIFIER tOP_ASGN arg
@@ -808,7 +808,7 @@ rule
                     }
                 | args tCOMMA assocs tCOMMA
                     {
-                      result = val[0] << s(:hash, *val[2][1..-1]) # TODO: self.args
+                      result = val[0] << s(:hash, *val[2].sexp_body) # TODO: self.args
                     }
                 | assocs tCOMMA
                     {
@@ -1136,13 +1136,16 @@ rule
                       self.in_single += 1
                       self.env.extend
                       lexer.lex_state = :expr_end # force for args
-                      result = lexer.lineno
+                      result = [lexer.lineno, self.lexer.cmdarg.stack.dup]
+                      lexer.cmdarg.stack.replace [false]
                     }
                     f_arglist bodystmt kEND
                     {
+                      line, cmdarg = val[5]
                       result = new_defs val
-                      result[3].line val[5]
+                      result[3].line line
 
+                      lexer.cmdarg.stack.replace cmdarg
                       self.env.unextend
                       self.in_single -= 1
                       self.lexer.comments # we don't care about comments in the body
@@ -1543,10 +1546,11 @@ rule
 
       opt_rescue: kRESCUE exc_list exc_var then compstmt opt_rescue
                     {
-                      _, klasses, var, _, body, rest = val
+                      (_, line), klasses, var, _, body, rest = val
 
                       klasses ||= s(:array)
                       klasses << new_assign(var, s(:gvar, :"$!")) if var
+                      klasses.line line
 
                       result = new_resbody(klasses, body)
                       result << rest if rest # UGH, rewritten above
@@ -1583,7 +1587,7 @@ rule
 
          strings: string
                     {
-                      val[0] = s(:dstr, val[0].value) if val[0][0] == :evstr
+                      val[0] = s(:dstr, val[0].value) if val[0].sexp_type == :evstr
                       result = val[0]
                     }
 
@@ -1726,7 +1730,7 @@ regexp_contents: none
 
                       case stmt
                       when Sexp then
-                        case stmt[0]
+                        case stmt.sexp_type
                         when :str, :dstr, :evstr then
                           result = stmt
                         else
@@ -1763,9 +1767,9 @@ regexp_contents: none
 
                       result ||= s(:str, "")
 
-                      case result[0]
+                      case result.sexp_type
                       when :dstr then
-                        result[0] = :dsym
+                        result.sexp_type = :dsym
                       when :str then
                         result = s(:lit, result.last.intern)
                       else
@@ -2050,7 +2054,7 @@ keyword_variable: kNIL      { result = s(:nil)   }
                     {
                       result = val[2]
                       yyerror "Can't define single method for literals." if
-                        result[0] == :lit
+                        result.sexp_type == :lit
                     }
 
       assoc_list: none # [!nil]
@@ -2066,7 +2070,7 @@ keyword_variable: kNIL      { result = s(:nil)   }
                 | assocs tCOMMA assoc
                     {
                       list = val[0].dup
-                      more = val[2][1..-1]
+                      more = val[2].sexp_body
                       list.push(*more) unless more.empty?
                       result = list
                     }