[cfe-commits] r144591 - in /cfe/trunk: include/clang/Basic/DiagnosticFrontendKinds.td include/clang/Basic/DiagnosticIDs.h lib/Basic/DiagnosticIDs.cpp lib/Frontend/Warnings.cpp test/Driver/cc-log-diagnostics.c
Benjamin Kramer
benny.kra at googlemail.com
Mon Nov 14 15:30:34 PST 2011
Author: d0k
Date: Mon Nov 14 17:30:34 2011
New Revision: 144591
URL: http://llvm.org/viewvc/llvm-project?rev=144591&view=rev
Log:
Print a typo correction hint for unknown warning flags.
$ clang -Wololo t.c
warning: unknown warning option '-Wololo'; did you mean '-Wall'? [-Wunknown-warning-option]
Modified:
cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.td
cfe/trunk/include/clang/Basic/DiagnosticIDs.h
cfe/trunk/lib/Basic/DiagnosticIDs.cpp
cfe/trunk/lib/Frontend/Warnings.cpp
cfe/trunk/test/Driver/cc-log-diagnostics.c
Modified: cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.td?rev=144591&r1=144590&r2=144591&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.td Mon Nov 14 17:30:34 2011
@@ -148,10 +148,10 @@
def err_not_a_pch_file : Error<
"'%0' does not appear to be a precompiled header file">, DefaultFatal;
def warn_unknown_warning_option : Warning<
- "unknown warning option '%0'">,
+ "unknown warning option '%0'; did you mean '%1'?">,
InGroup<DiagGroup<"unknown-warning-option"> >;
def warn_unknown_negative_warning_option : Warning<
- "unknown warning option '%0'">,
+ "unknown warning option '%0'; did you mean '%1'?">,
InGroup<DiagGroup<"unknown-warning-option"> >, DefaultIgnore;
def warn_unknown_warning_specifier : Warning<
"unknown %0 warning specifier: '%1'">,
Modified: cfe/trunk/include/clang/Basic/DiagnosticIDs.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticIDs.h?rev=144591&r1=144590&r2=144591&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticIDs.h (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticIDs.h Mon Nov 14 17:30:34 2011
@@ -262,6 +262,10 @@
bool getDiagnosticsInGroup(StringRef Group,
llvm::SmallVectorImpl<diag::kind> &Diags) const;
+ /// \brief Get the warning option with the closest edit distance to the given
+ /// group name.
+ static StringRef getNearestWarningOption(StringRef Group);
+
private:
/// \brief Get the set of all diagnostic IDs in the given group.
///
Modified: cfe/trunk/lib/Basic/DiagnosticIDs.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/DiagnosticIDs.cpp?rev=144591&r1=144590&r2=144591&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/DiagnosticIDs.cpp (original)
+++ cfe/trunk/lib/Basic/DiagnosticIDs.cpp Mon Nov 14 17:30:34 2011
@@ -681,6 +681,27 @@
return false;
}
+StringRef DiagnosticIDs::getNearestWarningOption(StringRef Group) {
+ StringRef Best;
+ unsigned BestDistance = 0;
+ for (const WarningOption *i = OptionTable, *e = OptionTable + OptionTableSize;
+ i != e; ++i) {
+ // Don't suggest ignored warning flags.
+ if (!i->Members && !i->SubGroups)
+ continue;
+
+ unsigned Distance = i->getName().edit_distance(Group, true, BestDistance);
+
+ // Check if this is a better match.
+ if (Best.empty() || Distance < BestDistance) {
+ Best = i->getName();
+ BestDistance = Distance;
+ }
+ }
+
+ return Best;
+}
+
/// ProcessDiag - This is the method used to report a diagnostic that is
/// finally fully formed.
bool DiagnosticIDs::ProcessDiag(DiagnosticsEngine &Diag) const {
Modified: cfe/trunk/lib/Frontend/Warnings.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/Warnings.cpp?rev=144591&r1=144590&r2=144591&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/Warnings.cpp (original)
+++ cfe/trunk/lib/Frontend/Warnings.cpp Mon Nov 14 17:30:34 2011
@@ -120,7 +120,9 @@
} else if (DiagIDs->getDiagnosticsInGroup(Specifier, _Diags)) {
Diags.Report(isPositive ? diag::warn_unknown_warning_option :
diag::warn_unknown_negative_warning_option)
- << ("-W" + Opt.str());
+ << ("-W" + Opt.str())
+ << ("-Werror=" +
+ DiagnosticIDs::getNearestWarningOption(Specifier).str());
}
continue;
}
@@ -150,7 +152,9 @@
} else if (DiagIDs->getDiagnosticsInGroup(Specifier, _Diags)) {
Diags.Report(isPositive ? diag::warn_unknown_warning_option :
diag::warn_unknown_negative_warning_option)
- << ("-W" + Opt.str());
+ << ("-W" + Opt.str())
+ << ("-Wfatal-errors=" +
+ DiagnosticIDs::getNearestWarningOption(Specifier).str());
}
continue;
}
@@ -158,7 +162,8 @@
if (Report && DiagIDs->getDiagnosticsInGroup(Opt, _Diags)) {
Diags.Report(isPositive ? diag::warn_unknown_warning_option :
diag::warn_unknown_negative_warning_option)
- << ("-W" + Opt.str());
+ << ("-W" + Opt.str())
+ << ("-W" + DiagnosticIDs::getNearestWarningOption(Opt).str());
} else {
Diags.setDiagnosticGroupMapping(Opt, Mapping);
}
Modified: cfe/trunk/test/Driver/cc-log-diagnostics.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/cc-log-diagnostics.c?rev=144591&r1=144590&r2=144591&view=diff
==============================================================================
--- cfe/trunk/test/Driver/cc-log-diagnostics.c (original)
+++ cfe/trunk/test/Driver/cc-log-diagnostics.c Mon Nov 14 17:30:34 2011
@@ -17,7 +17,7 @@
// CHECK: <key>level</key>
// CHECK: <string>warning</string>
// CHECK: <key>message</key>
-// CHECK: <string>unknown warning option '-Wfoobar'</string>
+// CHECK: <string>unknown warning option '-Wfoobar'; did you mean '-W{{.*}}'?</string>
// CHECK: </dict>
// CHECK: <dict>
// CHECK: <key>level</key>
More information about the cfe-commits
mailing list