diff options
Diffstat (limited to 'lib/Rewrite/TokenRewriter.cpp')
-rw-r--r-- | lib/Rewrite/TokenRewriter.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/Rewrite/TokenRewriter.cpp b/lib/Rewrite/TokenRewriter.cpp index e17e80133b..0effbb18b8 100644 --- a/lib/Rewrite/TokenRewriter.cpp +++ b/lib/Rewrite/TokenRewriter.cpp @@ -21,10 +21,10 @@ using namespace clang; TokenRewriter::TokenRewriter(FileID FID, SourceManager &SM, const LangOptions &LangOpts) { ScratchBuf.reset(new ScratchBuffer(SM)); - + // Create a lexer to lex all the tokens of the main file in raw mode. Lexer RawLex(FID, SM, LangOpts); - + // Return all comments and whitespace as tokens. RawLex.SetKeepWhitespaceMode(true); @@ -39,7 +39,7 @@ TokenRewriter::TokenRewriter(FileID FID, SourceManager &SM, Tok.setIdentifierInfo(PP.LookUpIdentifierInfo(Tok)); } #endif - + AddToken(RawTok, TokenList.end()); RawLex.LexFromRawLexer(RawTok); } @@ -53,10 +53,10 @@ TokenRewriter::~TokenRewriter() { /// TokenRefTy (a non-const iterator). TokenRewriter::TokenRefTy TokenRewriter::RemapIterator(token_iterator I) { if (I == token_end()) return TokenList.end(); - + // FIXME: This is horrible, we should use our own list or something to avoid // this. - std::map<SourceLocation, TokenRefTy>::iterator MapIt = + std::map<SourceLocation, TokenRefTy>::iterator MapIt = TokenAtLoc.find(I->getLocation()); assert(MapIt != TokenAtLoc.end() && "iterator not in rewriter?"); return MapIt->second; @@ -65,22 +65,22 @@ TokenRewriter::TokenRefTy TokenRewriter::RemapIterator(token_iterator I) { /// AddToken - Add the specified token into the Rewriter before the other /// position. -TokenRewriter::TokenRefTy +TokenRewriter::TokenRefTy TokenRewriter::AddToken(const Token &T, TokenRefTy Where) { Where = TokenList.insert(Where, T); - + bool InsertSuccess = TokenAtLoc.insert(std::make_pair(T.getLocation(), Where)).second; assert(InsertSuccess && "Token location already in rewriter!"); InsertSuccess = InsertSuccess; return Where; } - + TokenRewriter::token_iterator TokenRewriter::AddTokenBefore(token_iterator I, const char *Val) { unsigned Len = strlen(Val); - + // Plop the string into the scratch buffer, then create a token for this // string. Token Tok; @@ -88,7 +88,7 @@ TokenRewriter::AddTokenBefore(token_iterator I, const char *Val) { const char *Spelling; Tok.setLocation(ScratchBuf->getToken(Val, Len, Spelling)); Tok.setLength(Len); - + // TODO: Form a whole lexer around this and relex the token! For now, just // set kind to tok::unknown. Tok.setKind(tok::unknown); |