follow naming conventions

Author: akuhlens

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

@@ -115,15 +115,15 @@ class LanguageFeatureControl {
   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) {
+  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);
+  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)];
   };

flang/lib/Frontend/CompilerInvocation.cpp

@@ -995,7 +995,7 @@ static bool parseDiagArgs(CompilerInvocation &res, llvm::opt::ArgList &args,
       if (wArg == "error") {
         res.setWarnAsErr(true);
         // -W(no-)<feature>
-      } else if (!res.getFrontendOpts().features.applyCLIOption(wArg)) {
+      } else if (!res.getFrontendOpts().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

@@ -15,11 +15,6 @@
 
 namespace Fortran::common {
 
-// Namespace for helper functions for parsing CLI options
-// used instead of static so that there can be unit tests for these
-// functions.
-namespace featuresHelpers {
-
 static std::vector<std::string_view> SplitCamelCase(std::string_view x) {
   std::vector<std::string_view> result;
   // NB, we start at 1 because the first character is never a word boundary.
@@ -42,6 +37,9 @@ 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
+// so that there can be unit tests for this function.
+namespace featuresHelpers {
 std::string CamelCaseToLowerCaseHyphenated(std::string_view x) {
   std::vector<std::string_view> words{SplitCamelCase(x)};
   std::string result{};
@@ -160,7 +158,7 @@ LanguageFeatureControl::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;
@@ -179,15 +177,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});