From 103ff15e0309aa1b163dbe579cb078abc4b7e45e Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Fri, 2 Jan 2009 07:01:27 +0000
Subject: Reimplement the old and horrible bison parser for .ll files with a
 nice and clean recursive descent parser.

This change has a couple of ramifications:
1. The parser code is about 400 lines shorter (in what we maintain, not
   including what is autogenerated).
2. The code should be significantly faster than the old code because we
   don't have to work around bison's poor handling of datatypes with
   ctors/dtors.  This also makes the code much more resistant to memory
   leaks.
3. We now get caret diagnostics from the .ll parser, woo.
4. The actual diagnostics emited from the parser are completely different
   so a bunch of testcases had to be updated.
5. I now disallow "%ty = type opaque %ty = type i32".  There was no good
   reason to support this, it was just an accident of the old
   implementation.  I have no reason to think that anyone is actually using
   this.
6. The syntax for sticking a global variable has changed to make it
   unambiguous.  I don't think anyone is depending on this since only clang
   supports this and it is not solid yet, so I'm not worried about anything
   breaking.
7. This gets rid of the last use of bison, and along with it the .cvs files.
   I'll prune this from the makefiles as a subsequent commit.

There are a few minor cleanups that can be done after this commit (suggestions
welcome!) but this passes dejagnu testing and is ready for its time in the
limelight.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@61558 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/AsmParser/Parser.cpp | 81 +++++++++++++++++++++---------------------------
 1 file changed, 35 insertions(+), 46 deletions(-)

(limited to 'lib/AsmParser/Parser.cpp')

diff --git a/lib/AsmParser/Parser.cpp b/lib/AsmParser/Parser.cpp
index 0005e11..36c9712 100644
--- a/lib/AsmParser/Parser.cpp
+++ b/lib/AsmParser/Parser.cpp
@@ -1,4 +1,4 @@
-//===- Parser.cpp - Main dispatch module for the Parser library -------------===
+//===- Parser.cpp - Main dispatch module for the Parser library -----------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -9,39 +9,40 @@
 //
 // This library implements the functionality defined in llvm/assembly/parser.h
 //
-//===------------------------------------------------------------------------===
+//===----------------------------------------------------------------------===//
 
-#include "ParserInternals.h"
+#include "llvm/Assembly/Parser.h"
+#include "LLParser.h"
 #include "llvm/Module.h"
 #include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/raw_ostream.h"
 #include <cstring>
 using namespace llvm;
 
-
-ParseError* TheParseError = 0; /// FIXME: Not threading friendly
-
-Module *llvm::ParseAssemblyFile(const std::string &Filename, ParseError* Err) {
+Module *llvm::ParseAssemblyFile(const std::string &Filename, ParseError &Err) {
+  Err.setFilename(Filename);
+  
   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 + "'");
+    Err.setError("Could not open input file '" + Filename + "'");
     return 0;
   }
   
-  TheParseError = Err;
-  Module *Result = RunVMAsmParser(F);
+  Module *Result = LLParser(F, Err).Run();
   delete F;
   return Result;
 }
 
+// FIXME: M is ignored??
 Module *llvm::ParseAssemblyString(const char *AsmString, Module *M, 
-                                  ParseError *Err) {
-  TheParseError = Err;
+                                  ParseError &Err) {
+  Err.setFilename("<string>");
+
   MemoryBuffer *F = MemoryBuffer::getMemBuffer(AsmString, 
                                                AsmString+strlen(AsmString),
                                                "<string>");
-  Module *Result = RunVMAsmParser(F);
+  Module *Result = LLParser(F, Err).Run();
   delete F;
   return Result;
 }
@@ -51,40 +52,28 @@ Module *llvm::ParseAssemblyString(const char *AsmString, Module *M,
 //                              ParseError Class
 //===------------------------------------------------------------------------===
 
-
-void ParseError::setError(const std::string &filename,
-                          const std::string &message,
-                          int lineNo, int colNo) {
-  Filename = filename;
-  Message = message;
-  LineNo = lineNo;
-  colNo = colNo;
-}
-
-ParseError::ParseError(const ParseError &E)
-  : Filename(E.Filename), Message(E.Message) {
-  LineNo = E.LineNo;
-  ColumnNo = E.ColumnNo;
-}
-
-// Includes info from options
-const std::string ParseError::getMessage() const {
-  std::string Result;
-  char Buffer[10];
-
+void ParseError::PrintError(const char *ProgName, raw_ostream &S) {
+  errs() << ProgName << ": ";
   if (Filename == "-")
-    Result += "<stdin>";
+    errs() << "<stdin>";
   else
-    Result += Filename;
-
+    errs() << Filename;
+  
   if (LineNo != -1) {
-    sprintf(Buffer, "%d", LineNo);
-    Result += std::string(":") + Buffer;
-    if (ColumnNo != -1) {
-      sprintf(Buffer, "%d", ColumnNo);
-      Result += std::string(",") + Buffer;
-    }
+    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";
   }
-
-  return Result + ": " + Message;
 }
+
-- 
cgit v1.1