CLI capitalization and {} initialization

Author: akuhlens

flang/include/flang/Common/enum-class.h

@@ -72,7 +72,7 @@ constexpr std::array<std::string_view, ITEMS> EnumNames(const char *p) {
     return NAME##_names[static_cast<std::size_t>(e)]; \
   } \
   [[maybe_unused]] inline void ForEach##NAME(std::function<void(NAME)> f) { \
-    for (std::size_t i = 0; i < NAME##_enumSize; ++i) { \
+    for (std::size_t i{0}; i < NAME##_enumSize; ++i) { \
       f(static_cast<NAME>(i)); \
     } \
   }

flang/include/flang/Support/Fortran-features.h

@@ -117,19 +117,19 @@ class LanguageFeatureControl {
   bool ShouldWarn(UsageWarning w) const { return warnUsage_.test(w); }
   // CLI options
   bool ApplyCLIOption(std::string input);
-  void AddAlternativeCliSpelling(LanguageFeature f, std::string input) {
+  void AddAlternativeCLISpelling(LanguageFeature f, std::string input) {
     cliOptions_.insert({input, {f}});
   }
-  void AddAlternativeCliSpelling(UsageWarning w, std::string input) {
+  void AddAlternativeCLISpelling(UsageWarning w, std::string input) {
     cliOptions_.insert({input, {w}});
   }
-  void ReplaceCliCanonicalSpelling(LanguageFeature f, std::string input);
-  void ReplaceCliCanonicalSpelling(UsageWarning w, std::string input);
-  std::string_view getDefaultCliSpelling(LanguageFeature f) const {
-    return languageFeatureCliCanonicalSpelling_[EnumToInt(f)];
+  void ReplaceCLICanonicalSpelling(LanguageFeature f, std::string input);
+  void ReplaceCLICanonicalSpelling(UsageWarning w, std::string input);
+  std::string_view getDefaultCLISpelling(LanguageFeature f) const {
+    return languageFeatureCLICanonicalSpelling_[EnumToInt(f)];
   };
-  std::string_view getDefaultCliSpelling(UsageWarning w) const {
-    return usageWarningCliCanonicalSpelling_[EnumToInt(w)];
+  std::string_view getDefaultCLISpelling(UsageWarning w) const {
+    return usageWarningCLICanonicalSpelling_[EnumToInt(w)];
   };
   // Return all spellings of operators names, depending on features enabled
   std::vector<const char *> GetNames(LogicalOperator) const;
@@ -142,9 +142,9 @@ class LanguageFeatureControl {
       cliOptions_;
   // These two arrays map the enum values to their cannonical CLI spellings.
   std::array<std::string_view, LanguageFeature_enumSize>
-      languageFeatureCliCanonicalSpelling_;
+      languageFeatureCLICanonicalSpelling_;
   std::array<std::string_view, UsageWarning_enumSize>
-      usageWarningCliCanonicalSpelling_;
+      usageWarningCLICanonicalSpelling_;
   LanguageFeatures disable_;
   LanguageFeatures warnLanguage_;
   bool warnAllLanguage_{false};

flang/lib/Support/Fortran-features.cpp

@@ -162,7 +162,7 @@ bool LanguageFeatureControl::ApplyCLIOption(std::string input) {
     negated = true;
     input = input.substr(3);
   }
-  if (auto it = cliOptions_.find(input); it != cliOptions_.end()) {
+  if (auto it{cliOptions_.find(input)}; it != cliOptions_.end()) {
     if (std::holds_alternative<LanguageFeature>(it->second)) {
       EnableWarning(std::get<LanguageFeature>(it->second), !negated);
       return true;
@@ -175,15 +175,15 @@ bool LanguageFeatureControl::ApplyCLIOption(std::string input) {
   return false;
 }
 
-void LanguageFeatureControl::ReplaceCliCanonicalSpelling(
+void LanguageFeatureControl::ReplaceCLICanonicalSpelling(
     LanguageFeature f, std::string input) {
   std::string_view old{languageFeatureCliCanonicalSpelling_[EnumToInt(f)]};
   cliOptions_.erase(std::string{old});
   languageFeatureCliCanonicalSpelling_[EnumToInt(f)] = input;
   cliOptions_.insert({input, {f}});
 }
 
-void LanguageFeatureControl::ReplaceCliCanonicalSpelling(
+void LanguageFeatureControl::ReplaceCLICanonicalSpelling(
     UsageWarning w, std::string input) {
   std::string_view old{usageWarningCliCanonicalSpelling_[EnumToInt(w)]};
   cliOptions_.erase(std::string{old});