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
56 lines
2.0 KiB
C++
56 lines
2.0 KiB
C++
//===--- TextDiagnosticPrinter.cpp - Diagnostic Printer -------------------===//
|
|
//
|
|
// 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
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This diagnostic client prints out their diagnostic messages.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "flang/Frontend/TextDiagnosticPrinter.h"
|
|
#include "flang/Frontend/TextDiagnostic.h"
|
|
#include "clang/Basic/DiagnosticOptions.h"
|
|
#include "llvm/ADT/SmallString.h"
|
|
#include "llvm/Support/ErrorHandling.h"
|
|
#include "llvm/Support/raw_ostream.h"
|
|
|
|
using namespace Fortran::frontend;
|
|
|
|
TextDiagnosticPrinter::TextDiagnosticPrinter(
|
|
raw_ostream &os, clang::DiagnosticOptions *diags)
|
|
: os_(os), diagOpts_(diags) {}
|
|
|
|
TextDiagnosticPrinter::~TextDiagnosticPrinter() {}
|
|
|
|
void TextDiagnosticPrinter::HandleDiagnostic(
|
|
clang::DiagnosticsEngine::Level level, const clang::Diagnostic &info) {
|
|
// Default implementation (Warnings/errors count).
|
|
DiagnosticConsumer::HandleDiagnostic(level, info);
|
|
|
|
// Render the diagnostic message into a temporary buffer eagerly. We'll use
|
|
// this later as we print out the diagnostic to the terminal.
|
|
llvm::SmallString<100> outStr;
|
|
info.FormatDiagnostic(outStr);
|
|
|
|
llvm::raw_svector_ostream DiagMessageStream(outStr);
|
|
|
|
if (!prefix_.empty())
|
|
os_ << prefix_ << ": ";
|
|
|
|
// We only emit diagnostics in contexts that lack valid source locations.
|
|
assert(!info.getLocation().isValid() &&
|
|
"Diagnostics with valid source location are not supported");
|
|
|
|
Fortran::frontend::TextDiagnostic::PrintDiagnosticLevel(
|
|
os_, level, diagOpts_->ShowColors);
|
|
Fortran::frontend::TextDiagnostic::PrintDiagnosticMessage(os_,
|
|
/*IsSupplemental=*/level == clang::DiagnosticsEngine::Note,
|
|
DiagMessageStream.str(), diagOpts_->ShowColors);
|
|
|
|
os_.flush();
|
|
return;
|
|
}
|