brakeman 3.3.0 → 3.3.1

data/bundle/ruby/2.3.0/gems/{ruby_parser-3.8.1 → ruby_parser-3.8.2}/lib/ruby23_parser.y

@@ -185,13 +185,21 @@ rule
                     {
                       result = s(:op_asgn1, val[0], val[2], val[4].to_sym, val[5])
                     }
-                | primary_value tDOT tIDENTIFIER tOP_ASGN command_call
+                | primary_value call_op tIDENTIFIER tOP_ASGN command_call
                     {
                       result = s(:op_asgn, val[0], val[4], val[2].to_sym, val[3].to_sym)
+                      if val[1] == '&.'
+                        result[0] = :safe_op_asgn
+                      end
+                      result.line = val[0].line
                     }
-                | primary_value tDOT tCONSTANT tOP_ASGN command_call
+                | primary_value call_op tCONSTANT tOP_ASGN command_call
                     {
                       result = s(:op_asgn, val[0], val[4], val[2].to_sym, val[3].to_sym)
+                      if val[1] == '&.'
+                        result[0] = :safe_op_asgn
+                      end
+                      result.line = val[0].line
                     }
                 | primary_value tCOLON2 tCONSTANT tOP_ASGN command_call
                     {
@@ -297,19 +305,14 @@ rule
                         result.insert 1, operation
                       end
                     }
-                | primary_value tDOT operation2 command_args =tLOWEST
+                | primary_value call_op operation2 command_args =tLOWEST
                     {
-                      result = new_call val[0], val[2].to_sym, val[3]
+                      result = new_call val[0], val[2].to_sym, val[3], val[1]
                     }
