X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FAsmParser%2FParser.cpp;h=6cae013b129070fc3ea490313cb6875fd4203340;hb=7ce4ac12fc5b0522c5adae6abdd0d8bb552f6ef1;hp=57c831e9e17e581e22746ee6a3d61dc488fd2a46;hpb=009505452b713ed2e3a8e99c5545a6e721c65495;p=oota-llvm.git

diff --git a/lib/AsmParser/Parser.cpp b/lib/AsmParser/Parser.cpp
index 57c831e9e17..6cae013b129 100644
--- a/lib/AsmParser/Parser.cpp
+++ b/lib/AsmParser/Parser.cpp
@@ -1,84 +1,60 @@
-//===- 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"
-#include <stdio.h>  // for sprintf
-
-// 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 ToolCommandLine &Opts) throw (ParseException) {
-  FILE *F = stdin;
-
-  if (Opts.getInputFilename() != "-") 
-    F = fopen(Opts.getInputFilename().c_str(), "r");
-
-  if (F == 0) {
-    throw ParseException(Opts, string("Could not open file '") + 
-			 Opts.getInputFilename() + "'");
-  }
-
-  // TODO: If this throws an exception, F is not closed.
-  Module *Result = RunVMAsmParser(Opts, F);
-
-  if (F != stdin)
-    fclose(F);
-
-  if (Result) {  // Check to see that it is valid...
-    vector<string> Errors;
-    if (verify(Result, Errors)) {
-      delete Result; Result = 0;
-      string Message;
-
-      for (unsigned i = 0; i < Errors.size(); i++)
-	Message += Errors[i] + "\n";
-
-      throw ParseException(Opts, Message);
-    }
-  }
-  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;
+
+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::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;
+  }
 
-//===------------------------------------------------------------------------===
-//                              ParseException Class
-//===------------------------------------------------------------------------===
-
-
-ParseException::ParseException(const ToolCommandLine &opts, 
-			       const string &message, int lineNo, int colNo) 
-  : Opts(opts), Message(message) {
-  LineNo = lineNo; ColumnNo = colNo;
-}
-
-ParseException::ParseException(const ParseException &E) 
-  : Opts(E.Opts), Message(E.Message) {
-  LineNo = E.LineNo;
-  ColumnNo = E.ColumnNo;
+  return ParseAssembly(std::move(FileOrErr.get()), nullptr, Err, Context);
 }
 
-const string ParseException::getMessage() const { // Includes info from options
-  string Result;
-  char Buffer[10];
+Module *llvm::ParseAssemblyString(const char *AsmString, Module *M,
+                                  SMDiagnostic &Err, LLVMContext &Context) {
+  MemoryBuffer *F =
+      MemoryBuffer::getMemBuffer(StringRef(AsmString), "<string>");
 
-  if (Opts.getInputFilename() == "-") 
-    Result += "<stdin>";
-  else
-    Result += Opts.getInputFilename();
-
-  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::unique_ptr<MemoryBuffer>(F), M, Err, Context);
 }