Change ForceSizeOpt attribute into MinSize attribute

[oota-llvm.git] / lib / AsmParser / Parser.cpp

diff --git a/lib/AsmParser/Parser.cpp b/lib/AsmParser/Parser.cpp
index 157a43b1aa2a8b91ca50eaa2c00528b6dd74d121..21b7fd411e3db0334ee5d5e60515a6772f1fee4c 100644 (file)
--- a/lib/AsmParser/Parser.cpp
+++ b/lib/AsmParser/Parser.cpp
@@ -1,4 +1,4 @@
-//===- Parser.cpp - Main dispatch module for the Parser library -------------===
+//===- Parser.cpp - Main dispatch module for the Parser library -----------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,85 +7,56 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This library implements the functionality defined in llvm/assembly/parser.h
+// This library implements the functionality defined in llvm/Assembly/Parser.h
 //
-//===------------------------------------------------------------------------===
+//===----------------------------------------------------------------------===//
 
-#include "ParserInternals.h"
+#include "llvm/Assembly/Parser.h"
+#include "LLParser.h"
 #include "llvm/Module.h"
+#include "llvm/ADT/OwningPtr.h"
+#include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/raw_ostream.h"
+#include "llvm/Support/system_error.h"
 #include <cstring>
 using namespace llvm;
 
+Module *llvm::ParseAssembly(MemoryBuffer *F,
+                            Module *M,
+                            SMDiagnostic &Err,
+                            LLVMContext &Context) {
+  SourceMgr SM;
+  SM.AddNewSourceBuffer(F, SMLoc());
 
-ParseError* TheParseError = 0; /// FIXME: Not threading friendly
+  // If we are parsing into an existing module, do it.
+  if (M)
+    return LLParser(F, SM, Err, M).Run() ? 0 : M;
 
-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 + "'");
+  // Otherwise create a new module.
+  OwningPtr<Module> M2(new Module(F->getBufferIdentifier(), Context));
+  if (LLParser(F, SM, Err, M2.get()).Run())
     return 0;
-  }
-  
-  TheParseError = Err;
-  Module *Result = RunVMAsmParser(F);
-  delete F;
-  return Result;
-}
-
-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;
+  return M2.take();
 }
 
+Module *llvm::ParseAssemblyFile(const std::string &Filename, SMDiagnostic &Err,
+                                LLVMContext &Context) {
+  OwningPtr<MemoryBuffer> File;
+  if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), File)) {
+    Err = SMDiagnostic(Filename, SourceMgr::DK_Error,
+                       "Could not open input file: " + ec.message());
+    return 0;
+  }
 
-//===------------------------------------------------------------------------===
-//                              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;
-}
-
-ParseError::ParseError(const ParseError &E)
-  : Filename(E.Filename), Message(E.Message) {
-  LineNo = E.LineNo;
-  ColumnNo = E.ColumnNo;
+  return ParseAssembly(File.take(), 0, 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, strlen(AsmString)),
+                               "<string>");
 
-  return Result + ": " + Message;
+  return ParseAssembly(F, M, Err, Context);
 }