replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename some variables, only set a tokens identifierinfo if non-null. 

llvm-svn: 62450
This commit is contained in:
Chris Lattner 2009-01-18 02:34:01 +00:00
parent da4df2928c
commit 18fc6ceb56
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
clang/lib/Lex/PTHLexer.cpp
View File

@ -107,9 +107,9 @@ LexNextToken:
const unsigned char *CurPtrShadow = CurPtr; const unsigned char *CurPtrShadow = CurPtr;
// Read in the data for the token. // Read in the data for the token.
tok::TokenKind k = (tok::TokenKind) Read8(CurPtrShadow); tok::TokenKind TKind = (tok::TokenKind) Read8(CurPtrShadow);
Token::TokenFlags flags = (Token::TokenFlags) Read8(CurPtrShadow); Token::TokenFlags TFlags = (Token::TokenFlags) Read8(CurPtrShadow);
uint32_t perID = Read24(CurPtrShadow); uint32_t IdentifierID = Read24(CurPtrShadow);
uint32_t FileOffset = Read32(CurPtrShadow); uint32_t FileOffset = Read32(CurPtrShadow);
uint32_t Len = Read16(CurPtrShadow); uint32_t Len = Read16(CurPtrShadow);
CurPtr = CurPtrShadow; CurPtr = CurPtrShadow;
@ -119,10 +119,11 @@ LexNextToken:
//===--------------------------------------==// //===--------------------------------------==//
Tok.startToken(); Tok.startToken();
Tok.setKind(k); Tok.setKind(TKind);
Tok.setFlag(flags); Tok.setFlag(TFlags);
assert(!LexingRawMode); assert(!LexingRawMode);
Tok.setIdentifierInfo(perID ? PTHMgr.GetIdentifierInfo(perID-1) : 0); if (IdentifierID)
Tok.setIdentifierInfo(PTHMgr.GetIdentifierInfo(IdentifierID-1));
Tok.setLocation(FileStartLoc.getFileLocWithOffset(FileOffset)); Tok.setLocation(FileStartLoc.getFileLocWithOffset(FileOffset));
Tok.setLength(Len); Tok.setLength(Len);
@ -137,12 +138,12 @@ LexNextToken:
<< '\n'; << '\n';
#endif #endif
if (k == tok::identifier) { if (TKind == tok::identifier) {
MIOpt.ReadToken(); MIOpt.ReadToken();
return PP->HandleIdentifier(Tok); return PP->HandleIdentifier(Tok);
} }
if (k == tok::eof) { if (TKind == tok::eof) {
// Save the end-of-file token. // Save the end-of-file token.
EofToken = Tok; EofToken = Tok;
@ -159,7 +160,7 @@ LexNextToken:
return PPCache->Lex(Tok); return PPCache->Lex(Tok);
} }
if (k == tok::hash && Tok.isAtStartOfLine()) { if (TKind == tok::hash && Tok.isAtStartOfLine()) {
LastHashTokPtr = CurPtr - DISK_TOKEN_SIZE; LastHashTokPtr = CurPtr - DISK_TOKEN_SIZE;
assert(!LexingRawMode); assert(!LexingRawMode);
PP->HandleDirective(Tok); PP->HandleDirective(Tok);
@ -170,7 +171,7 @@ LexNextToken:
return PP->Lex(Tok); return PP->Lex(Tok);
} }
if (k == tok::eom) { if (TKind == tok::eom) {
assert(ParsingPreprocessorDirective); assert(ParsingPreprocessorDirective);
ParsingPreprocessorDirective = false; ParsingPreprocessorDirective = false;
return; return;