From b897f5d3ebfb62c2745e2e2af7faa9920c882438 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Thu, 12 Mar 2009 09:13:48 +0000 Subject: [PATCH] Driver: Tweak diag names to be more consistent. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@66787 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/DiagnosticDriverKinds.def | 8 ++++---- lib/Driver/Driver.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/clang/Basic/DiagnosticDriverKinds.def b/include/clang/Basic/DiagnosticDriverKinds.def index aaa1f20170..9cdc6e387b 100644 --- a/include/clang/Basic/DiagnosticDriverKinds.def +++ b/include/clang/Basic/DiagnosticDriverKinds.def @@ -12,11 +12,11 @@ __DRIVERSTART = DIAG_START_DRIVER, #undef DRIVERSTART #endif -DIAG(driver_no_such_file, ERROR, +DIAG(err_drv_no_such_file, ERROR, "no such file or directory: '%0'") -DIAG(driver_unsupported_opt, ERROR, +DIAG(err_drv_unsupported_opt, ERROR, "unsupported option '%0'") -DIAG(driver_unknown_stdin_type, ERROR, +DIAG(err_drv_unknown_stdin_type, ERROR, "-E or -x required when input is from standard input") -DIAG(driver_unknown_language, ERROR, +DIAG(err_drv_unknown_language, ERROR, "language not recognized: '%0'") diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 90cf6828e0..61cc89545c 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -48,7 +48,7 @@ ArgList *Driver::ParseArgStrings(const char **ArgBegin, const char **ArgEnd) { Arg *A = getOpts().ParseOneArg(*Args, Index, End); if (A) { if (A->getOption().isUnsupported()) { - Diag(clang::diag::driver_unsupported_opt) << A->getOption().getName(); + Diag(clang::diag::err_drv_unsupported_opt) << A->getOption().getName(); continue; } @@ -201,7 +201,7 @@ void Driver::BuildActions(const ArgList &Args, // Otherwise emit an error but still use a valid type to // avoid spurious errors (e.g., no inputs). if (!Args.hasArg(options::OPT_E)) - Diag(clang::diag::driver_unknown_stdin_type); + Diag(clang::diag::err_drv_unknown_stdin_type); Ty = types::TY_C; } else { // Otherwise lookup by extension, and fallback to ObjectType @@ -235,7 +235,7 @@ void Driver::BuildActions(const ArgList &Args, // just adds an extra stat to the equation, but this is gcc // compatible. if (memcmp(Value, "-", 2) != 0 && !llvm::sys::Path(Value).exists()) - Diag(clang::diag::driver_no_such_file) << A->getValue(Args); + Diag(clang::diag::err_drv_no_such_file) << A->getValue(Args); else Inputs.push_back(std::make_pair(Ty, A)); @@ -253,7 +253,7 @@ void Driver::BuildActions(const ArgList &Args, // unknown; but this isn't very important, we might as well be // bug comatible. if (!InputType) { - Diag(clang::diag::driver_unknown_language) << A->getValue(Args); + Diag(clang::diag::err_drv_unknown_language) << A->getValue(Args); InputType = types::TY_Object; } } -- 2.40.0