[llvm-commits] [llvm] r73842 - in /llvm/trunk: include/llvm/Support/SourceMgr.h lib/Support/SourceMgr.cpp utils/TableGen/Record.h utils/TableGen/TGLexer.cpp utils/TableGen/TGParser.h utils/TableGen/TGSourceMgr.cpp utils/TableGen/TGSourceMgr.h
Chris Lattner
sabre at nondot.org
Sat Jun 20 20:36:56 PDT 2009
Author: lattner
Date: Sat Jun 20 22:36:54 2009
New Revision: 73842
URL: http://llvm.org/viewvc/llvm-project?rev=73842&view=rev
Log:
move TGSourceMgr class out of TableGen into libsupport.
Added:
llvm/trunk/include/llvm/Support/SourceMgr.h
- copied, changed from r73828, llvm/trunk/utils/TableGen/TGSourceMgr.h
llvm/trunk/lib/Support/SourceMgr.cpp
- copied, changed from r73828, llvm/trunk/utils/TableGen/TGSourceMgr.cpp
Removed:
llvm/trunk/utils/TableGen/TGSourceMgr.cpp
llvm/trunk/utils/TableGen/TGSourceMgr.h
Modified:
llvm/trunk/utils/TableGen/Record.h
llvm/trunk/utils/TableGen/TGLexer.cpp
llvm/trunk/utils/TableGen/TGParser.h
Copied: llvm/trunk/include/llvm/Support/SourceMgr.h (from r73828, llvm/trunk/utils/TableGen/TGSourceMgr.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/SourceMgr.h?p2=llvm/trunk/include/llvm/Support/SourceMgr.h&p1=llvm/trunk/utils/TableGen/TGSourceMgr.h&r1=73828&r2=73842&rev=73842&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/TGSourceMgr.h (original)
+++ llvm/trunk/include/llvm/Support/SourceMgr.h Sat Jun 20 22:36:54 2009
@@ -1,4 +1,4 @@
-//===- TGSourceMgr.h - Manager for Source Buffers & Diagnostics -*- C++ -*-===//
+//===- SourceMgr.h - Manager for Source Buffers & Diagnostics ---*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -7,7 +7,9 @@
//
//===----------------------------------------------------------------------===//
//
-// This file declares the TGSourceMgr class.
+// This file declares the SourceMgr class. This class is used as a simple
+// substrate for diagnostics, #include handling, and other low level things for
+// simple parsers.
//
//===----------------------------------------------------------------------===//
Copied: llvm/trunk/lib/Support/SourceMgr.cpp (from r73828, llvm/trunk/utils/TableGen/TGSourceMgr.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/SourceMgr.cpp?p2=llvm/trunk/lib/Support/SourceMgr.cpp&p1=llvm/trunk/utils/TableGen/TGSourceMgr.cpp&r1=73828&r2=73842&rev=73842&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/TGSourceMgr.cpp (original)
+++ llvm/trunk/lib/Support/SourceMgr.cpp Sat Jun 20 22:36:54 2009
@@ -1,4 +1,4 @@
-//===- TGSourceMgr.cpp - Manager for Source Buffers & Diagnostics ---------===//
+//===- SourceMgr.cpp - Manager for Simple Source Buffers & Diagnostics ----===//
//
// The LLVM Compiler Infrastructure
//
@@ -7,11 +7,13 @@
//
//===----------------------------------------------------------------------===//
//
-// This file implements the TGSourceMgr class.
+// This file implements the SourceMgr class. This class is used as a simple
+// substrate for diagnostics, #include handling, and other low level things for
+// simple parsers.
//
//===----------------------------------------------------------------------===//
-#include "TGSourceMgr.h"
+#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/raw_ostream.h"
using namespace llvm;
Modified: llvm/trunk/utils/TableGen/Record.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/Record.h?rev=73842&r1=73841&r2=73842&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/Record.h (original)
+++ llvm/trunk/utils/TableGen/Record.h Sat Jun 20 22:36:54 2009
@@ -15,7 +15,7 @@
#ifndef RECORD_H
#define RECORD_H
-#include "TGSourceMgr.h"
+#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/DataTypes.h"
#include <map>
#include <ostream>
Modified: llvm/trunk/utils/TableGen/TGLexer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/TGLexer.cpp?rev=73842&r1=73841&r2=73842&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/TGLexer.cpp (original)
+++ llvm/trunk/utils/TableGen/TGLexer.cpp Sat Jun 20 22:36:54 2009
@@ -12,7 +12,7 @@
//===----------------------------------------------------------------------===//
#include "TGLexer.h"
-#include "TGSourceMgr.h"
+#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/Streams.h"
#include "llvm/Support/MemoryBuffer.h"
#include <ostream>
Modified: llvm/trunk/utils/TableGen/TGParser.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/TGParser.h?rev=73842&r1=73841&r2=73842&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/TGParser.h (original)
+++ llvm/trunk/utils/TableGen/TGParser.h Sat Jun 20 22:36:54 2009
@@ -15,7 +15,7 @@
#define TGPARSER_H
#include "TGLexer.h"
-#include "TGSourceMgr.h"
+#include "llvm/Support/SourceMgr.h"
#include <map>
namespace llvm {
Removed: llvm/trunk/utils/TableGen/TGSourceMgr.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/TGSourceMgr.cpp?rev=73841&view=auto
==============================================================================
--- llvm/trunk/utils/TableGen/TGSourceMgr.cpp (original)
+++ llvm/trunk/utils/TableGen/TGSourceMgr.cpp (removed)
@@ -1,105 +0,0 @@
-//===- TGSourceMgr.cpp - Manager for Source Buffers & Diagnostics ---------===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the TGSourceMgr class.
-//
-//===----------------------------------------------------------------------===//
-
-#include "TGSourceMgr.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/raw_ostream.h"
-using namespace llvm;
-
-TGSourceMgr::~TGSourceMgr() {
- while (!Buffers.empty()) {
- delete Buffers.back().Buffer;
- Buffers.pop_back();
- }
-}
-
-/// FindBufferContainingLoc - Return the ID of the buffer containing the
-/// specified location, returning -1 if not found.
-int TGSourceMgr::FindBufferContainingLoc(TGLoc Loc) const {
- for (unsigned i = 0, e = Buffers.size(); i != e; ++i)
- if (Loc.getPointer() >= Buffers[i].Buffer->getBufferStart() &&
- // Use <= here so that a pointer to the null at the end of the buffer
- // is included as part of the buffer.
- Loc.getPointer() <= Buffers[i].Buffer->getBufferEnd())
- return i;
- return -1;
-}
-
-/// FindLineNumber - Find the line number for the specified location in the
-/// specified file. This is not a fast method.
-unsigned TGSourceMgr::FindLineNumber(TGLoc Loc, int BufferID) const {
- if (BufferID == -1) BufferID = FindBufferContainingLoc(Loc);
- assert(BufferID != -1 && "Invalid Location!");
-
- MemoryBuffer *Buff = getBufferInfo(BufferID).Buffer;
-
- // Count the number of \n's between the start of the file and the specified
- // location.
- unsigned LineNo = 1;
-
- const char *Ptr = Buff->getBufferStart();
-
- for (; TGLoc::getFromPointer(Ptr) != Loc; ++Ptr)
- if (*Ptr == '\n') ++LineNo;
- return LineNo;
-}
-
-void TGSourceMgr::PrintIncludeStack(TGLoc IncludeLoc) const {
- if (IncludeLoc == TGLoc()) return; // Top of stack.
-
- int CurBuf = FindBufferContainingLoc(IncludeLoc);
- assert(CurBuf != -1 && "Invalid or unspecified location!");
-
- PrintIncludeStack(getBufferInfo(CurBuf).IncludeLoc);
-
- errs() << "Included from "
- << getBufferInfo(CurBuf).Buffer->getBufferIdentifier()
- << ":" << FindLineNumber(IncludeLoc, CurBuf) << ":\n";
-}
-
-
-void TGSourceMgr::PrintError(TGLoc ErrorLoc, const std::string &Msg) const {
- raw_ostream &OS = errs();
-
- // First thing to do: find the current buffer containing the specified
- // location.
- int CurBuf = FindBufferContainingLoc(ErrorLoc);
- assert(CurBuf != -1 && "Invalid or unspecified location!");
-
- PrintIncludeStack(getBufferInfo(CurBuf).IncludeLoc);
-
- MemoryBuffer *CurMB = getBufferInfo(CurBuf).Buffer;
-
-
- OS << "Parsing " << CurMB->getBufferIdentifier() << ":"
- << FindLineNumber(ErrorLoc, CurBuf) << ": ";
-
- OS << Msg << "\n";
-
- // Scan backward to find the start of the line.
- const char *LineStart = ErrorLoc.getPointer();
- while (LineStart != CurMB->getBufferStart() &&
- LineStart[-1] != '\n' && LineStart[-1] != '\r')
- --LineStart;
- // Get the end of the line.
- const char *LineEnd = ErrorLoc.getPointer();
- while (LineEnd != CurMB->getBufferEnd() &&
- LineEnd[0] != '\n' && LineEnd[0] != '\r')
- ++LineEnd;
- // Print out the line.
- OS << std::string(LineStart, LineEnd) << "\n";
- // Print out spaces before the caret.
- for (const char *Pos = LineStart; Pos != ErrorLoc.getPointer(); ++Pos)
- OS << (*Pos == '\t' ? '\t' : ' ');
- OS << "^\n";
-}
Removed: llvm/trunk/utils/TableGen/TGSourceMgr.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/TGSourceMgr.h?rev=73841&view=auto
==============================================================================
--- llvm/trunk/utils/TableGen/TGSourceMgr.h (original)
+++ llvm/trunk/utils/TableGen/TGSourceMgr.h (removed)
@@ -1,106 +0,0 @@
-//===- TGSourceMgr.h - Manager for Source Buffers & Diagnostics -*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file declares the TGSourceMgr class.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef TGSOURCEMGR_H
-#define TGSOURCEMGR_H
-
-#include <string>
-#include <vector>
-#include <cassert>
-
-namespace llvm {
- class MemoryBuffer;
- class TGSourceMgr;
-
-class TGLoc {
- const char *Ptr;
-public:
- TGLoc() : Ptr(0) {}
- TGLoc(const TGLoc &RHS) : Ptr(RHS.Ptr) {}
-
- bool operator==(const TGLoc &RHS) const { return RHS.Ptr == Ptr; }
- bool operator!=(const TGLoc &RHS) const { return RHS.Ptr != Ptr; }
-
- const char *getPointer() const { return Ptr; }
-
- static TGLoc getFromPointer(const char *Ptr) {
- TGLoc L;
- L.Ptr = Ptr;
- return L;
- }
-};
-
-/// TGSourceMgr - This owns the files read by tblgen, handles include stacks,
-/// and handles printing of diagnostics.
-class TGSourceMgr {
- struct SrcBuffer {
- /// Buffer - The memory buffer for the file.
- MemoryBuffer *Buffer;
-
- /// IncludeLoc - This is the location of the parent include, or null if at
- /// the top level.
- TGLoc IncludeLoc;
- };
-
- /// Buffers - This is all of the buffers that we are reading from.
- std::vector<SrcBuffer> Buffers;
-
- TGSourceMgr(const TGSourceMgr&); // DO NOT IMPLEMENT
- void operator=(const TGSourceMgr&); // DO NOT IMPLEMENT
-public:
- TGSourceMgr() {}
- ~TGSourceMgr();
-
- const SrcBuffer &getBufferInfo(unsigned i) const {
- assert(i < Buffers.size() && "Invalid Buffer ID!");
- return Buffers[i];
- }
-
- const MemoryBuffer *getMemoryBuffer(unsigned i) const {
- assert(i < Buffers.size() && "Invalid Buffer ID!");
- return Buffers[i].Buffer;
- }
-
- TGLoc getParentIncludeLoc(unsigned i) const {
- assert(i < Buffers.size() && "Invalid Buffer ID!");
- return Buffers[i].IncludeLoc;
- }
-
- unsigned AddNewSourceBuffer(MemoryBuffer *F, TGLoc IncludeLoc) {
- SrcBuffer NB;
- NB.Buffer = F;
- NB.IncludeLoc = IncludeLoc;
- Buffers.push_back(NB);
- return Buffers.size()-1;
- }
-
- /// FindBufferContainingLoc - Return the ID of the buffer containing the
- /// specified location, returning -1 if not found.
- int FindBufferContainingLoc(TGLoc Loc) const;
-
- /// FindLineNumber - Find the line number for the specified location in the
- /// specified file. This is not a fast method.
- unsigned FindLineNumber(TGLoc Loc, int BufferID = -1) const;
-
-
- /// PrintError - Emit an error message about the specified location with the
- /// specified string.
- void PrintError(TGLoc ErrorLoc, const std::string &Msg) const;
-
-private:
- void PrintIncludeStack(TGLoc IncludeLoc) const;
-};
-
-} // end llvm namespace
-
-#endif
More information about the llvm-commits
mailing list