Simplify the ComputeLinearIndex logic and fix a few bugs.

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

diff --git a/lib/AsmParser/Parser.cpp b/lib/AsmParser/Parser.cpp
index b7921f830581706149353ed292b47605fdf78699..0005e11737b8e781c4e79c80dd3231168da7555a 100644 (file)
--- a/lib/AsmParser/Parser.cpp
+++ b/lib/AsmParser/Parser.cpp
@@ -2,8 +2,8 @@
 //
 //                     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.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -13,38 +13,37 @@
 
 #include "ParserInternals.h"
 #include "llvm/Module.h"
+#include "llvm/Support/MemoryBuffer.h"
+#include <cstring>
 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;
-    }
+  std::string ErrorStr;
+  MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), &ErrorStr);
+  if (F == 0) {
+    if (Err)
+      Err->setError(Filename, "Could not open input file '" + Filename + "'");
+    return 0;
   }
-
+  
   TheParseError = Err;
-  Module *Result = RunVMAsmParser(Filename, F);
-
-  if (F != stdin)
-    fclose(F);
-
+  Module *Result = RunVMAsmParser(F);
+  delete F;
   return Result;
 }
 
-Module *llvm::ParseAssemblyString(
-  const char * AsmString, Module * M, ParseError* Err) 
-{
+Module *llvm::ParseAssemblyString(const char *AsmString, Module *M, 
+                                  ParseError *Err) {
   TheParseError = Err;
-  return RunVMAsmParser(AsmString, M);
+  MemoryBuffer *F = MemoryBuffer::getMemBuffer(AsmString, 
+                                               AsmString+strlen(AsmString),
+                                               "<string>");
+  Module *Result = RunVMAsmParser(F);
+  delete F;
+  return Result;
 }
 
 
@@ -54,9 +53,8 @@ Module *llvm::ParseAssemblyString(
 
 
 void ParseError::setError(const std::string &filename,
-                         const std::string &message,
-                         int lineNo, int colNo)
-{
+                          const std::string &message,
+                          int lineNo, int colNo) {
   Filename = filename;
   Message = message;
   LineNo = lineNo;