-                | primary_value tLONELY operation2 command_args =tLOWEST
-                    {
-                      result = new_call val[0], val[2].to_sym, val[3]
-                      result[0] = :safe_call
-                    }
-                | primary_value tDOT operation2 command_args cmd_brace_block
+                | primary_value call_op operation2 command_args cmd_brace_block
                     {
                       recv, _, msg, args, block = val
-                      call = new_call recv, msg.to_sym, args
+                      call = new_call recv, msg.to_sym, args, val[1]
 
                       block_dup_check call, block
 
@@ -451,25 +454,17 @@ rule
                     {
                       result = self.aryset val[0], val[2]
                     }
-                | primary_value tDOT tIDENTIFIER
+                | primary_value call_op tIDENTIFIER
                     {
-                      result = s(:attrasgn, val[0], :"#{val[2]}=")
-                    }
-                | primary_value tLONELY tIDENTIFIER
-                    {
-                      result = s(:attrasgnx, val[0], :"#{val[2]}=")
+                      result = new_attrasgn val[0], val[2], val[1]
                     }
                 | primary_value tCOLON2 tIDENTIFIER
                     {
                       result = s(:attrasgn, val[0], :"#{val[2]}=")
                     }
-                | primary_value tDOT tCONSTANT
+                | primary_value call_op tCONSTANT
                     {
-                      result = s(:attrasgn, val[0], :"#{val[2]}=")
-                    }
-                | primary_value tLONELY tCONSTANT
-                    {
-                      result = s(:attrasgnx, val[0], :"#{val[2]}=")
+                      result = new_attrasgn val[0], val[2], val[1]
                     }
                 | primary_value tCOLON2 tCONSTANT
                     {
@@ -507,25 +502,17 @@ rule
                     {
                       result = self.aryset val[0], val[2]
                     }
-                | primary_value tDOT tIDENTIFIER # REFACTOR
-                    {
-                      result = s(:attrasgn, val[0], :"#{val[2]}=")
-                    }
-                | primary_value tLONELY tIDENTIFIER
+                | primary_value call_op tIDENTIFIER # REFACTOR
                     {
-                      result = s(:safe_attrasgn, val[0], :"#{val[2]}=")
+                      result = new_attrasgn val[0], val[2], val[1]
                     }
                 | primary_value tCOLON2 tIDENTIFIER
                     {
                       result = s(:attrasgn, val[0], :"#{val[2]}=")
                     }
-                | primary_value tDOT tCONSTANT # REFACTOR?
+                | primary_value call_op tCONSTANT # REFACTOR?
                     {
-                      result = s(:attrasgn, val[0], :"#{val[2]}=")
-                    }
-                | primary_value tLONELY tCONSTANT
-                    {
-                      result = s(:safe_attrasgn, val[0], :"#{val[2]}=")
+                      result = new_attrasgn val[0], val[2], val[1]
                     }
                 | primary_value tCOLON2 tCONSTANT
                     {
@@ -642,13 +629,13 @@ rule
                       val[2][0] = :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
+                | primary_value call_op tIDENTIFIER tOP_ASGN arg
                     {
-                      result = s(:op_asgn2, val[0], :"#{val[2]}=", val[3].to_sym, val[4])
+                      result = new_op_asgn2 val
                     }
-                | primary_value tDOT tCONSTANT tOP_ASGN arg
+                | primary_value call_op tCONSTANT tOP_ASGN arg
                     {
-                      result = s(:op_asgn2, val[0], :"#{val[2]}=", val[3].to_sym, val[4])
+                      result = new_op_asgn2 val
                     }
                 | primary_value tCOLON2 tIDENTIFIER tOP_ASGN arg
                     {
@@ -1567,14 +1554,9 @@ opt_block_args_tail: tCOMMA block_args_tail
                       args = self.call_args val[2..-1]
                       result = val[0].concat args[1..-1]
                     }
-                | primary_value tDOT operation2 opt_paren_args
-                    {
-                      result = new_call val[0], val[2].to_sym, val[3]
-                    }
-                | primary_value tLONELY operation2 opt_paren_args
+                | primary_value call_op operation2 opt_paren_args
                     {
-                      result = new_call val[0], val[2].to_sym, val[3]
-                      result[0] = :safe_call
+                      result = new_call val[0], val[2].to_sym, val[3], val[1]
                     }
                 | primary_value tCOLON2 operation2 paren_args
                     {
@@ -1584,14 +1566,9 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       result = new_call val[0], val[2].to_sym
                     }
-                | primary_value tDOT paren_args
+                | primary_value call_op paren_args
                     {
-                      result = new_call val[0], :call, val[2]
-                    }
-                | primary_value tLONELY paren_args
-                    {
-                      result = new_call val[0], :call, val[2]
-                      result[0] = :safe_call
+                      result = new_call val[0], :call, val[2], val[1]
                     }
                 | primary_value tCOLON2 paren_args
                     {
@@ -1868,7 +1845,7 @@ regexp_contents: none
                       result = lexer.lex_strterm
 
                       lexer.lex_strterm = nil
-                      lexer.lex_state = :expr_beg
+                      lexer.lex_state = :expr_beg # TODO: expr_value ?
                     }
                     string_dvar
                     {
@@ -1889,7 +1866,7 @@ regexp_contents: none
                       lexer.brace_nest  = 0
                       lexer.string_nest = 0
 
-                      lexer.lex_state   = :expr_beg
+                      lexer.lex_state   = :expr_value
                     }
                     compstmt tRCURLY
                     {
@@ -2398,6 +2375,8 @@ keyword_variable: kNIL      { result = s(:nil)   }
       operation2: tIDENTIFIER | tCONSTANT | tFID | op
       operation3: tIDENTIFIER | tFID | op
     dot_or_colon: tDOT | tCOLON2
+         call_op: tDOT
+                | tLONELY
        opt_terms:  | terms
           opt_nl:  | tNL
           rparen: opt_nl tRPAREN

data/bundle/ruby/2.3.0/gems/{ruby_parser-3.8.1 → ruby_parser-3.8.2}/lib/ruby_parser.yy

@@ -195,13 +195,21 @@ rule
                     {
                       result = s(:op_asgn1, val[0], val[2], val[4].to_sym, val[5])
                     }
-                | primary_value tDOT tIDENTIFIER tOP_ASGN command_call
+                | primary_value call_op tIDENTIFIER tOP_ASGN command_call
                     {
                       result = s(:op_asgn, val[0], val[4], val[2].to_sym, val[3].to_sym)
+                      if val[1] == '&.'
+                        result[0] = :safe_op_asgn
+                      end
+                      result.line = val[0].line
                     }
-                | primary_value tDOT tCONSTANT tOP_ASGN command_call
+                | primary_value call_op tCONSTANT tOP_ASGN command_call
                     {
                       result = s(:op_asgn, val[0], val[4], val[2].to_sym, val[3].to_sym)
+                      if val[1] == '&.'
+                        result[0] = :safe_op_asgn
+                      end
+                      result.line = val[0].line
                     }
                 | primary_value tCOLON2 tCONSTANT tOP_ASGN command_call
                     {
@@ -313,21 +321,14 @@ rule
                         result.insert 1, operation
                       end
                     }
-                | primary_value tDOT operation2 command_args =tLOWEST
+                | primary_value call_op operation2 command_args =tLOWEST
                     {
-                      result = new_call val[0], val[2].to_sym, val[3]
+                      result = new_call val[0], val[2].to_sym, val[3], val[1]
                     }
-#if defined(RUBY23)
-                | primary_value tLONELY operation2 command_args =tLOWEST
-                    {
-                      result = new_call val[0], val[2].to_sym, val[3]
-                      result[0] = :safe_call
-                    }
-#endif
-                | primary_value tDOT operation2 command_args cmd_brace_block
+                | primary_value call_op operation2 command_args cmd_brace_block
                     {
                       recv, _, msg, args, block = val
-                      call = new_call recv, msg.to_sym, args
+                      call = new_call recv, msg.to_sym, args, val[1]
 
                       block_dup_check call, block
 
@@ -469,30 +470,18 @@ rule
                     {
                       result = self.aryset val[0], val[2]
                     }
-                | primary_value tDOT tIDENTIFIER
-                    {
-                      result = s(:attrasgn, val[0], :"#{val[2]}=")
-                    }
-#if defined(RUBY23)
-                | primary_value tLONELY tIDENTIFIER
+                | primary_value call_op tIDENTIFIER
                     {
-                      result = s(:attrasgnx, val[0], :"#{val[2]}=")
+                      result = new_attrasgn val[0], val[2], val[1]
                     }
-#endif
                 | primary_value tCOLON2 tIDENTIFIER
                     {
                       result = s(:attrasgn, val[0], :"#{val[2]}=")
                     }
-                | primary_value tDOT tCONSTANT
+                | primary_value call_op tCONSTANT
                     {
-                      result = s(:attrasgn, val[0], :"#{val[2]}=")
+                      result = new_attrasgn val[0], val[2], val[1]
                     }
-#if defined(RUBY23)
-                | primary_value tLONELY tCONSTANT
-                    {
-                      result = s(:attrasgnx, val[0], :"#{val[2]}=")
-                    }
-#endif
                 | primary_value tCOLON2 tCONSTANT
                     {
                       if (self.in_def || self.in_single > 0) then
@@ -529,30 +518,18 @@ rule
                     {
                       result = self.aryset val[0], val[2]
                     }
-                | primary_value tDOT tIDENTIFIER # REFACTOR
-                    {
-                      result = s(:attrasgn, val[0], :"#{val[2]}=")
-                    }
-#if defined(RUBY23)
-                | primary_value tLONELY tIDENTIFIER
+                | primary_value call_op tIDENTIFIER # REFACTOR
                     {
-                      result = s(:safe_attrasgn, val[0], :"#{val[2]}=")
+                      result = new_attrasgn val[0], val[2], val[1]
                     }
-#endif
                 | primary_value tCOLON2 tIDENTIFIER
                     {
                       result = s(:attrasgn, val[0], :"#{val[2]}=")
                     }
-                | primary_value tDOT tCONSTANT # REFACTOR?
-                    {
-                      result = s(:attrasgn, val[0], :"#{val[2]}=")
-                    }
-#if defined(RUBY23)
-                | primary_value tLONELY tCONSTANT
+                | primary_value call_op tCONSTANT # REFACTOR?
                     {
-                      result = s(:safe_attrasgn, val[0], :"#{val[2]}=")
+                      result = new_attrasgn val[0], val[2], val[1]
                     }
-#endif
                 | primary_value tCOLON2 tCONSTANT
                     {
                       if (self.in_def || self.in_single > 0) then
@@ -671,13 +648,13 @@ rule
                       val[2][0] = :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
+                | primary_value call_op tIDENTIFIER tOP_ASGN arg
                     {
-                      result = s(:op_asgn2, val[0], :"#{val[2]}=", val[3].to_sym, val[4])
+                      result = new_op_asgn2 val
                     }
-                | primary_value tDOT tCONSTANT tOP_ASGN arg
+                | primary_value call_op tCONSTANT tOP_ASGN arg
                     {
-                      result = s(:op_asgn2, val[0], :"#{val[2]}=", val[3].to_sym, val[4])
+                      result = new_op_asgn2 val
                     }
                 | primary_value tCOLON2 tIDENTIFIER tOP_ASGN arg
                     {
@@ -1606,17 +1583,10 @@ opt_block_args_tail: tCOMMA block_args_tail
                       args = self.call_args val[2..-1]
                       result = val[0].concat args[1..-1]
                     }
-                | primary_value tDOT operation2 opt_paren_args
-                    {
-                      result = new_call val[0], val[2].to_sym, val[3]
-                    }
-#if defined(RUBY23)
-                | primary_value tLONELY operation2 opt_paren_args
+                | primary_value call_op operation2 opt_paren_args
                     {
-                      result = new_call val[0], val[2].to_sym, val[3]
-                      result[0] = :safe_call
+                      result = new_call val[0], val[2].to_sym, val[3], val[1]
                     }
-#endif
                 | primary_value tCOLON2 operation2 paren_args
                     {
                       result = new_call val[0], val[2].to_sym, val[3]
@@ -1625,17 +1595,10 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       result = new_call val[0], val[2].to_sym
                     }
-                | primary_value tDOT paren_args
+                | primary_value call_op paren_args
                     {
-                      result = new_call val[0], :call, val[2]
+                      result = new_call val[0], :call, val[2], val[1]
                     }
-#if defined(RUBY23)
-                | primary_value tLONELY paren_args
-                    {
-                      result = new_call val[0], :call, val[2]
-                      result[0] = :safe_call
-                    }
-#endif
                 | primary_value tCOLON2 paren_args
                     {
                       result = new_call val[0], :call, val[2]
@@ -1911,7 +1874,7 @@ regexp_contents: none
                       result = lexer.lex_strterm
 
                       lexer.lex_strterm = nil
-                      lexer.lex_state = :expr_beg
+                      lexer.lex_state = :expr_beg # TODO: expr_value ?
                     }
                     string_dvar
                     {
@@ -1932,7 +1895,7 @@ regexp_contents: none
                       lexer.brace_nest  = 0
                       lexer.string_nest = 0
 
-                      lexer.lex_state   = :expr_beg
+                      lexer.lex_state   = :expr_value
                     }
                     compstmt tRCURLY
                     {
@@ -2479,6 +2442,10 @@ keyword_variable: kNIL      { result = s(:nil)   }
       operation2: tIDENTIFIER | tCONSTANT | tFID | op
       operation3: tIDENTIFIER | tFID | op
     dot_or_colon: tDOT | tCOLON2
+         call_op: tDOT
+#if defined(RUBY23)
+                | tLONELY
+#endif
        opt_terms:  | terms
           opt_nl:  | tNL
           rparen: opt_nl tRPAREN

data/bundle/ruby/2.3.0/gems/{ruby_parser-3.8.1 → ruby_parser-3.8.2}/lib/ruby_parser_extras.rb

@@ -91,7 +91,7 @@ class RPStringScanner < StringScanner
 end
 
 module RubyParserStuff
-  VERSION = "3.8.1" unless constants.include? "VERSION" # SIGH
+  VERSION = "3.8.2" unless constants.include? "VERSION" # SIGH
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments
@@ -557,8 +557,15 @@ module RubyParserStuff
     end
   end
 
-  def new_call recv, meth, args = nil
-    result = s(:call, recv, meth)
+  def new_call recv, meth, args = nil, call_op = :'.'
+    result = case call_op.to_sym
+             when :'.'
+               s(:call, recv, meth)
+             when :'&.'
+               s(:safe_call, recv, meth)
+             else
+               raise "unknown call operator: `#{type.inspect}`"
+             end
 
     # TODO: need a test with f(&b) to produce block_pass
     # TODO: need a test with f(&b) { } to produce warning
@@ -577,6 +584,22 @@ module RubyParserStuff
     result
   end
 
+  def new_attrasgn recv, meth, call_op
+    meth = :"#{meth}="
+
+    result = case call_op.to_sym
+             when :'.'
+               s(:attrasgn, recv, meth)
+             when :'&.'
+               s(:safe_attrasgn, recv, meth)
+             else
+               raise "unknown call operator: `#{type.inspect}`"
+             end
+
+    result.line = recv.line
+    result
+  end
+
   def new_case expr, body, line
     result = s(:case, expr)
 
@@ -745,6 +768,23 @@ module RubyParserStuff
     result
   end
 
+  def new_op_asgn2 val
+    recv, call_op, meth, op, arg = val
+    meth = :"#{meth}="
+
+    result = case call_op.to_sym
+             when :'.'
+               s(:op_asgn2, recv, meth, op.to_sym, arg)
+             when :'&.'
+               s(:safe_op_asgn2, recv, meth, op.to_sym, arg)
+             else
+               raise "unknown call operator: `#{type.inspect}`"
+             end
+
+    result.line = recv.line
+    result
+  end
+
   def new_regexp val
     node = val[1] || s(:str, '')
     options = val[2]