Merge pull request #1753 from masatake/cxx--use-cxxTokenChainDestroyL…

…ast-macro Cxx,refactor: use cxxTokenChainDestroyLast more
universal-ctags · Jun 3, 2018 · 7e087c5 · 7e087c5
2 parents 6f7654b + 1ac9cc3
commit 7e087c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/parsers/cxx/cxx_parser.c b/parsers/cxx/cxx_parser.c
@@ -131,7 +131,7 @@ bool cxxParserParseAndCondenseCurrentSubchain(
 			);
 
 		while(g_cxx.pTokenChain->iCount > 1)
-			cxxTokenDestroy(cxxTokenChainTakeLast(g_cxx.pTokenChain));
+			cxxTokenChainDestroyLast(g_cxx.pTokenChain);
 
 		// Fake the terminator
 		CXXToken * pFakeLast = cxxTokenCreate();

diff --git a/parsers/cxx/cxx_parser_tokenizer.c b/parsers/cxx/cxx_parser_tokenizer.c
@@ -889,7 +889,7 @@ static bool cxxParserParseNextTokenCondenseAttribute(void)
 		);
 
 	// Kill it
-	cxxTokenDestroy(cxxTokenChainTakeLast(g_cxx.pTokenChain));
+	cxxTokenChainDestroyLast(g_cxx.pTokenChain);
 
 	// And go ahead.
 
@@ -925,7 +925,7 @@ static bool cxxParserParseNextTokenCondenseAttribute(void)
 		// will report it.
 
 		// Kill the token chain
-		cxxTokenDestroy(cxxTokenChainTakeLast(g_cxx.pTokenChain));
+		cxxTokenChainDestroyLast(g_cxx.pTokenChain);
 
 		return cxxParserParseNextToken();
 	}
@@ -977,7 +977,7 @@ static bool cxxParserParseNextTokenCondenseAttribute(void)
 	}
 
 	// Now just kill the chain.
-	cxxTokenDestroy(cxxTokenChainTakeLast(g_cxx.pTokenChain));
+	cxxTokenChainDestroyLast(g_cxx.pTokenChain);
 
 	// And finally extract yet another token.
 	CXX_DEBUG_LEAVE();