05097246f3
This is intended as a clean up after the big clang-format commit
(r280751), which unfortunately resulted in many of the comment
paragraphs in LLDB being very hard to read.
FYI, the script I used was:
import textwrap
import commands
import os
import sys
import re
tmp = "%s.tmp"%sys.argv[1]
out = open(tmp, "w+")
with open(sys.argv[1], "r") as f:
header = ""
text = ""
comment = re.compile(r'^( *//) ([^ ].*)$')
special = re.compile(r'^((([A-Z]+[: ])|([0-9]+ )).*)|(.*;)$')
for line in f:
match = comment.match(line)
if match and not special.match(match.group(2)):
# skip intentionally short comments.
if not text and len(match.group(2)) < 40:
out.write(line)
continue
if text:
text += " " + match.group(2)
else:
header = match.group(1)
text = match.group(2)
continue
if text:
filled = textwrap.wrap(text, width=(78-len(header)),
break_long_words=False)
for l in filled:
out.write(header+" "+l+'\n')
text = ""
out.write(line)
os.rename(tmp, sys.argv[1])
Differential Revision: https://reviews.llvm.org/D46144
llvm-svn: 331197
90 lines
2.4 KiB
C++
90 lines
2.4 KiB
C++
//===-- DiagnosticManager.cpp -----------------------------------*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "lldb/Expression/DiagnosticManager.h"
|
|
|
|
#include "llvm/Support/ErrorHandling.h"
|
|
|
|
#include "lldb/Utility/Log.h"
|
|
#include "lldb/Utility/StreamString.h"
|
|
|
|
using namespace lldb_private;
|
|
|
|
void DiagnosticManager::Dump(Log *log) {
|
|
if (!log)
|
|
return;
|
|
|
|
std::string str = GetString();
|
|
|
|
// GetString() puts a separator after each diagnostic. We want to remove the
|
|
// last '\n' because log->PutCString will add one for us.
|
|
|
|
if (str.size() && str.back() == '\n') {
|
|
str.pop_back();
|
|
}
|
|
|
|
log->PutCString(str.c_str());
|
|
}
|
|
|
|
static const char *StringForSeverity(DiagnosticSeverity severity) {
|
|
switch (severity) {
|
|
// this should be exhaustive
|
|
case lldb_private::eDiagnosticSeverityError:
|
|
return "error: ";
|
|
case lldb_private::eDiagnosticSeverityWarning:
|
|
return "warning: ";
|
|
case lldb_private::eDiagnosticSeverityRemark:
|
|
return "";
|
|
}
|
|
llvm_unreachable("switch needs another case for DiagnosticSeverity enum");
|
|
}
|
|
|
|
std::string DiagnosticManager::GetString(char separator) {
|
|
std::string ret;
|
|
|
|
for (const Diagnostic *diagnostic : Diagnostics()) {
|
|
ret.append(StringForSeverity(diagnostic->GetSeverity()));
|
|
ret.append(diagnostic->GetMessage());
|
|
ret.push_back(separator);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
size_t DiagnosticManager::Printf(DiagnosticSeverity severity,
|
|
const char *format, ...) {
|
|
StreamString ss;
|
|
|
|
va_list args;
|
|
va_start(args, format);
|
|
size_t result = ss.PrintfVarArg(format, args);
|
|
va_end(args);
|
|
|
|
AddDiagnostic(ss.GetString(), severity, eDiagnosticOriginLLDB);
|
|
|
|
return result;
|
|
}
|
|
|
|
size_t DiagnosticManager::PutString(DiagnosticSeverity severity,
|
|
llvm::StringRef str) {
|
|
if (str.empty())
|
|
return 0;
|
|
AddDiagnostic(str, severity, eDiagnosticOriginLLDB);
|
|
return str.size();
|
|
}
|
|
|
|
void DiagnosticManager::CopyDiagnostics(DiagnosticManager &otherDiagnostics) {
|
|
for (const DiagnosticList::value_type &other_diagnostic:
|
|
otherDiagnostics.Diagnostics()) {
|
|
AddDiagnostic(
|
|
other_diagnostic->GetMessage(), other_diagnostic->GetSeverity(),
|
|
other_diagnostic->getKind(), other_diagnostic->GetCompilerID());
|
|
}
|
|
}
|