Replace the original flex lexer with a hand writen one. This
drops a dependency on flex and lets us make future progress more
easily. Yay for 2 fewer .cvs files to make silly conflicts with.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44213 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AsmParser/Parser.cpp b/lib/AsmParser/Parser.cpp
index b7921f8..6dbb60f 100644
--- a/lib/AsmParser/Parser.cpp
+++ b/lib/AsmParser/Parser.cpp
@@ -13,38 +13,37 @@
#include "ParserInternals.h"
#include "llvm/Module.h"
+#include "llvm/Support/MemoryBuffer.h"
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[0], Filename.size(),
+ &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 @@
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;