r212584 - Simplify warning flag value handling from r206826
Alp Toker
alp at nuanti.com
Tue Jul 8 18:37:24 PDT 2014
Author: alp
Date: Tue Jul 8 20:37:24 2014
New Revision: 212584
URL: http://llvm.org/viewvc/llvm-project?rev=212584&view=rev
Log:
Simplify warning flag value handling from r206826
Also give the field it a more appropriate name and improve the docs.
Modified:
cfe/trunk/include/clang/Basic/Diagnostic.h
cfe/trunk/lib/Frontend/TextDiagnosticPrinter.cpp
Modified: cfe/trunk/include/clang/Basic/Diagnostic.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Diagnostic.h?rev=212584&r1=212583&r2=212584&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/Diagnostic.h (original)
+++ cfe/trunk/include/clang/Basic/Diagnostic.h Tue Jul 8 20:37:24 2014
@@ -335,13 +335,12 @@ private:
/// \brief Second string argument for the delayed diagnostic.
std::string DelayedDiagArg2;
- /// \brief Flag name value.
+ /// \brief Optional flag value.
///
- /// Some flags accept values. For instance, -Wframe-larger-than or -Rpass.
- /// When reporting a diagnostic with those flags, it is useful to also
- /// report the value that actually triggered the flag. The content of this
- /// string is a value to be emitted after the flag name.
- std::string FlagNameValue;
+ /// Some flags accept values, for instance: -Wframe-larger-than=<value> and
+ /// -Rpass=<value>. The content of this string is emitted after the flag name
+ /// and '='.
+ std::string FlagValue;
public:
explicit DiagnosticsEngine(
@@ -703,11 +702,8 @@ public:
/// \brief Clear out the current diagnostic.
void Clear() { CurDiagID = ~0U; }
- /// \brief Return the value associated to this diagnostic flag.
- StringRef getFlagNameValue() const { return StringRef(FlagNameValue); }
-
- /// \brief Set the value associated to this diagnostic flag.
- void setFlagNameValue(StringRef V) { FlagNameValue = V; }
+ /// \brief Return the value associated with this diagnostic flag.
+ StringRef getFlagValue() const { return FlagValue; }
private:
/// \brief Report the delayed diagnostic.
@@ -997,7 +993,7 @@ public:
DiagObj->DiagFixItHints.push_back(Hint);
}
- void addFlagValue(StringRef V) const { DiagObj->setFlagNameValue(V); }
+ void addFlagValue(StringRef V) const { DiagObj->FlagValue = V; }
};
struct AddFlagValue {
@@ -1108,7 +1104,7 @@ inline DiagnosticBuilder DiagnosticsEngi
assert(CurDiagID == ~0U && "Multiple diagnostics in flight at once!");
CurDiagLoc = Loc;
CurDiagID = DiagID;
- FlagNameValue.clear();
+ FlagValue.clear();
return DiagnosticBuilder(this);
}
Modified: cfe/trunk/lib/Frontend/TextDiagnosticPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/TextDiagnosticPrinter.cpp?rev=212584&r1=212583&r2=212584&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/TextDiagnosticPrinter.cpp (original)
+++ cfe/trunk/lib/Frontend/TextDiagnosticPrinter.cpp Tue Jul 8 20:37:24 2014
@@ -83,7 +83,7 @@ static void printDiagnosticOptions(raw_o
if (!Opt.empty()) {
OS << (Started ? "," : " [")
<< (Level == DiagnosticsEngine::Remark ? "-R" : "-W") << Opt;
- StringRef OptValue = Info.getDiags()->getFlagNameValue();
+ StringRef OptValue = Info.getDiags()->getFlagValue();
if (!OptValue.empty())
OS << "=" << OptValue;
Started = true;
More information about the cfe-commits
mailing list