From 50c9050037a1388072f8efaed98e1dc8050bedb4 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 12 Oct 2008 01:15:46 +0000 Subject: Change how raw lexers are handled: instead of creating them and then using LexRawToken, create one and use LexFromRawLexer. This avoids twiddling the RawLexer flag around and simplifies some code (even speeding raw lexing up a tiny bit). This change also improves the token paster to use a Lexer on the stack instead of new/deleting it. llvm-svn: 57393 --- clang/lib/Rewrite/HTMLRewrite.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'clang/lib/Rewrite/HTMLRewrite.cpp') diff --git a/clang/lib/Rewrite/HTMLRewrite.cpp b/clang/lib/Rewrite/HTMLRewrite.cpp index b411e568f6d..67afc08b9fd 100644 --- a/clang/lib/Rewrite/HTMLRewrite.cpp +++ b/clang/lib/Rewrite/HTMLRewrite.cpp @@ -357,7 +357,7 @@ void html::SyntaxHighlight(Rewriter &R, unsigned FileID, Preprocessor &PP) { // Lex all the tokens in raw mode, to avoid entering #includes or expanding // macros. Token Tok; - L.LexRawToken(Tok); + L.LexFromRawLexer(Tok); while (Tok.isNot(tok::eof)) { // Since we are lexing unexpanded tokens, all tokens are from the main @@ -398,10 +398,10 @@ void html::SyntaxHighlight(Rewriter &R, unsigned FileID, Preprocessor &PP) { // Eat all of the tokens until we get to the next one at the start of // line. unsigned TokEnd = TokOffs+TokLen; - L.LexRawToken(Tok); + L.LexFromRawLexer(Tok); while (!Tok.isAtStartOfLine() && Tok.isNot(tok::eof)) { TokEnd = SourceMgr.getFullFilePos(Tok.getLocation())+Tok.getLength(); - L.LexRawToken(Tok); + L.LexFromRawLexer(Tok); } // Find end of line. This is a hack. @@ -413,7 +413,7 @@ void html::SyntaxHighlight(Rewriter &R, unsigned FileID, Preprocessor &PP) { } } - L.LexRawToken(Tok); + L.LexFromRawLexer(Tok); } } -- cgit v1.2.3