-//===- Parser.cpp - Main dispatch module for the Parser library -------------===
+//===- Parser.cpp - Main dispatch module for the Parser library -----------===//
//
// The LLVM Compiler Infrastructure
//
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
-// This library implements the functionality defined in llvm/assembly/parser.h
+// This library implements the functionality defined in llvm/AsmParser/Parser.h
//
-//===------------------------------------------------------------------------===
+//===----------------------------------------------------------------------===//
-#include "ParserInternals.h"
-#include "llvm/Module.h"
+#include "llvm/AsmParser/Parser.h"
+#include "LLParser.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/IR/Module.h"
#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/SourceMgr.h"
+#include "llvm/Support/raw_ostream.h"
+#include <cstring>
+#include <system_error>
using namespace llvm;
+bool llvm::parseAssemblyInto(MemoryBufferRef F, Module &M, SMDiagnostic &Err,
+ SlotMapping *Slots) {
+ SourceMgr SM;
+ std::unique_ptr<MemoryBuffer> Buf = MemoryBuffer::getMemBuffer(F);
+ SM.AddNewSourceBuffer(std::move(Buf), SMLoc());
-ParseError* TheParseError = 0; /// FIXME: Not threading friendly
-
-Module *llvm::ParseAssemblyFile(const std::string &Filename, ParseError* Err) {
- std::string ErrorStr;
- MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(&Filename[0], Filename.size(),
- &ErrorStr);
- if (F == 0) {
- if (Err)
- Err->setError(Filename, "Could not open input file '" + Filename + "'");
- return 0;
- }
-
- TheParseError = Err;
- Module *Result = RunVMAsmParser(F);
- delete F;
- return Result;
+ return LLParser(F.getBuffer(), SM, Err, &M, Slots).Run();
}
-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;
-}
+std::unique_ptr<Module> llvm::parseAssembly(MemoryBufferRef F,
+ SMDiagnostic &Err,
+ LLVMContext &Context,
+ SlotMapping *Slots) {
+ std::unique_ptr<Module> M =
+ make_unique<Module>(F.getBufferIdentifier(), Context);
+ if (parseAssemblyInto(F, *M, Err, Slots))
+ return nullptr;
-//===------------------------------------------------------------------------===
-// ParseError Class
-//===------------------------------------------------------------------------===
+ return M;
+}
+std::unique_ptr<Module> llvm::parseAssemblyFile(StringRef Filename,
+ SMDiagnostic &Err,
+ LLVMContext &Context,
+ SlotMapping *Slots) {
+ ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr =
+ MemoryBuffer::getFileOrSTDIN(Filename);
+ if (std::error_code EC = FileOrErr.getError()) {
+ Err = SMDiagnostic(Filename, SourceMgr::DK_Error,
+ "Could not open input file: " + EC.message());
+ return nullptr;
+ }
-void ParseError::setError(const std::string &filename,
- const std::string &message,
- int lineNo, int colNo) {
- Filename = filename;
- Message = message;
- LineNo = lineNo;
- colNo = colNo;
+ return parseAssembly(FileOrErr.get()->getMemBufferRef(), Err, Context, Slots);
}
-ParseError::ParseError(const ParseError &E)
- : Filename(E.Filename), Message(E.Message) {
- LineNo = E.LineNo;
- ColumnNo = E.ColumnNo;
+std::unique_ptr<Module> llvm::parseAssemblyString(StringRef AsmString,
+ SMDiagnostic &Err,
+ LLVMContext &Context,
+ SlotMapping *Slots) {
+ MemoryBufferRef F(AsmString, "<string>");
+ return parseAssembly(F, Err, Context, Slots);
}
-// Includes info from options
-const std::string ParseError::getMessage() const {
- std::string Result;
- char Buffer[10];
-
- if (Filename == "-")
- Result += "<stdin>";
- else
- Result += Filename;
-
- if (LineNo != -1) {
- sprintf(Buffer, "%d", LineNo);
- Result += std::string(":") + Buffer;
- if (ColumnNo != -1) {
- sprintf(Buffer, "%d", ColumnNo);
- Result += std::string(",") + Buffer;
- }
- }
-
- return Result + ": " + Message;
+Constant *llvm::parseConstantValue(StringRef Asm, SMDiagnostic &Err,
+ const Module &M, const SlotMapping *Slots) {
+ SourceMgr SM;
+ std::unique_ptr<MemoryBuffer> Buf = MemoryBuffer::getMemBuffer(Asm);
+ SM.AddNewSourceBuffer(std::move(Buf), SMLoc());
+ Constant *C;
+ if (LLParser(Asm, SM, Err, const_cast<Module *>(&M))
+ .parseStandaloneConstantValue(C, Slots))
+ return nullptr;
+ return C;
}