brakeman 5.1.1 → 5.2.0

data/bundle/ruby/2.7.0/gems/{ruby_parser-3.16.0 → ruby_parser-3.18.1}/lib/ruby_lexer.rex

@@ -4,6 +4,11 @@
 
 class RubyLexer
 
+option
+
+  lineno
+  column
+
 macro
 
   IDENT_CHAR    /[a-zA-Z0-9_[:^ascii:]]/
@@ -25,7 +30,8 @@ macro
 
 start
 
-  return process_string if lex_strterm
+  maybe_pop_stack
+  return process_string_or_heredoc if lex_strterm
 
   self.cmd_state = self.command_start
   self.command_start = false
@@ -37,14 +43,14 @@ rule
 # [:state]      pattern                 [actions]
 
                 # \s - \n + \v
-                /[\ \t\r\f\v]/          { self.space_seen = true; next }
+                /[\ \t\r\f\v]+/         { self.space_seen = true; next }
 
                 /\n|\#/                 process_newline_or_comment
 
                 /[\]\)\}]/              process_brace_close
 
 : /\!/
-| is_after_operator? /\!\@/             { result EXPR_ARG, :tUBANG, "!@" }
+| is_after_operator? /\!\@/             { result EXPR_ARG,   TOKENS[text], text }
 |               /\![=~]?/               { result :arg_state, TOKENS[text], text }
 
 : /\./
@@ -63,7 +69,7 @@ rule
 
 ruby22_label?   /\"#{SIMPLE_STRING}\":/o process_label
                 /\"(#{SIMPLE_STRING})\"/o process_simple_string
-                /\"/                    { string STR_DQUOTE; result nil, :tSTRING_BEG, text }
+                /\"/                    { string STR_DQUOTE, '"'; result nil, :tSTRING_BEG, text }
 
                 /\@\@?\d/               { rb_compile_error "`#{text}` is not allowed as a variable name" }
                 /\@\@?#{IDENT_CHAR}+/o  process_ivar
@@ -75,7 +81,7 @@ ruby22_label?   /\"#{SIMPLE_STRING}\":/o process_label
 |               /\:\:/                      process_colon2
 |               /\:/                        process_colon1
 
-                /->/                    { result EXPR_ENDFN, :tLAMBDA, nil }
+                /->/                    { result EXPR_ENDFN, :tLAMBDA, text }
 
                 /[+-]/                  process_plus_minus
 
