8d51d37e06
Currently Flang uses TextDiagnostic, TextDiagnosticPrinter & TestDiagnosticBuffer classes from Clang (more specifically, from libclangFrontend). This patch introduces simplified equivalents of these classes in Flang (i.e. it removes the dependency on libclangFrontend). Flang only needs these diagnostics classes for the compiler driver diagnostics. This is unlike in Clang in which similar diagnostic classes are used for e.g. Lexing/Parsing/Sema diagnostics. For this reason, the implementations introduced here are relatively basic. We can extend them in the future if this is required. This patch also enhances how the diagnostics are printed. In particular, this is the diagnostic that you'd get _before_ the changes introduced here (no text formatting): ``` $ bin/flang-new error: no input files ``` This is the diagnostic that you get _after_ the changes introduced here (in terminals that support it, the text is formatted - bold + red): ``` $ bin/flang-new flang-new: error: no input files ``` Tests are updated accordingly and options related to enabling/disabling color diagnostics are flagged as supported by Flang. Reviewed By: sameeranjoshi, CarolineConcatto Differential Revision: https://reviews.llvm.org/D87774
98 lines
2.9 KiB
C++
98 lines
2.9 KiB
C++
//===--- TextDiagnostic.cpp - Text Diagnostic Pretty-Printing -------------===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "flang/Frontend/TextDiagnostic.h"
|
|
#include "clang/Basic/DiagnosticOptions.h"
|
|
#include "llvm/Support/raw_ostream.h"
|
|
|
|
using namespace Fortran::frontend;
|
|
|
|
// TODO: Similar enums are defined in clang/lib/Frontend/TextDiagnostic.cpp.
|
|
// It would be best to share them
|
|
static const enum llvm::raw_ostream::Colors noteColor =
|
|
llvm::raw_ostream::BLACK;
|
|
static const enum llvm::raw_ostream::Colors remarkColor =
|
|
llvm::raw_ostream::BLUE;
|
|
static const enum llvm::raw_ostream::Colors warningColor =
|
|
llvm::raw_ostream::MAGENTA;
|
|
static const enum llvm::raw_ostream::Colors errorColor = llvm::raw_ostream::RED;
|
|
static const enum llvm::raw_ostream::Colors fatalColor = llvm::raw_ostream::RED;
|
|
// Used for changing only the bold attribute.
|
|
static const enum llvm::raw_ostream::Colors savedColor =
|
|
llvm::raw_ostream::SAVEDCOLOR;
|
|
|
|
TextDiagnostic::TextDiagnostic() {}
|
|
|
|
TextDiagnostic::~TextDiagnostic() {}
|
|
|
|
/*static*/ void TextDiagnostic::PrintDiagnosticLevel(llvm::raw_ostream &os,
|
|
clang::DiagnosticsEngine::Level level, bool showColors) {
|
|
if (showColors) {
|
|
// Print diagnostic category in bold and color
|
|
switch (level) {
|
|
case clang::DiagnosticsEngine::Ignored:
|
|
llvm_unreachable("Invalid diagnostic type");
|
|
case clang::DiagnosticsEngine::Note:
|
|
os.changeColor(noteColor, true);
|
|
break;
|
|
case clang::DiagnosticsEngine::Remark:
|
|
os.changeColor(remarkColor, true);
|
|
break;
|
|
case clang::DiagnosticsEngine::Warning:
|
|
os.changeColor(warningColor, true);
|
|
break;
|
|
case clang::DiagnosticsEngine::Error:
|
|
os.changeColor(errorColor, true);
|
|
break;
|
|
case clang::DiagnosticsEngine::Fatal:
|
|
os.changeColor(fatalColor, true);
|
|
break;
|
|
}
|
|
}
|
|
|
|
switch (level) {
|
|
case clang::DiagnosticsEngine::Ignored:
|
|
llvm_unreachable("Invalid diagnostic type");
|
|
case clang::DiagnosticsEngine::Note:
|
|
os << "note";
|
|
break;
|
|
case clang::DiagnosticsEngine::Remark:
|
|
os << "remark";
|
|
break;
|
|
case clang::DiagnosticsEngine::Warning:
|
|
os << "warning";
|
|
break;
|
|
case clang::DiagnosticsEngine::Error:
|
|
os << "error";
|
|
break;
|
|
case clang::DiagnosticsEngine::Fatal:
|
|
os << "fatal error";
|
|
break;
|
|
}
|
|
|
|
os << ": ";
|
|
|
|
if (showColors)
|
|
os.resetColor();
|
|
}
|
|
|
|
/*static*/
|
|
void TextDiagnostic::PrintDiagnosticMessage(llvm::raw_ostream &os,
|
|
bool isSupplemental, llvm::StringRef message, bool showColors) {
|
|
if (showColors && !isSupplemental) {
|
|
// Print primary diagnostic messages in bold and without color.
|
|
os.changeColor(savedColor, true);
|
|
}
|
|
|
|
os << message;
|
|
|
|
if (showColors)
|
|
os.resetColor();
|
|
os << '\n';
|
|
}
|