summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kornienko <alexfh@google.com>2013-01-14 13:40:44 +0000
committerAlexander Kornienko <alexfh@google.com>2013-01-14 13:40:44 +0000
commit79f49456faa64c8b66243638b99d76cbfbdfc346 (patch)
tree43e5d33cd836341441e164aaa932400db543c348
parent18c7689698dbad06020ad3ebdfa57602326443dc (diff)
downloadbcm5719-llvm-79f49456faa64c8b66243638b99d76cbfbdfc346.tar.gz
bcm5719-llvm-79f49456faa64c8b66243638b99d76cbfbdfc346.zip
Fix: correct file name in diagnostics.
llvm-svn: 172405
-rw-r--r--clang-tools-extra/clang-format/ClangFormat.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/clang-tools-extra/clang-format/ClangFormat.cpp b/clang-tools-extra/clang-format/ClangFormat.cpp
index da63130d4ca..507f55188f6 100644
--- a/clang-tools-extra/clang-format/ClangFormat.cpp
+++ b/clang-tools-extra/clang-format/ClangFormat.cpp
@@ -44,10 +44,11 @@ static cl::opt<std::string> FileName(cl::Positional, cl::desc("[<file>]"),
namespace clang {
namespace format {
-static FileID createInMemoryFile(const MemoryBuffer *Source,
+static FileID createInMemoryFile(StringRef FileName, const MemoryBuffer *Source,
SourceManager &Sources, FileManager &Files) {
- const FileEntry *Entry =
- Files.getVirtualFile("<stdio>", Source->getBufferSize(), 0);
+ const FileEntry *Entry = Files.getVirtualFile(FileName == "-" ? "<stdin>" :
+ FileName,
+ Source->getBufferSize(), 0);
Sources.overrideFileContents(Entry, Source, true);
return Sources.createFileID(Entry, SourceLocation(), SrcMgr::C_User);
}
@@ -63,7 +64,7 @@ static void format() {
llvm::errs() << ec.message() << "\n";
return;
}
- FileID ID = createInMemoryFile(Code.get(), Sources, Files);
+ FileID ID = createInMemoryFile(FileName, Code.get(), Sources, Files);
Lexer Lex(ID, Sources.getBuffer(ID), Sources, getFormattingLangOpts());
SourceLocation Start =
Sources.getLocForStartOfFile(ID).getLocWithOffset(Offset);
OpenPOWER on IntegriCloud