-//===- Parser.cpp - Main dispatch module for the Parser library -------------===
+//===- Parser.cpp - Main dispatch module for the Parser library -----------===//
//
// The LLVM Compiler Infrastructure
//
//
//===----------------------------------------------------------------------===//
//
-// This library implements the functionality defined in llvm/assembly/parser.h
+// This library implements the functionality defined in llvm/Assembly/Parser.h
//
-//===------------------------------------------------------------------------===
+//===----------------------------------------------------------------------===//
-#include "ParserInternals.h"
+#include "llvm/Assembly/Parser.h"
+#include "LLParser.h"
#include "llvm/Module.h"
+#include "llvm/ADT/OwningPtr.h"
#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/raw_ostream.h"
#include <cstring>
using namespace llvm;
+Module *llvm::ParseAssemblyFile(const std::string &Filename, ParseError &Err) {
+ Err.setFilename(Filename);
-ParseError* TheParseError = 0; /// FIXME: Not threading friendly
-
-Module *llvm::ParseAssemblyFile(const std::string &Filename, ParseError* Err) {
std::string ErrorStr;
- MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), &ErrorStr);
+ OwningPtr<MemoryBuffer>
+ F(MemoryBuffer::getFileOrSTDIN(Filename.c_str(), &ErrorStr));
if (F == 0) {
- if (Err)
- Err->setError(Filename, "Could not open input file '" + Filename + "'");
+ Err.setError("Could not open input file '" + Filename + "'");
return 0;
}
-
- TheParseError = Err;
- Module *Result = RunVMAsmParser(F);
- delete F;
- return Result;
-}
-Module *llvm::ParseAssemblyString(const char *AsmString, Module *M,
- ParseError *Err) {
- TheParseError = Err;
- MemoryBuffer *F = MemoryBuffer::getMemBuffer(AsmString,
- AsmString+strlen(AsmString),
- "<string>");
- Module *Result = RunVMAsmParser(F);
- delete F;
- return Result;
+ OwningPtr<Module> M(new Module(Filename));
+ if (LLParser(F.get(), Err, M.get()).Run())
+ return 0;
+ return M.take();
}
+Module *llvm::ParseAssemblyString(const char *AsmString, Module *M,
+ ParseError &Err) {
+ Err.setFilename("<string>");
-//===------------------------------------------------------------------------===
-// ParseError Class
-//===------------------------------------------------------------------------===
-
+ OwningPtr<MemoryBuffer>
+ F(MemoryBuffer::getMemBuffer(AsmString, AsmString+strlen(AsmString),
+ "<string>"));
+
+ // If we are parsing into an existing module, do it.
+ if (M)
+ return LLParser(F.get(), Err, M).Run() ? 0 : M;
-void ParseError::setError(const std::string &filename,
- const std::string &message,
- int lineNo, int colNo) {
- Filename = filename;
- Message = message;
- LineNo = lineNo;
- colNo = colNo;
+ // Otherwise create a new module.
+ OwningPtr<Module> M2(new Module("<string>"));
+ if (LLParser(F.get(), Err, M2.get()).Run())
+ return 0;
+ return M2.take();
}
-ParseError::ParseError(const ParseError &E)
- : Filename(E.Filename), Message(E.Message) {
- LineNo = E.LineNo;
- ColumnNo = E.ColumnNo;
-}
-// Includes info from options
-const std::string ParseError::getMessage() const {
- std::string Result;
- char Buffer[10];
+//===------------------------------------------------------------------------===
+// ParseError Class
+//===------------------------------------------------------------------------===
+void ParseError::PrintError(const char *ProgName, raw_ostream &S) {
+ errs() << ProgName << ": ";
if (Filename == "-")
- Result += "<stdin>";
+ errs() << "<stdin>";
else
- Result += Filename;
+ errs() << Filename;
if (LineNo != -1) {
- sprintf(Buffer, "%d", LineNo);
- Result += std::string(":") + Buffer;
- if (ColumnNo != -1) {
- sprintf(Buffer, "%d", ColumnNo);
- Result += std::string(",") + Buffer;
- }
+ errs() << ':' << LineNo;
+ if (ColumnNo != -1)
+ errs() << ':' << (ColumnNo+1);
}
- return Result + ": " + Message;
+ errs() << ": " << Message << '\n';
+
+ if (LineNo != -1 && ColumnNo != -1) {
+ errs() << LineContents << '\n';
+
+ // Print out spaces/tabs before the caret.
+ for (unsigned i = 0; i != unsigned(ColumnNo); ++i)
+ errs() << (LineContents[i] == '\t' ? '\t' : ' ');
+ errs() << "^\n";
+ }
}