Hide more yy-lexer details; remove leftover enum.

PiperOrigin-RevId: 314443346

common/analysis/command_file_lexer.h

@@ -48,28 +48,23 @@ enum ConfigTokenEnum {
   CFG_TK_ERROR,
 };
 
-enum ConfigParserStateEnum {
-  PARSER_INIT,
-  PARSER_COMMAND,
-};
-
 class ConfigFileLexer : public FlexLexerAdapter<veribleCommandFileFlexLexer> {
   using parent_lexer_type = FlexLexerAdapter<veribleCommandFileFlexLexer>;
   using parent_lexer_type::Restart;
 
  public:
   explicit ConfigFileLexer(absl::string_view config);
 
-  // Main lexing function. Will be defined by Flex.
-  int yylex() override;
-
   // Returns true if token is invalid.
-  bool TokenIsError(const verible::TokenInfo&) const override;
+  bool TokenIsError(const verible::TokenInfo&) const final;
 
   // Runs the Lexer and attached command handlers
   std::vector<TokenRange> GetCommandsTokenRanges();
 
  private:
+  // Main lexing function. Will be defined by Flex.
+  int yylex() final;
+
   TokenSequence tokens_;
 };
 

verilog/parser/verilog_lexer.h

@@ -42,19 +42,19 @@ class VerilogLexer : public verible::FlexLexerAdapter<verilogFlexLexer> {
  public:
   explicit VerilogLexer(const absl::string_view code);
 
-  // Main lexing function. Will be defined by Flex.
-  int yylex() override;
-
   // Restart lexer with new input stream.
-  void Restart(absl::string_view) override;
+  void Restart(absl::string_view) final;
 
   // Returns true if token is invalid.
-  bool TokenIsError(const verible::TokenInfo&) const override;
+  bool TokenIsError(const verible::TokenInfo&) const final;
 
   // Filter predicate that can be used for testing and parsing.
   static bool KeepSyntaxTreeTokens(const verible::TokenInfo&);
 
  private:
+  // Main lexing function. Will be defined by Flex.
+  int yylex() final;
+
   // These variables are controlled by the lexer code (verilog.lex).
 
   // for macro call argument lexing