Fixed code style

p4lang · Oct 6, 2023 · a98a24e · a98a24e
1 parent 116b54d
commit a98a24e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/frontends/common/parser_options.cpp b/frontends/common/parser_options.cpp
@@ -206,8 +206,7 @@ ParserOptions::ParserOptions() : Util::Options(defaultMessage) {
         "--Winfo", "diagnostic",
         [](const char *diagnostic) {
             if (diagnostic) {
-                P4CContext::get().setDiagnosticAction(diagnostic,
-                                                      DiagnosticAction::Info);
+                P4CContext::get().setDiagnosticAction(diagnostic, DiagnosticAction::Info);
             }
             return true;
         },

diff --git a/lib/error.h b/lib/error.h
@@ -150,26 +150,26 @@ void warning(const int kind, const char *format, Args... args) {
 }
 
 /// Report info messages of type kind. Requires that the node argument have source info.
-template<class T,
-         typename = typename std::enable_if<std::is_base_of<Util::IHasSourceInfo, T>::value>::type,
-         class... Args>
+template <class T,
+          typename = typename std::enable_if<std::is_base_of<Util::IHasSourceInfo, T>::value>::type,
+          class... Args>
 void info(const int kind, const char *format, const T *node, Args... args) {
     auto &context = BaseCompileContext::get();
     auto action = context.getDefaultInfoDiagnosticAction();
     context.errorReporter().diagnose(action, kind, format, "", node, args...);
 }
 
 /// The const ref variant of the above
-template<class T,
-         typename = typename std::enable_if<std::is_base_of<Util::IHasSourceInfo, T>::value>::type,
-         class... Args>
+template <class T,
+          typename = typename std::enable_if<std::is_base_of<Util::IHasSourceInfo, T>::value>::type,
+          class... Args>
 void info(const int kind, const char *format, const T &node, Args... args) {
     ::info(kind, format, &node, std::forward<Args>(args)...);
 }
 
 /// Report info messages of type kind, for messages that do not have a node.
 /// These will not be filtered
-template<typename... Args>
+template <typename... Args>
 void info(const int kind, const char *format, Args... args) {
     auto &context = BaseCompileContext::get();
     auto action = context.getDefaultInfoDiagnosticAction();

diff --git a/lib/error_catalog.cpp b/lib/error_catalog.cpp
@@ -118,4 +118,4 @@ std::map<int, cstring> ErrorCatalog::errorCatalog = {
     {ErrorType::WARN_ENTRIES_OUT_OF_ORDER, "entries_out_of_priority_order"},
 
     // Info messages
-    { ErrorType::INFO_INFERRED,          "inferred" }};
+    {ErrorType::INFO_INFERRED, "inferred"}};
diff --git a/lib/error_catalog.h b/lib/error_catalog.h
@@ -82,7 +82,7 @@ class ErrorType {
 
     // -------- Info messages -------------
     // info messages as initially defined with a format string
-    static const int INFO_INFERRED;           // information inferred by compiler
+    static const int INFO_INFERRED;  // information inferred by compiler
 
     static const int INFO_MAX_INFOS;
 };

diff --git a/lib/error_reporter.h b/lib/error_reporter.h
@@ -37,8 +37,8 @@ enum class DiagnosticAction {
 class ErrorReporter {
  protected:
     unsigned int infoCount;
-    unsigned int errorCount;
     unsigned int warningCount;
+    unsigned int errorCount;
     unsigned int maxErrorCount;  /// the maximum number of errors that we print before fail
 
     std::ostream *outputstream;