Make this const.

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

diff --git a/lib/AsmParser/Parser.cpp b/lib/AsmParser/Parser.cpp
index b7921f830581706149353ed292b47605fdf78699..759e00e3217a6989fe5a9e5195a8190e052cc5a3 100644 (file)
--- a/lib/AsmParser/Parser.cpp
+++ b/lib/AsmParser/Parser.cpp
@@ -1,50 +1,59 @@
-//===- 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/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/MemoryBuffer.h"
+#include "llvm/Support/raw_ostream.h"
+#include <cstring>
 using namespace llvm;
 
+Module *llvm::ParseAssemblyFile(const std::string &Filename, ParseError &Err) {
+  Err.setFilename(Filename);
 
-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;
-    }
+  std::string ErrorStr;
+  OwningPtr<MemoryBuffer>
+    F(MemoryBuffer::getFileOrSTDIN(Filename.c_str(), &ErrorStr));
+  if (F == 0) {
+    Err.setError("Could not open input file '" + Filename + "'");
+    return 0;
   }
 
-  TheParseError = Err;
-  Module *Result = RunVMAsmParser(Filename, F);
-
-  if (F != stdin)
-    fclose(F);
-
-  return Result;
+  OwningPtr<Module> M(new Module(Filename));
+  if (LLParser(F.get(), Err, M.get()).Run())
+    return 0;
+  return M.take();
 }
 
-Module *llvm::ParseAssemblyString(
-  const char * AsmString, Module * M, ParseError* Err) 
-{
-  TheParseError = Err;
-  return RunVMAsmParser(AsmString, M);
+Module *llvm::ParseAssemblyString(const char *AsmString, Module *M,
+                                  ParseError &Err) {
+  Err.setFilename("<string>");
+
+  OwningPtr<MemoryBuffer>
+    F(MemoryBuffer::getMemBuffer(AsmString, AsmString+strlen(AsmString),
+                                 "<string>"));
+  
+  // If we are parsing into an existing module, do it.
+  if (M)
+    return LLParser(F.get(), Err, M).Run() ? 0 : M;
+
+  // Otherwise create a new module.
+  OwningPtr<Module> M2(new Module("<string>"));
+  if (LLParser(F.get(), Err, M2.get()).Run())
+    return 0;
+  return M2.take();
 }
 
 
@@ -52,41 +61,27 @@ Module *llvm::ParseAssemblyString(
 //                              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;
-}
-
-// Includes info from options
-const std::string ParseError::getMessage() const {
-  std::string Result;
-  char Buffer[10];
-
+void ParseError::PrintError(const char *ProgName, raw_ostream &S) {
+  errs() << ProgName << ": ";
   if (Filename == "-")
-    Result += "<stdin>";
+    errs() << "<stdin>";
   else
-    Result += Filename;
+    errs() << Filename;
 
   if (LineNo != -1) {
-    sprintf(Buffer, "%d", LineNo);
-    Result += std::string(":") + Buffer;
-    if (ColumnNo != -1) {
-      sprintf(Buffer, "%d", ColumnNo);
-      Result += std::string(",") + Buffer;
-    }
+    errs() << ':' << LineNo;
+    if (ColumnNo != -1)
+      errs() << ':' << (ColumnNo+1);
   }
 
-  return Result + ": " + Message;
+  errs() << ": " << Message << '\n';
+
+  if (LineNo != -1 && ColumnNo != -1) {
+    errs() << LineContents << '\n';
+
+    // Print out spaces/tabs before the caret.
+    for (unsigned i = 0; i != unsigned(ColumnNo); ++i)
+      errs() << (LineContents[i] == '\t' ? '\t' : ' ');
+    errs() << "^\n";
+  }
 }