replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use raw_ostream::write_escaped instead of EscapeString. 

llvm-svn: 84356
This commit is contained in:
Daniel Dunbar 2009-10-17 20:43:19 +00:00
parent 4108c43fd1
commit 8eff29d805
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
llvm/lib/Transforms/Hello/Hello.cpp
View File

@ -30,9 +30,8 @@ namespace {
virtual bool runOnFunction(Function &F) {
HelloCounter++;
std::string fname = F.getName();
EscapeString(fname);
errs() << "Hello: " << fname << "\n";
errs() << "Hello: ";
errs().write_escaped(F.getName()) << '\n';
return false;
}
};
@ -49,9 +48,8 @@ namespace {
virtual bool runOnFunction(Function &F) {
HelloCounter++;
std::string fname = F.getName();
EscapeString(fname);
errs() << "Hello: " << fname << "\n";
errs() << "Hello: ";
errs().write_escaped(F.getName()) << '\n';
return false;
}

16
llvm/utils/TableGen/ClangDiagnosticsEmitter.cpp
View File

@ -52,15 +52,12 @@ void ClangDiagsDefsEmitter::run(raw_ostream &OS) {
// Description string.
OS << ", \"";
std::string S = R.getValueAsString("Text");
EscapeString(S);
OS << S << "\"";
OS.write_escaped(R.getValueAsString("Text")) << '"';
// Warning associated with the diagnostic.
if (DefInit *DI = dynamic_cast<DefInit*>(R.getValueInit("Group"))) {
S = DI->getDef()->getValueAsString("GroupName");
EscapeString(S);
OS << ", \"" << S << "\"";
OS << ", \"";
OS.write_escaped(DI->getDef()->getValueAsString("GroupName")) << '"';
} else {
OS << ", 0";
}
@ -151,11 +148,10 @@ void ClangDiagGroupsEmitter::run(raw_ostream &OS) {
OS << "\n#ifdef GET_DIAG_TABLE\n";
for (std::map<std::string, GroupInfo>::iterator
I = DiagsInGroup.begin(), E = DiagsInGroup.end(); I != E; ++I) {
std::string S = I->first;
EscapeString(S);
// Group option string.
OS << " { \"" << S << "\","
<< std::string(MaxLen-I->first.size()+1, ' ');
OS << " { \"";
OS.write_escaped(I->first) << "\","
<< std::string(MaxLen-I->first.size()+1, ' ');
// Diagnostics in the group.
if (I->second.DiagsInGroup.empty())

9
llvm/utils/TableGen/StringToOffsetTable.h
View File

@ -10,9 +10,10 @@
#ifndef TBLGEN_STRING_TO_OFFSET_TABLE_H
#define TBLGEN_STRING_TO_OFFSET_TABLE_H
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/Support/raw_ostream.h"
namespace llvm {
@ -38,9 +39,13 @@ public:
}
void EmitString(raw_ostream &O) {
// Escape the string.
SmallString<256> Str;
raw_svector_ostream(Str).write_escaped(AggregateString);
AggregateString = Str.str();
O << " \"";
unsigned CharsPrinted = 0;
EscapeString(AggregateString);
for (unsigned i = 0, e = AggregateString.size(); i != e; ++i) {
if (CharsPrinted > 70) {
O << "\"\n \"";