Make this const.

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

diff --git a/lib/AsmParser/Parser.cpp b/lib/AsmParser/Parser.cpp
index 36c9712b9d52974376a222f16e77efdbcee0baaa..759e00e3217a6989fe5a9e5195a8190e052cc5a3 100644 (file)
--- a/lib/AsmParser/Parser.cpp
+++ b/lib/AsmParser/Parser.cpp
@@ -7,13 +7,14 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This library implements the functionality defined in llvm/assembly/parser.h
+// This library implements the functionality defined in llvm/Assembly/Parser.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>
@@ -21,30 +22,38 @@ using namespace llvm;
 
 Module *llvm::ParseAssemblyFile(const std::string &Filename, ParseError &Err) {
   Err.setFilename(Filename);
-  
+
   std::string ErrorStr;
-  MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), &ErrorStr);
+  OwningPtr<MemoryBuffer>
+    F(MemoryBuffer::getFileOrSTDIN(Filename.c_str(), &ErrorStr));
   if (F == 0) {
     Err.setError("Could not open input file '" + Filename + "'");
     return 0;
   }
-  
-  Module *Result = LLParser(F, Err).Run();
-  delete F;
-  return Result;
+
+  OwningPtr<Module> M(new Module(Filename));
+  if (LLParser(F.get(), Err, M.get()).Run())
+    return 0;
+  return M.take();
 }
 
-// FIXME: M is ignored??
-Module *llvm::ParseAssemblyString(const char *AsmString, Module *M, 
+Module *llvm::ParseAssemblyString(const char *AsmString, Module *M,
                                   ParseError &Err) {
   Err.setFilename("<string>");
 
-  MemoryBuffer *F = MemoryBuffer::getMemBuffer(AsmString, 
-                                               AsmString+strlen(AsmString),
-                                               "<string>");
-  Module *Result = LLParser(F, Err).Run();
-  delete F;
-  return Result;
+  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();
 }
 
 
@@ -58,22 +67,21 @@ void ParseError::PrintError(const char *ProgName, raw_ostream &S) {
     errs() << "<stdin>";
   else
     errs() << Filename;
-  
+
   if (LineNo != -1) {
     errs() << ':' << LineNo;
     if (ColumnNo != -1)
       errs() << ':' << (ColumnNo+1);
   }
-  
+
   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";
   }
 }
-