X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FAsmParser%2FParser.cpp;h=2e76c0ecc45bcbd23fd82267f2d356d0465a8dae;hb=416a5187f7804f37183b46d8f7bf43fa89a9b5a3;hp=c6caa4547320c9532fce15849a03c9407b1d4b17;hpb=b576c94c15af9a440f69d9d03c2afead7971118c;p=oota-llvm.git

diff --git a/lib/AsmParser/Parser.cpp b/lib/AsmParser/Parser.cpp
index c6caa454732..2e76c0ecc45 100644
--- a/lib/AsmParser/Parser.cpp
+++ b/lib/AsmParser/Parser.cpp
@@ -1,83 +1,64 @@
-//===- 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
+//===----------------------------------------------------------------------===//
 //
-//===------------------------------------------------------------------------===
-
-#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 library implements the functionality defined in llvm/AsmParser/Parser.h
 //
-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
-  }
+#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;
 
-  if (F != stdin)
-    fclose(F);
+bool llvm::parseAssemblyInto(MemoryBufferRef F, Module &M, SMDiagnostic &Err) {
+  SourceMgr SM;
+  std::unique_ptr<MemoryBuffer> Buf = MemoryBuffer::getMemBuffer(F, false);
+  SM.AddNewSourceBuffer(std::move(Buf), SMLoc());
 
-  return Result;
+  return LLParser(F.getBuffer(), SM, Err, &M).Run();
 }
 
+std::unique_ptr<Module> llvm::parseAssembly(MemoryBufferRef F,
+                                            SMDiagnostic &Err,
+                                            LLVMContext &Context) {
+  std::unique_ptr<Module> M =
+      make_unique<Module>(F.getBufferIdentifier(), Context);
 
-//===------------------------------------------------------------------------===
-//                              ParseException Class
-//===------------------------------------------------------------------------===
-
-
-ParseException::ParseException(const string &filename, const string &message, 
-			       int lineNo, int colNo) 
-  : Filename(filename), Message(message) {
-  LineNo = lineNo; ColumnNo = colNo;
-}
+  if (parseAssemblyInto(F, *M, Err))
+    return nullptr;
 
-ParseException::ParseException(const ParseException &E) 
-  : Filename(E.Filename), Message(E.Message) {
-  LineNo = E.LineNo;
-  ColumnNo = E.ColumnNo;
+  return M;
 }
 
-const string ParseException::getMessage() const { // Includes info from options
-  string Result;
-  char Buffer[10];
+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;
+  }
 
-  if (Filename == "-") 
-    Result += "<stdin>";
-  else
-    Result += Filename;
+  return parseAssembly(FileOrErr.get()->getMemBufferRef(), Err, Context);
+}
 
-  if (LineNo != -1) {
-    sprintf(Buffer, "%d", LineNo);
-    Result += string(":") + Buffer;
-    if (ColumnNo != -1) {
-      sprintf(Buffer, "%d", ColumnNo);
-      Result += string(",") + Buffer;
-    }
-  }
-  
-  return Result + ": " + Message;
+std::unique_ptr<Module> llvm::parseAssemblyString(StringRef AsmString,
+                                                  SMDiagnostic &Err,
+                                                  LLVMContext &Context) {
+  MemoryBufferRef F(AsmString, "<string>");
+  return parseAssembly(F, Err, Context);
 }