@@ -94,6 +100,7 @@ ruby22_label?   /\"#{SIMPLE_STRING}\":/o process_label
                 /\[/                    process_square_bracket
 
 was_label?        /\'#{SSTRING}\':?/o   process_label_or_string
+                  /\'/                  { string STR_SQUOTE, "'"; result nil, :tSTRING_BEG, text }
 
 : /\|/
 |               /\|\|\=/                { result EXPR_BEG, :tOP_ASGN, "||" }
@@ -105,9 +112,9 @@ was_label?        /\'#{SSTRING}\':?/o   process_label_or_string
 
 : /\*/
 |               /\*\*=/                 { result EXPR_BEG, :tOP_ASGN, "**" }
-|               /\*\*/                  { result(:arg_state, space_vs_beginning(:tDSTAR, :tDSTAR, :tPOW), "**") }
-|               /\*\=/                  { result(EXPR_BEG, :tOP_ASGN, "*") }
-|               /\*/                    { result(:arg_state, space_vs_beginning(:tSTAR, :tSTAR, :tSTAR2), "*") }
+|               /\*\*/                  { result :arg_state, space_vs_beginning(:tDSTAR, :tDSTAR, :tPOW), "**" }
+|               /\*\=/                  { result EXPR_BEG, :tOP_ASGN, "*" }
+|               /\*/                    { result :arg_state, space_vs_beginning(:tSTAR, :tSTAR, :tSTAR2), "*" }
 
 # TODO: fix result+process_lchevron to set command_start = true
 : /</
@@ -124,30 +131,30 @@ was_label?        /\'#{SSTRING}\':?/o   process_label_or_string
 |               /\>/                    { result :arg_state, :tGT, ">"       }
 
 : /\`/
-| expr_fname?   /\`/                   { result(EXPR_END, :tBACK_REF2, "`") }
+| expr_fname?   /\`/                   { result EXPR_END, :tBACK_REF2, "`" }
 | expr_dot?     /\`/                   { result((cmd_state ? EXPR_CMDARG : EXPR_ARG), :tBACK_REF2, "`") }
-|               /\`/                   { string STR_XQUOTE, '`'; result(nil, :tXSTRING_BEG, "`") }
+|               /\`/                   { string STR_XQUOTE, '`'; result nil, :tXSTRING_BEG, "`" }
 
                 /\?/                    process_questionmark
 
 : /&/
-|               /\&\&\=/                { result(EXPR_BEG, :tOP_ASGN, "&&") }
-|               /\&\&/                  { result(EXPR_BEG, :tANDOP,   "&&") }
-|               /\&\=/                  { result(EXPR_BEG, :tOP_ASGN, "&" ) }
-|               /\&\./                  { result(EXPR_DOT, :tLONELY,  "&.") }
+|               /\&\&\=/                { result EXPR_BEG, :tOP_ASGN, "&&" }
+|               /\&\&/                  { result EXPR_BEG, :tANDOP,   "&&" }
+|               /\&\=/                  { result EXPR_BEG, :tOP_ASGN, "&"  }
+|               /\&\./                  { result EXPR_DOT, :tLONELY,  "&." }
 |               /\&/                    process_amper
 
                 /\//                    process_slash
 
 : /\^/
-|               /\^=/                   { result(EXPR_BEG, :tOP_ASGN, "^") }
-|               /\^/                    { result(:arg_state, :tCARET, "^") }
+|               /\^=/                   { result EXPR_BEG, :tOP_ASGN, "^" }
+|               /\^/                    { result :arg_state, :tCARET, "^" }
 
-                /\;/                    { self.command_start = true; result(EXPR_BEG, :tSEMI, ";") }
+                /\;/                    { self.command_start = true; result EXPR_BEG, :tSEMI, ";" }
 
 : /~/
-| is_after_operator? /\~@/              { result(:arg_state, :tTILDE, "~") }
-|               /\~/                    { result(:arg_state, :tTILDE, "~") }
+| is_after_operator? /\~@/              { result :arg_state, :tTILDE, "~" }
+|               /\~/                    { result :arg_state, :tTILDE, "~" }
 
 : /\\/
 |               /\\\r?\n/               { self.lineno += 1; self.space_seen = true; next }
@@ -165,7 +172,7 @@ was_label?        /\'#{SSTRING}\':?/o   process_label_or_string
 |               /\$([1-9]\d*)/                   process_nthref
 |               /\$0/                            process_gvar
 |               /\$#{IDENT_CHAR}+/               process_gvar
-|               /\$\W|\$\z/                      process_gvar_oddity
+|               /\$\W/                           process_gvar_oddity
 
                 /\_/                    process_underscore
 

data/bundle/ruby/2.7.0/gems/{ruby_parser-3.16.0 → ruby_parser-3.18.1}/lib/ruby_lexer.rex.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 #--
 # This file is automatically generated. Do not modify it.
-# Generated by: oedipus_lex version 2.5.2.
+# Generated by: oedipus_lex version 2.6.0.
 # Source: lib/ruby_lexer.rex
 #++
 
@@ -35,6 +36,10 @@ class RubyLexer
   class ScanError < LexerError ; end
   # :startdoc:
 
+  ##
+  # The current line number.
+
+  attr_accessor :lineno
   ##
   # The file name / path
 
@@ -68,6 +73,24 @@ class RubyLexer
     yield
   end
 
+  ##
+  # The previous position. Only available if the :column option is on.
+
+  attr_accessor :old_pos
+
+  ##
+  # The position of the start of the current line. Only available if the
+  # :column option is on.
+
+  attr_accessor :start_of_current_line_pos
+
+  ##
+  # The current column, starting at 0. Only available if the
+  # :column option is on.
+  def column
+    old_pos - start_of_current_line_pos
+  end
+
 
   ##
   # The current scanner class. Must be overridden in subclasses.
@@ -81,6 +104,8 @@ class RubyLexer
 
   def parse str
     self.ss     = scanner_class.new str
+    self.lineno = 1
+    self.start_of_current_line_pos = 0
     self.state  ||= nil
 
     do_parse
@@ -102,6 +127,8 @@ class RubyLexer
   def location
     [
       (filename || "<input>"),
+      lineno,
+      column,
     ].compact.join(":")
   end
 
@@ -109,7 +136,8 @@ class RubyLexer
   # Lex the next token.
 
   def next_token
-    return process_string if lex_strterm
+    maybe_pop_stack
+    return process_string_or_heredoc if lex_strterm
     self.cmd_state = self.command_start
     self.command_start = false
     self.space_seen    = false # TODO: rename token_seen?
@@ -118,11 +146,17 @@ class RubyLexer
     token = nil
 
     until ss.eos? or token do
+      if ss.check(/\n/) then
+        self.lineno += 1
+        # line starts 1 position after the newline
+        self.start_of_current_line_pos = ss.pos + 1
+      end
+      self.old_pos = ss.pos
       token =
         case state
         when nil then
           case
-          when ss.skip(/[\ \t\r\f\v]/) then
+          when ss.skip(/[\ \t\r\f\v]+/) then
             action { self.space_seen = true; next }
           when text = ss.scan(/\n|\#/) then
             process_newline_or_comment text
@@ -130,8 +164,8 @@ class RubyLexer
             process_brace_close text
           when ss.match?(/\!/) then
             case
-            when is_after_operator? && (ss.skip(/\!\@/)) then
-              action { result EXPR_ARG, :tUBANG, "!@" }
+            when is_after_operator? && (text = ss.scan(/\!\@/)) then
+              action { result EXPR_ARG,   TOKENS[text], text }
             when text = ss.scan(/\![=~]?/) then
               action { result :arg_state, TOKENS[text], text }
             end # group /\!/
@@ -162,7 +196,7 @@ class RubyLexer
           when text = ss.scan(/\"(#{SIMPLE_STRING})\"/o) then
             process_simple_string text
           when text = ss.scan(/\"/) then
-            action { string STR_DQUOTE; result nil, :tSTRING_BEG, text }
+            action { string STR_DQUOTE, '"'; result nil, :tSTRING_BEG, text }
           when text = ss.scan(/\@\@?\d/) then
             action { rb_compile_error "`#{text}` is not allowed as a variable name" }
           when text = ss.scan(/\@\@?#{IDENT_CHAR}+/o) then
@@ -180,8 +214,8 @@ class RubyLexer
             when text = ss.scan(/\:/) then
               process_colon1 text
             end # group /:/
-          when ss.skip(/->/) then
-            action { result EXPR_ENDFN, :tLAMBDA, nil }
+          when text = ss.scan(/->/) then
+            action { result EXPR_ENDFN, :tLAMBDA, text }
           when text = ss.scan(/[+-]/) then
             process_plus_minus text
           when ss.match?(/[+\d]/) then
@@ -211,6 +245,8 @@ class RubyLexer
             process_square_bracket text
           when was_label? && (text = ss.scan(/\'#{SSTRING}\':?/o)) then
             process_label_or_string text
+          when text = ss.scan(/\'/) then
+            action { string STR_SQUOTE, "'"; result nil, :tSTRING_BEG, text }
           when ss.match?(/\|/) then
             case
             when ss.skip(/\|\|\=/) then
@@ -229,11 +265,11 @@ class RubyLexer
             when ss.skip(/\*\*=/) then
               action { result EXPR_BEG, :tOP_ASGN, "**" }
             when ss.skip(/\*\*/) then
-              action { result(:arg_state, space_vs_beginning(:tDSTAR, :tDSTAR, :tPOW), "**") }
+              action { result :arg_state, space_vs_beginning(:tDSTAR, :tDSTAR, :tPOW), "**" }
             when ss.skip(/\*\=/) then
-              action { result(EXPR_BEG, :tOP_ASGN, "*") }
+              action { result EXPR_BEG, :tOP_ASGN, "*" }
             when ss.skip(/\*/) then
-              action { result(:arg_state, space_vs_beginning(:tSTAR, :tSTAR, :tSTAR2), "*") }
+              action { result :arg_state, space_vs_beginning(:tSTAR, :tSTAR, :tSTAR2), "*" }
             end # group /\*/
           when ss.match?(/</) then
             case
@@ -262,24 +298,24 @@ class RubyLexer
           when ss.match?(/\`/) then
             case
             when expr_fname? && (ss.skip(/\`/)) then
-              action { result(EXPR_END, :tBACK_REF2, "`") }
+              action { result EXPR_END, :tBACK_REF2, "`" }
             when expr_dot? && (ss.skip(/\`/)) then
               action { result((cmd_state ? EXPR_CMDARG : EXPR_ARG), :tBACK_REF2, "`") }
             when ss.skip(/\`/) then
-              action { string STR_XQUOTE, '`'; result(nil, :tXSTRING_BEG, "`") }
+              action { string STR_XQUOTE, '`'; result nil, :tXSTRING_BEG, "`" }
             end # group /\`/
           when text = ss.scan(/\?/) then
             process_questionmark text
           when ss.match?(/&/) then
             case
             when ss.skip(/\&\&\=/) then
-              action { result(EXPR_BEG, :tOP_ASGN, "&&") }
+              action { result EXPR_BEG, :tOP_ASGN, "&&" }
             when ss.skip(/\&\&/) then
-              action { result(EXPR_BEG, :tANDOP,   "&&") }
+              action { result EXPR_BEG, :tANDOP,   "&&" }
             when ss.skip(/\&\=/) then
-              action { result(EXPR_BEG, :tOP_ASGN, "&" ) }
+              action { result EXPR_BEG, :tOP_ASGN, "&"  }
             when ss.skip(/\&\./) then
-              action { result(EXPR_DOT, :tLONELY,  "&.") }
+              action { result EXPR_DOT, :tLONELY,  "&." }
             when text = ss.scan(/\&/) then
               process_amper text
             end # group /&/
@@ -288,18 +324,18 @@ class RubyLexer
           when ss.match?(/\^/) then
             case
             when ss.skip(/\^=/) then
-              action { result(EXPR_BEG, :tOP_ASGN, "^") }
+              action { result EXPR_BEG, :tOP_ASGN, "^" }
             when ss.skip(/\^/) then
-              action { result(:arg_state, :tCARET, "^") }
+              action { result :arg_state, :tCARET, "^" }
             end # group /\^/
           when ss.skip(/\;/) then
-            action { self.command_start = true; result(EXPR_BEG, :tSEMI, ";") }
+            action { self.command_start = true; result EXPR_BEG, :tSEMI, ";" }
           when ss.match?(/~/) then
             case
             when is_after_operator? && (ss.skip(/\~@/)) then
-              action { result(:arg_state, :tTILDE, "~") }
+              action { result :arg_state, :tTILDE, "~" }
             when ss.skip(/\~/) then
-              action { result(:arg_state, :tTILDE, "~") }
+              action { result :arg_state, :tTILDE, "~" }
             end # group /~/
           when ss.match?(/\\/) then
             case
@@ -330,7 +366,7 @@ class RubyLexer
               process_gvar text
             when text = ss.scan(/\$#{IDENT_CHAR}+/) then
               process_gvar text
-            when text = ss.scan(/\$\W|\$\z/) then
+            when text = ss.scan(/\$\W/) then
               process_gvar_oddity text
             end # group /\$/
           when text = ss.scan(/\_/) then