CLI -> Cli

Author: akuhlens

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

@@ -115,36 +115,36 @@ class LanguageFeatureControl {
   bool IsEnabled(LanguageFeature f) const { return !disable_.test(f); }
   bool ShouldWarn(LanguageFeature f) const { return warnLanguage_.test(f); }
   bool ShouldWarn(UsageWarning w) const { return warnUsage_.test(w); }
-  // CLI options
-  bool ApplyCLIOption(std::string input);
-  void AddAlternativeCLISpelling(LanguageFeature f, std::string input) {
+  // Cli options
+  bool ApplyCliOption(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;
   std::vector<const char *> GetNames(RelationalOperator) const;
 
 private:
-  // Map from CLI syntax of language features and usage warnings to their enum
+  // Map from Cli syntax of language features and usage warnings to their enum
   // values.
   std::unordered_map<std::string, std::variant<LanguageFeature, UsageWarning>>
       cliOptions_;
-  // These two arrays map the enum values to their cannonical CLI spellings.
+  // 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/Frontend/CompilerInvocation.cpp

@@ -1009,7 +1009,7 @@ static bool parseDiagArgs(CompilerInvocation &res, llvm::opt::ArgList &args,
       if (wArg == "error") {
         res.setWarnAsErr(true);
         // -W(no-)<feature>
-      } else if (!features.ApplyCLIOption(wArg)) {
+      } else if (!features.ApplyCliOption(wArg)) {
         const unsigned diagID = diags.getCustomDiagID(
             clang::DiagnosticsEngine::Error, "Unknown diagnostic option: -W%0");
         diags.Report(diagID) << wArg;

flang/lib/Support/Fortran-features.cpp

@@ -35,7 +35,7 @@ static std::vector<std::string_view> SplitCamelCase(std::string_view x) {
   return result;
 }
 
-// Namespace for helper functions for parsing CLI options used instead of static
+// Namespace for helper functions for parsing Cli options used instead of static
 // so that there can be unit tests for this function.
 namespace featuresHelpers {
 std::string CamelCaseToLowerCaseHyphenated(std::string_view x) {
@@ -154,15 +154,15 @@ LanguageFeatureControl::LanguageFeatureControl() {
   warnLanguage_.set(LanguageFeature::NullActualForAllocatable);
 }
 
-// Take a string from the CLI and apply it to the LanguageFeatureControl.
+// Take a string from the Cli and apply it to the LanguageFeatureControl.
 // Return true if the option was applied recognized.
-bool LanguageFeatureControl::ApplyCLIOption(std::string input) {
+bool LanguageFeatureControl::ApplyCliOption(std::string input) {
   bool negated{false};
   if (input.size() > 3 && input.substr(0, 3) == "no-") {
     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});