d211d1a59c
Summary:
Previously lldb-test's LinePrinter would output the indentation spaces
even on completely empty lines. This is not nice, as trailing spaces get
flagged as errors in some tools/editors, and it prevents FileCheck's
CHECK-EMPTY from working.
Equally annoying was the fact that the LinePrinter did not terminate
it's output with a newline (instead it would leave the unterminated hanging
indent from the last NewLine() command), which meant that the shell prompt
following the lldb-test command came out wrong.
This fixes both issues by changing how newlines are handled. NewLine(),
which was ending the previous line ('\n') *and* begging the next line by
printing the indent, is now "demoted" to just printing literal "\n".
Instead, lines are now delimited via a helper Line object, which makes
sure the line is indented and terminated in an RAII fashion. The typical
usage would be:
Printer.line() << "This text will be indented and terminated";
If one needs to do more work than it will fit into a single statement,
one can also assign the result of the line() function to a local
variable. The line will then be terminated when that object goes out of
scope.
Reviewers: zturner
Subscribers: lldb-commits
Differential Revision: https://reviews.llvm.org/D55597
llvm-svn: 349269
67 lines
1.8 KiB
C++
67 lines
1.8 KiB
C++
//===- FormatUtil.cpp ----------------------------------------- *- C++ --*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "FormatUtil.h"
|
|
#include "llvm/Support/Format.h"
|
|
#include "llvm/Support/FormatVariadic.h"
|
|
|
|
using namespace lldb_private;
|
|
using namespace llvm;
|
|
|
|
LinePrinter::Line::~Line() {
|
|
if (P)
|
|
P->NewLine();
|
|
}
|
|
|
|
LinePrinter::LinePrinter(int Indent, llvm::raw_ostream &Stream)
|
|
: OS(Stream), IndentSpaces(Indent), CurrentIndent(0) {}
|
|
|
|
void LinePrinter::Indent(uint32_t Amount) {
|
|
if (Amount == 0)
|
|
Amount = IndentSpaces;
|
|
CurrentIndent += Amount;
|
|
}
|
|
|
|
void LinePrinter::Unindent(uint32_t Amount) {
|
|
if (Amount == 0)
|
|
Amount = IndentSpaces;
|
|
CurrentIndent = std::max<int>(0, CurrentIndent - Amount);
|
|
}
|
|
|
|
void LinePrinter::NewLine() {
|
|
OS << "\n";
|
|
}
|
|
|
|
void LinePrinter::formatBinary(StringRef Label, ArrayRef<uint8_t> Data,
|
|
uint32_t StartOffset) {
|
|
if (Data.empty()) {
|
|
line() << Label << " ()";
|
|
return;
|
|
}
|
|
line() << Label << " (";
|
|
OS << format_bytes_with_ascii(Data, StartOffset, 32, 4,
|
|
CurrentIndent + IndentSpaces, true);
|
|
NewLine();
|
|
line() << ")";
|
|
}
|
|
|
|
void LinePrinter::formatBinary(StringRef Label, ArrayRef<uint8_t> Data,
|
|
uint64_t Base, uint32_t StartOffset) {
|
|
if (Data.empty()) {
|
|
line() << Label << " ()";
|
|
return;
|
|
}
|
|
line() << Label << " (";
|
|
Base += StartOffset;
|
|
OS << format_bytes_with_ascii(Data, Base, 32, 4, CurrentIndent + IndentSpaces,
|
|
true);
|
|
NewLine();
|
|
line() << ")";
|
|
}
|