projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add asm parsing support w/ testcases for strex/ldrex family of instructions
[oota-llvm.git]
/
utils
/
TableGen
/
TGLexer.h
diff --git
a/utils/TableGen/TGLexer.h
b/utils/TableGen/TGLexer.h
index 82f312a3388e260433c96971064e1c5ecd374e42..8859479874020dfa75c1a1695150ddeb9caa8023 100644
(file)
--- a/
utils/TableGen/TGLexer.h
+++ b/
utils/TableGen/TGLexer.h
@@
-17,14
+17,14
@@
#include "llvm/Support/DataTypes.h"
#include <vector>
#include <string>
#include "llvm/Support/DataTypes.h"
#include <vector>
#include <string>
-#include <iosfwd>
#include <cassert>
namespace llvm {
class MemoryBuffer;
#include <cassert>
namespace llvm {
class MemoryBuffer;
-class
TG
SourceMgr;
+class SourceMgr;
class SMLoc;
class SMLoc;
-
+class Twine;
+
namespace tgtok {
enum TokKind {
// Markers
namespace tgtok {
enum TokKind {
// Markers
@@
-36,7
+36,7
@@
namespace tgtok {
l_brace, r_brace, // { }
l_paren, r_paren, // ( )
less, greater, // < >
l_brace, r_brace, // { }
l_paren, r_paren, // ( )
less, greater, // < >
- colon, semi, //
; :
+ colon, semi, //
: ;
comma, period, // , .
equal, question, // = ?
comma, period, // , .
equal, question, // = ?
@@
-45,8
+45,8
@@
namespace tgtok {
MultiClass, String,
// !keywords.
MultiClass, String,
// !keywords.
- XConcat, XSRA, XSRL, XSHL, XStrConcat, X
NameConcat, X
Cast, XSubst,
- XForEach, X
Car, XCdr, XNull, XIf
,
+ XConcat, XSRA, XSRL, XSHL, XStrConcat, XCast, XSubst,
+ XForEach, X
Head, XTail, XEmpty, XIf, XEq
,
// Integer value.
IntVal,
// Integer value.
IntVal,
@@
-58,7
+58,7
@@
namespace tgtok {
/// TGLexer - TableGen Lexer class.
class TGLexer {
/// TGLexer - TableGen Lexer class.
class TGLexer {
-
TG
SourceMgr &SrcMgr;
+ SourceMgr &SrcMgr;
const char *CurPtr;
const MemoryBuffer *CurBuf;
const char *CurPtr;
const MemoryBuffer *CurBuf;
@@
-73,17
+73,10
@@
class TGLexer {
/// by the SourceMgr object.
int CurBuffer;
/// by the SourceMgr object.
int CurBuffer;
- // IncludeDirectories - This is the list of directories we should search for
- // include files in.
- std::vector<std::string> IncludeDirectories;
public:
public:
- TGLexer(
TG
SourceMgr &SrcMgr);
+ TGLexer(SourceMgr &SrcMgr);
~TGLexer() {}
~TGLexer() {}
- void setIncludeDirs(const std::vector<std::string> &Dirs) {
- IncludeDirectories = Dirs;
- }
-
tgtok::TokKind Lex() {
return CurCode = LexToken();
}
tgtok::TokKind Lex() {
return CurCode = LexToken();
}
@@
-103,14
+96,14
@@
public:
SMLoc getLoc() const;
SMLoc getLoc() const;
- void PrintError(const char *Loc, const
std::string
&Msg) const;
- void PrintError(SMLoc Loc, const
std::string
&Msg) const;
+ void PrintError(const char *Loc, const
Twine
&Msg) const;
+ void PrintError(SMLoc Loc, const
Twine
&Msg) const;
private:
/// LexToken - Read the next token and return its code.
tgtok::TokKind LexToken();
private:
/// LexToken - Read the next token and return its code.
tgtok::TokKind LexToken();
- tgtok::TokKind ReturnError(const char *Loc, const
std::string
&Msg);
+ tgtok::TokKind ReturnError(const char *Loc, const
Twine
&Msg);
int getNextChar();
void SkipBCPLComment();
int getNextChar();
void SkipBCPLComment();