X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FAsmParser%2FParser.cpp;h=6cae013b129070fc3ea490313cb6875fd4203340;hb=783d16f0b73462275904768fa54c2ea9ed33a9d0;hp=b7921f830581706149353ed292b47605fdf78699;hpb=61c83e023fe618ca7b4fdc846039933e61a00ec9;p=oota-llvm.git

diff --git a/lib/AsmParser/Parser.cpp b/lib/AsmParser/Parser.cpp
index b7921f83058..6cae013b129 100644
--- a/lib/AsmParser/Parser.cpp
+++ b/lib/AsmParser/Parser.cpp
@@ -1,92 +1,60 @@
-//===- 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/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;
 
-
-ParseError* TheParseError = 0; /// FIXME: Not threading friendly
-
-Module *llvm::ParseAssemblyFile(const std::string &Filename, ParseError* Err) {
-  FILE *F = stdin;
-
-  if (Filename != "-") {
-    F = fopen(Filename.c_str(), "r");
-
-    if (F == 0) {
-      if (Err)
-        Err->setError(Filename,"Could not open file '" + Filename + "'");
-      return 0;
-    }
-  }
-
-  TheParseError = Err;
-  Module *Result = RunVMAsmParser(Filename, F);
-
-  if (F != stdin)
-    fclose(F);
-
-  return Result;
+Module *llvm::ParseAssembly(std::unique_ptr<MemoryBuffer> F, Module *M,
+                            SMDiagnostic &Err, LLVMContext &Context) {
+  SourceMgr SM;
+  MemoryBuffer *Buf = F.get();
+  SM.AddNewSourceBuffer(F.release(), SMLoc());
+
+  // If we are parsing into an existing module, do it.
+  if (M)
+    return LLParser(Buf->getBuffer(), SM, Err, M).Run() ? nullptr : M;
+
+  // Otherwise create a new module.
+  std::unique_ptr<Module> M2(new Module(Buf->getBufferIdentifier(), Context));
+  if (LLParser(Buf->getBuffer(), SM, Err, M2.get()).Run())
+    return nullptr;
+  return M2.release();
 }
 
-Module *llvm::ParseAssemblyString(
-  const char * AsmString, Module * M, ParseError* Err) 
-{
-  TheParseError = Err;
-  return RunVMAsmParser(AsmString, M);
-}
-
-
-//===------------------------------------------------------------------------===
-//                              ParseError Class
-//===------------------------------------------------------------------------===
-
-
-void ParseError::setError(const std::string &filename,
-                         const std::string &message,
-                         int lineNo, int colNo)
-{
-  Filename = filename;
-  Message = message;
-  LineNo = lineNo;
-  colNo = colNo;
-}
+Module *llvm::ParseAssemblyFile(const std::string &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;
+  }
 
-ParseError::ParseError(const ParseError &E)
-  : Filename(E.Filename), Message(E.Message) {
-  LineNo = E.LineNo;
-  ColumnNo = E.ColumnNo;
+  return ParseAssembly(std::move(FileOrErr.get()), nullptr, Err, Context);
 }
 
-// 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;
-    }
-  }
+Module *llvm::ParseAssemblyString(const char *AsmString, Module *M,
+                                  SMDiagnostic &Err, LLVMContext &Context) {
+  MemoryBuffer *F =
+      MemoryBuffer::getMemBuffer(StringRef(AsmString), "<string>");
 
-  return Result + ": " + Message;
+  return ParseAssembly(std::unique_ptr<MemoryBuffer>(F), M, Err, Context);
 }