Correctly extract the ValueType from a VTSDNode.

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

diff --git a/lib/AsmParser/Parser.cpp b/lib/AsmParser/Parser.cpp
index dfe8d559a44cd526c8c28ea788e3bd907be9cc39..b7921f830581706149353ed292b47605fdf78699 100644 (file)
--- a/lib/AsmParser/Parser.cpp
+++ b/lib/AsmParser/Parser.cpp
@@ -1,34 +1,38 @@
 //===- 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 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;
+#include "llvm/Module.h"
+using namespace llvm;
 
-// The useful interface defined by this file... Parse an ascii file, and return
-// the internal representation in a nice slice'n'dice'able representation.
-//
-Module *ParseAssemblyFile(const string &Filename) { // throw (ParseException)
+
+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)
-      throw ParseException(Filename, "Could not open file '" + Filename + "'");
+    if (F == 0) {
+      if (Err)
+        Err->setError(Filename,"Could not open file '" + Filename + "'");
+      return 0;
+    }
   }
 
-  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
-  }
+  TheParseError = Err;
+  Module *Result = RunVMAsmParser(Filename, F);
 
   if (F != stdin)
     fclose(F);
@@ -36,41 +40,53 @@ Module *ParseAssemblyFile(const string &Filename) { // throw (ParseException)
   return Result;
 }
 
+Module *llvm::ParseAssemblyString(
+  const char * AsmString, Module * M, ParseError* Err) 
+{
+  TheParseError = Err;
+  return RunVMAsmParser(AsmString, M);
+}
+
 
 //===------------------------------------------------------------------------===
-//                              ParseException Class
+//                              ParseError Class
 //===------------------------------------------------------------------------===
 
 
-ParseException::ParseException(const string &filename, const string &message, 
-                              int lineNo, int colNo) 
-  : Filename(filename), Message(message) {
-  LineNo = lineNo; ColumnNo = colNo;
+void ParseError::setError(const std::string &filename,
+                         const std::string &message,
+                         int lineNo, int colNo)
+{
+  Filename = filename;
+  Message = message;
+  LineNo = lineNo;
+  colNo = colNo;
 }
 
-ParseException::ParseException(const ParseException &E) 
+ParseError::ParseError(const ParseError &E)
   : Filename(E.Filename), Message(E.Message) {
   LineNo = E.LineNo;
   ColumnNo = E.ColumnNo;
 }
 
-const string ParseException::getMessage() const { // Includes info from options
-  string Result;
+// Includes info from options
+const std::string ParseError::getMessage() const {
+  std::string Result;
   char Buffer[10];
 
-  if (Filename == "-") 
+  if (Filename == "-")
     Result += "<stdin>";
   else
     Result += Filename;
 
   if (LineNo != -1) {
     sprintf(Buffer, "%d", LineNo);
-    Result += string(":") + Buffer;
+    Result += std::string(":") + Buffer;
     if (ColumnNo != -1) {
       sprintf(Buffer, "%d", ColumnNo);
-      Result += string(",") + Buffer;
+      Result += std::string(",") + Buffer;
     }
   }
-  
+
   return Result + ": " + Message;
 }