X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FAsmParser%2FParser.cpp;h=7c6598106ece07fdb9ebfc12b6e0d4b00676a379;hb=f2b844d0b1d1cf62ba172f97981840fa9ccdf693;hp=dfe8d559a44cd526c8c28ea788e3bd907be9cc39;hpb=77e14adf0bb15762b7892529ad5c7705600b4d3a;p=oota-llvm.git

diff --git a/lib/AsmParser/Parser.cpp b/lib/AsmParser/Parser.cpp
index dfe8d559a44..7c6598106ec 100644
--- a/lib/AsmParser/Parser.cpp
+++ b/lib/AsmParser/Parser.cpp
@@ -1,76 +1,59 @@
-//===- Parser.cpp - Main dispatch module for the Parser library -------------===
+//===- Parser.cpp - Main dispatch module for the Parser library -----------===//
 //
-// This library implements the functionality defined in llvm/assembly/parser.h
+//                     The LLVM Compiler Infrastructure
 //
-//===------------------------------------------------------------------------===
-
-#include "llvm/Analysis/Verifier.h"
-#include "llvm/Module.h"
-#include "ParserInternals.h"
-using std::string;
-
-// The useful interface defined by this file... Parse an ascii file, and return
-// the internal representation in a nice slice'n'dice'able representation.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
-Module *ParseAssemblyFile(const string &Filename) { // throw (ParseException)
-  FILE *F = stdin;
-
-  if (Filename != "-") {
-    F = fopen(Filename.c_str(), "r");
-
-    if (F == 0)
-      throw ParseException(Filename, "Could not open file '" + Filename + "'");
-  }
-
-  Module *Result;
-  try {
-    Result = RunVMAsmParser(Filename, F);
-  } catch (...) {
-    if (F != stdin) fclose(F);      // Make sure to close file descriptor if an
-    throw;                          // exception is thrown
-  }
-
-  if (F != stdin)
-    fclose(F);
-
-  return Result;
+//===----------------------------------------------------------------------===//
+//
+// This library implements the functionality defined in llvm/AsmParser/Parser.h
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/AsmParser/Parser.h"
+#include "LLParser.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;
+
+std::unique_ptr<Module> llvm::parseAssembly(std::unique_ptr<MemoryBuffer> F,
+                                            SMDiagnostic &Err,
+                                            LLVMContext &Context) {
+  SourceMgr SM;
+  MemoryBuffer *Buf = F.get();
+  SM.AddNewSourceBuffer(F.release(), SMLoc());
+
+  std::unique_ptr<Module> M =
+      make_unique<Module>(Buf->getBufferIdentifier(), Context);
+  if (LLParser(Buf->getBuffer(), SM, Err, M.get()).Run())
+    return nullptr;
+  return std::move(M);
 }
 
+std::unique_ptr<Module> llvm::parseAssemblyFile(StringRef Filename,
+                                                SMDiagnostic &Err,
+                                                LLVMContext &Context) {
+  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;
+  }
 
-//===------------------------------------------------------------------------===
-//                              ParseException Class
-//===------------------------------------------------------------------------===
-
-
-ParseException::ParseException(const string &filename, const string &message, 
-			       int lineNo, int colNo) 
-  : Filename(filename), Message(message) {
-  LineNo = lineNo; ColumnNo = colNo;
-}
-
-ParseException::ParseException(const ParseException &E) 
-  : Filename(E.Filename), Message(E.Message) {
-  LineNo = E.LineNo;
-  ColumnNo = E.ColumnNo;
+  return parseAssembly(std::move(FileOrErr.get()), Err, Context);
 }
 
-const string ParseException::getMessage() const { // Includes info from options
-  string Result;
-  char Buffer[10];
+std::unique_ptr<Module> llvm::parseAssemblyString(StringRef AsmString,
+                                                  SMDiagnostic &Err,
+                                                  LLVMContext &Context) {
+  std::unique_ptr<MemoryBuffer> F(
+      MemoryBuffer::getMemBuffer(AsmString, "<string>"));
 
-  if (Filename == "-") 
-    Result += "<stdin>";
-  else
-    Result += Filename;
-
-  if (LineNo != -1) {
-    sprintf(Buffer, "%d", LineNo);
-    Result += string(":") + Buffer;
-    if (ColumnNo != -1) {
-      sprintf(Buffer, "%d", ColumnNo);
-      Result += string(",") + Buffer;
-    }
-  }
-  
-  return Result + ": " + Message;
+  return parseAssembly(std::move(F), Err, Context);
 }