//===- 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"
-#include <stdio.h> // for sprintf
+#include "llvm/Module.h"
+using namespace llvm;
-// The useful interface defined by this file... Parse an ascii file, and return
+// 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)
+Module *llvm::ParseAssemblyFile(const std::string &Filename) {
FILE *F = stdin;
- if (Filename != "-")
+ if (Filename != "-") {
F = fopen(Filename.c_str(), "r");
- if (F == 0) {
- throw ParseException(Filename, string("Could not open file '") +
- Filename + "'");
+ if (F == 0)
+ throw ParseException(Filename, "Could not open file '" + Filename + "'");
}
- // TODO: If this throws an exception, F is not closed.
- Module *Result = RunVMAsmParser(Filename, F);
+ 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
+ }
if (F != stdin)
fclose(F);
- if (Result) { // Check to see that it is valid...
- vector<string> Errors;
- if (verify(Result, Errors)) {
- delete Result; Result = 0;
- string Message;
-
- for (unsigned i = 0; i < Errors.size(); i++)
- Message += Errors[i] + "\n";
-
- throw ParseException(Filename, Message);
- }
- }
return Result;
}
//===------------------------------------------------------------------------===
-ParseException::ParseException(const string &filename, const string &message,
+ParseException::ParseException(const std::string &filename,
+ const std::string &message,
int lineNo, int colNo)
: Filename(filename), Message(message) {
LineNo = lineNo; ColumnNo = colNo;
ColumnNo = E.ColumnNo;
}
-const string ParseException::getMessage() const { // Includes info from options
- string Result;
+// Includes info from options
+const std::string ParseException::getMessage() const {
+ std::string Result;
char Buffer[10];
if (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;
}
}