From 1f50dc899fc5521341462c15c36cc4c2055ca78c Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Thu, 27 Nov 2008 00:38:24 +0000 Subject: PTHLexer now owns the Token vector. llvm-svn: 60136 --- clang/lib/Lex/PTHLexer.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'clang/lib/Lex/PTHLexer.cpp') diff --git a/clang/lib/Lex/PTHLexer.cpp b/clang/lib/Lex/PTHLexer.cpp index 21fb9831a4e..bc9e7147766 100644 --- a/clang/lib/Lex/PTHLexer.cpp +++ b/clang/lib/Lex/PTHLexer.cpp @@ -16,16 +16,8 @@ #include "clang/Basic/TokenKinds.h" using namespace clang; -PTHLexer::PTHLexer(Preprocessor& pp, SourceLocation fileloc, - const Token *TokArray, unsigned NumTokens) - : PreprocessorLexer(&pp, fileloc), - Tokens(TokArray), - LastTokenIdx(NumTokens - 1), - CurTokenIdx(0) { - - assert(NumTokens >= 1); - assert(Tokens[LastTokenIdx].is(tok::eof)); -} +PTHLexer::PTHLexer(Preprocessor& pp, SourceLocation fileloc) + : PreprocessorLexer(&pp, fileloc), CurTokenIdx(0) {} Token PTHLexer::GetToken() { Token Tok = Tokens[CurTokenIdx]; @@ -104,7 +96,8 @@ bool PTHLexer::LexEndOfFile(Token &Tok) { } void PTHLexer::setEOF(Token& Tok) { - Tok = Tokens[LastTokenIdx]; + assert(!Tokens.empty()); + Tok = Tokens[Tokens.size()-1]; } void PTHLexer::DiscardToEndOfLine() { -- cgit v1.2.3