addressing feedback

Author: akuhlens

flang/lib/Parser/message.cpp

@@ -273,16 +273,16 @@ static llvm::raw_ostream::Colors PrefixColor(Severity severity) {
 }
 
 // TODO: Make these configurable, based on verbosity level.
-const int MAX_CONTEXTS_EMITTED = 2;
-const bool OMIT_SHARED_CONTEXTS = true;
+static constexpr int MAX_CONTEXTS_EMITTED{2};
+static constexpr bool OMIT_SHARED_CONTEXTS{true};
 
 void Message::Emit(llvm::raw_ostream &o, const AllCookedSources &allCooked,
     bool echoSourceLine) const {
   std::optional<ProvenanceRange> provenanceRange{GetProvenanceRange(allCooked)};
   const AllSources &sources{allCooked.allSources()};
   sources.EmitMessage(o, provenanceRange, ToString(), Prefix(severity()),
       PrefixColor(severity()), echoSourceLine);
-  // Always refers to if the attachment in the loop below is a context.
+  // Always refers to whether the attachment in the loop below is a context.
   bool isContext{attachmentIsContext_};
   int contextsEmitted{0};
   // Emit attachments.
@@ -300,9 +300,9 @@ void Message::Emit(llvm::raw_ostream &o, const AllCookedSources &allCooked,
       // Truncate the number of contexts emitted.
       if (contextsEmitted < MAX_CONTEXTS_EMITTED) {
         emitAttachment();
-        contextsEmitted += 1;
+        ++contextsEmitted;
       }
-      if (OMIT_SHARED_CONTEXTS) {
+      if constexpr (OMIT_SHARED_CONTEXTS) {
         // Skip less specific contexts at the same location.
         for (const Message *next_attachment{attachment->attachment_.get()};
             next_attachment && next_attachment->attachmentIsContext_ &&

flang/lib/Parser/openacc-parsers.cpp

@@ -23,7 +23,7 @@ namespace Fortran::parser {
 // other types of line comments from fixed form.
 constexpr auto startAccLine{skipStuffBeforeStatement >>
     withMessage(
-        "expected OpenACC directive sentinal: !$ACC (free-form) / C$ACC or *$ACC (fixed-form)"_err_en_US,
+        "expected OpenACC directive sentinel: !$ACC (free-form) / C$ACC or *$ACC (fixed-form)"_err_en_US,
         "!$ACC "_sptok)};
 constexpr auto endAccLine{space >>
     recovery(
@@ -238,9 +238,8 @@ TYPE_PARSER(construct<OpenACCBlockConstruct>(
     recovery(withMessage("expected OpenACC end block directive"_err_en_US,
                  attempt(Parser<AccEndBlockDirective>{} / endAccLine)),
         // TODO: Is there a simpler way to build this?
-        sourced(construct<AccEndBlockDirective>(
-            sourced(construct<AccBlockDirective>(
-                pure(llvm::acc::Directive::ACCD_data))))))))
+        construct<AccEndBlockDirective>(construct<AccBlockDirective>(
+            pure(llvm::acc::Directive::ACCD_data))))))
 
 // Standalone constructs
 TYPE_PARSER(construct<OpenACCStandaloneConstruct>(