Use the same name for validator function as is in ParserOptions

p4lang · Dec 11, 2023 · d57ba39 · d57ba39
1 parent afe64d8
commit d57ba39
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/backends/p4tools/common/options.cpp b/backends/p4tools/common/options.cpp
@@ -78,7 +78,7 @@ std::optional<ICompileContext *> AbstractP4cToolOptions::process(
     }
     P4CContext::get().options().file = remainingArgs->at(0);
 
-    validate();
+    validateOptions();
 
     return compilerContext;
 }

diff --git a/backends/p4tools/common/options.h b/backends/p4tools/common/options.h
@@ -33,8 +33,8 @@ class AbstractP4cToolOptions : protected Util::Options {
     /// Hook for customizing options processing.
     std::vector<const char *> *process(int argc, char *const argv[]) override;
 
-    /// Hook for validation of options after parsing.
-    virtual void validate() const {}
+    /// Checks if parsed options make sense with respect to each-other.
+    virtual void validateOptions() const {}
 
     /// Converts a vector of command-line arguments into the traditional (argc, argv) format.
     static std::tuple<int, char **> convertArgs(const std::vector<const char *> &args);

diff --git a/backends/p4tools/modules/testgen/options.cpp b/backends/p4tools/modules/testgen/options.cpp
@@ -383,7 +383,7 @@ TestgenOptions::TestgenOptions()
         "produce no tests or only tests that contain counter examples.");
 }
 
-void TestgenOptions::validate() const {
+void TestgenOptions::validateOptions() const {
     if (minCoverage > 0 && !hasCoverageTracking) {
         ::error(
             ErrorType::ERR_INVALID,

diff --git a/backends/p4tools/modules/testgen/options.h b/backends/p4tools/modules/testgen/options.h
@@ -93,7 +93,7 @@ class TestgenOptions : public AbstractP4cToolOptions {
     const char *getIncludePath() override;
 
  protected:
-    void validate() const override;
+    void validateOptions() const override;
 
  private:
     TestgenOptions();