[cfe-commits] r48073 - in /cfe/trunk: Lex/Directives.cpp Lex/Preprocessor.cpp include/clang/Lex/Preprocessor.h
Chris Lattner
sabre at nondot.org
Sat Mar 8 18:26:04 PST 2008
Author: lattner
Date: Sat Mar 8 20:26:03 2008
New Revision: 48073
URL: http://llvm.org/viewvc/llvm-project?rev=48073&view=rev
Log:
rename some MacroExpander-related ivars to TokenLexer.
Modified:
cfe/trunk/Lex/Directives.cpp
cfe/trunk/Lex/Preprocessor.cpp
cfe/trunk/include/clang/Lex/Preprocessor.h
Modified: cfe/trunk/Lex/Directives.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Lex/Directives.cpp?rev=48073&r1=48072&r2=48073&view=diff
==============================================================================
--- cfe/trunk/Lex/Directives.cpp (original)
+++ cfe/trunk/Lex/Directives.cpp Sat Mar 8 20:26:03 2008
@@ -116,7 +116,7 @@
bool FoundNonSkipPortion,
bool FoundElse) {
++NumSkipped;
- assert(CurMacroExpander == 0 && CurLexer &&
+ assert(CurTokenLexer == 0 && CurLexer &&
"Lexing a macro, not a file?");
CurLexer->pushConditionalLevel(IfTokenLoc, /*isSkipping*/false,
Modified: cfe/trunk/Lex/Preprocessor.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Lex/Preprocessor.cpp?rev=48073&r1=48072&r2=48073&view=diff
==============================================================================
--- cfe/trunk/Lex/Preprocessor.cpp (original)
+++ cfe/trunk/Lex/Preprocessor.cpp Sat Mar 8 20:26:03 2008
@@ -48,7 +48,7 @@
HeaderSearch &Headers)
: Diags(diags), Features(opts), Target(target), FileMgr(Headers.getFileMgr()),
SourceMgr(SM), HeaderInfo(Headers), Identifiers(opts),
- CurLexer(0), CurDirLookup(0), CurMacroExpander(0), Callbacks(0) {
+ CurLexer(0), CurDirLookup(0), CurTokenLexer(0), Callbacks(0) {
ScratchBuf = new ScratchBuffer(SourceMgr);
// Clear stats.
@@ -67,7 +67,7 @@
// Macro expansion is enabled.
DisableMacroExpansion = false;
InMacroArgs = false;
- NumCachedMacroExpanders = 0;
+ NumCachedTokenLexers = 0;
// "Poison" __VA_ARGS__, which can only appear in the expansion of a macro.
// This gets unpoisoned where it is allowed.
@@ -89,7 +89,7 @@
while (!IncludeMacroStack.empty()) {
delete IncludeMacroStack.back().TheLexer;
- delete IncludeMacroStack.back().TheMacroExpander;
+ delete IncludeMacroStack.back().TheTokenLexer;
IncludeMacroStack.pop_back();
}
@@ -103,8 +103,8 @@
}
// Free any cached macro expanders.
- for (unsigned i = 0, e = NumCachedMacroExpanders; i != e; ++i)
- delete MacroExpanderCache[i];
+ for (unsigned i = 0, e = NumCachedTokenLexers; i != e; ++i)
+ delete TokenLexerCache[i];
// Release pragma information.
delete PragmaHandlers;
@@ -571,7 +571,7 @@
/// on failure.
void Preprocessor::EnterSourceFile(unsigned FileID,
const DirectoryLookup *CurDir) {
- assert(CurMacroExpander == 0 && "Cannot #include a file inside a macro!");
+ assert(CurTokenLexer == 0 && "Cannot #include a file inside a macro!");
++NumEnteredSourceFiles;
if (MaxIncludeStackDepth < IncludeMacroStack.size())
@@ -587,13 +587,13 @@
const DirectoryLookup *CurDir) {
// Add the current lexer to the include stack.
- if (CurLexer || CurMacroExpander)
+ if (CurLexer || CurTokenLexer)
IncludeMacroStack.push_back(IncludeStackInfo(CurLexer, CurDirLookup,
- CurMacroExpander));
+ CurTokenLexer));
CurLexer = TheLexer;
CurDirLookup = CurDir;
- CurMacroExpander = 0;
+ CurTokenLexer = 0;
// Notify the client, if desired, that we are in a new source file.
if (Callbacks && !CurLexer->Is_PragmaLexer) {
@@ -615,15 +615,15 @@
/// tokens from it instead of the current buffer.
void Preprocessor::EnterMacro(Token &Tok, MacroArgs *Args) {
IncludeMacroStack.push_back(IncludeStackInfo(CurLexer, CurDirLookup,
- CurMacroExpander));
+ CurTokenLexer));
CurLexer = 0;
CurDirLookup = 0;
- if (NumCachedMacroExpanders == 0) {
- CurMacroExpander = new TokenLexer(Tok, Args, *this);
+ if (NumCachedTokenLexers == 0) {
+ CurTokenLexer = new TokenLexer(Tok, Args, *this);
} else {
- CurMacroExpander = MacroExpanderCache[--NumCachedMacroExpanders];
- CurMacroExpander->Init(Tok, Args);
+ CurTokenLexer = TokenLexerCache[--NumCachedTokenLexers];
+ CurTokenLexer->Init(Tok, Args);
}
}
@@ -635,16 +635,16 @@
void Preprocessor::EnterTokenStream(const Token *Toks, unsigned NumToks) {
// Save our current state.
IncludeMacroStack.push_back(IncludeStackInfo(CurLexer, CurDirLookup,
- CurMacroExpander));
+ CurTokenLexer));
CurLexer = 0;
CurDirLookup = 0;
// Create a macro expander to expand from the specified token stream.
- if (NumCachedMacroExpanders == 0) {
- CurMacroExpander = new TokenLexer(Toks, NumToks, *this);
+ if (NumCachedTokenLexers == 0) {
+ CurTokenLexer = new TokenLexer(Toks, NumToks, *this);
} else {
- CurMacroExpander = MacroExpanderCache[--NumCachedMacroExpanders];
- CurMacroExpander->Init(Toks, NumToks);
+ CurTokenLexer = TokenLexerCache[--NumCachedTokenLexers];
+ CurTokenLexer->Init(Toks, NumToks);
}
}
@@ -654,18 +654,18 @@
void Preprocessor::RemoveTopOfLexerStack() {
assert(!IncludeMacroStack.empty() && "Ran out of stack entries to load");
- if (CurMacroExpander) {
+ if (CurTokenLexer) {
// Delete or cache the now-dead macro expander.
- if (NumCachedMacroExpanders == MacroExpanderCacheSize)
- delete CurMacroExpander;
+ if (NumCachedTokenLexers == TokenLexerCacheSize)
+ delete CurTokenLexer;
else
- MacroExpanderCache[NumCachedMacroExpanders++] = CurMacroExpander;
+ TokenLexerCache[NumCachedTokenLexers++] = CurTokenLexer;
} else {
delete CurLexer;
}
- CurLexer = IncludeMacroStack.back().TheLexer;
- CurDirLookup = IncludeMacroStack.back().TheDirLookup;
- CurMacroExpander = IncludeMacroStack.back().TheMacroExpander;
+ CurLexer = IncludeMacroStack.back().TheLexer;
+ CurDirLookup = IncludeMacroStack.back().TheDirLookup;
+ CurTokenLexer = IncludeMacroStack.back().TheTokenLexer;
IncludeMacroStack.pop_back();
}
@@ -757,7 +757,7 @@
if (CurLexer)
Val = CurLexer->isNextPPTokenLParen();
else
- Val = CurMacroExpander->isNextTokenLParen();
+ Val = CurTokenLexer->isNextTokenLParen();
if (Val == 2) {
// We have run off the end. If it's a source file we don't
@@ -770,7 +770,7 @@
if (Entry.TheLexer)
Val = Entry.TheLexer->isNextPPTokenLParen();
else
- Val = Entry.TheMacroExpander->isNextTokenLParen();
+ Val = Entry.TheTokenLexer->isNextTokenLParen();
if (Val != 2)
break;
@@ -1258,7 +1258,7 @@
/// the current file. This either returns the EOF token or pops a level off
/// the include stack and keeps going.
bool Preprocessor::HandleEndOfFile(Token &Result, bool isEndOfMacro) {
- assert(!CurMacroExpander &&
+ assert(!CurTokenLexer &&
"Ending a file when currently in a macro!");
// See if this file had a controlling macro.
@@ -1335,17 +1335,17 @@
/// HandleEndOfMacro - This callback is invoked when the lexer hits the end of
/// the current macro expansion or token stream expansion.
bool Preprocessor::HandleEndOfMacro(Token &Result) {
- assert(CurMacroExpander && !CurLexer &&
+ assert(CurTokenLexer && !CurLexer &&
"Ending a macro when currently in a #include file!");
// Delete or cache the now-dead macro expander.
- if (NumCachedMacroExpanders == MacroExpanderCacheSize)
- delete CurMacroExpander;
+ if (NumCachedTokenLexers == TokenLexerCacheSize)
+ delete CurTokenLexer;
else
- MacroExpanderCache[NumCachedMacroExpanders++] = CurMacroExpander;
+ TokenLexerCache[NumCachedTokenLexers++] = CurTokenLexer;
// Handle this like a #include file being popped off the stack.
- CurMacroExpander = 0;
+ CurTokenLexer = 0;
return HandleEndOfFile(Result, true);
}
@@ -1353,7 +1353,7 @@
/// comment (/##/) in microsoft mode, this method handles updating the current
/// state, returning the token on the next source line.
void Preprocessor::HandleMicrosoftCommentPaste(Token &Tok) {
- assert(CurMacroExpander && !CurLexer &&
+ assert(CurTokenLexer && !CurLexer &&
"Pasted comment can only be formed from macro");
// We handle this by scanning for the closest real lexer, switching it to
Modified: cfe/trunk/include/clang/Lex/Preprocessor.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Lex/Preprocessor.h?rev=48073&r1=48072&r2=48073&view=diff
==============================================================================
--- cfe/trunk/include/clang/Lex/Preprocessor.h (original)
+++ cfe/trunk/include/clang/Lex/Preprocessor.h Sat Mar 8 20:26:03 2008
@@ -88,7 +88,7 @@
PragmaNamespace *PragmaHandlers;
/// CurLexer - This is the current top of the stack that we're lexing from if
- /// not expanding a macro. One of CurLexer and CurMacroExpander must be null.
+ /// not expanding a macro. One of CurLexer and CurTokenLexer must be null.
Lexer *CurLexer;
/// CurLookup - The DirectoryLookup structure used to find the current
@@ -96,19 +96,19 @@
/// implement #include_next and find directory-specific properties.
const DirectoryLookup *CurDirLookup;
- /// CurMacroExpander - This is the current macro we are expanding, if we are
- /// expanding a macro. One of CurLexer and CurMacroExpander must be null.
- TokenLexer *CurMacroExpander;
+ /// CurTokenLexer - This is the current macro we are expanding, if we are
+ /// expanding a macro. One of CurLexer and CurTokenLexer must be null.
+ TokenLexer *CurTokenLexer;
/// IncludeMacroStack - This keeps track of the stack of files currently
/// #included, and macros currently being expanded from, not counting
- /// CurLexer/CurMacroExpander.
+ /// CurLexer/CurTokenLexer.
struct IncludeStackInfo {
Lexer *TheLexer;
const DirectoryLookup *TheDirLookup;
- TokenLexer *TheMacroExpander;
+ TokenLexer *TheTokenLexer;
IncludeStackInfo(Lexer *L, const DirectoryLookup *D, TokenLexer *TL)
- : TheLexer(L), TheDirLookup(D), TheMacroExpander(TL) {
+ : TheLexer(L), TheDirLookup(D), TheTokenLexer(TL) {
}
};
std::vector<IncludeStackInfo> IncludeMacroStack;
@@ -133,10 +133,10 @@
/// preprocessor should use from the command line etc.
const char *Predefines;
- /// MacroExpanderCache - Cache macro expanders to reduce malloc traffic.
- enum { MacroExpanderCacheSize = 8 };
- unsigned NumCachedMacroExpanders;
- TokenLexer *MacroExpanderCache[MacroExpanderCacheSize];
+ /// TokenLexerCache - Cache macro expanders to reduce malloc traffic.
+ enum { TokenLexerCacheSize = 8 };
+ unsigned NumCachedTokenLexers;
+ TokenLexer *TokenLexerCache[TokenLexerCacheSize];
public:
Preprocessor(Diagnostic &diags, const LangOptions &opts, TargetInfo &target,
SourceManager &SM, HeaderSearch &Headers);
@@ -247,7 +247,7 @@
if (CurLexer)
CurLexer->Lex(Result);
else
- CurMacroExpander->Lex(Result);
+ CurTokenLexer->Lex(Result);
}
/// LexNonComment - Lex a token. If it's a comment, keep lexing until we get
More information about the cfe-commits
mailing list