From 52a174fa9d0584e964cfe6222b5c61f5689e4217 Mon Sep 17 00:00:00 2001 From: Edoardo Prezioso Date: Sun, 4 Dec 2011 17:30:25 +0100 Subject: [PATCH] Remove some redundant semicolons - part 6 --- lib/tokenize.cpp | 5 +++-- test/testsimplifytokens.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp index c7711d34b..112a3f749 100644 --- a/lib/tokenize.cpp +++ b/lib/tokenize.cpp @@ -707,9 +707,10 @@ Token * Tokenizer::deleteInvalidTypedef(Token *typeDef) // remove typedef but leave ; while (typeDef->next()) { - if (level == 0 && typeDef->next()->str() == ";") + if (level == 0 && typeDef->next()->str() == ";") { + typeDef->deleteNext(); break; - else if (typeDef->next()->str() == "{") + } else if (typeDef->next()->str() == "{") ++level; else if (typeDef->next()->str() == "}") { if (!level) diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp index a6463d359..1367e2be0 100644 --- a/test/testsimplifytokens.cpp +++ b/test/testsimplifytokens.cpp @@ -5010,7 +5010,7 @@ private: const char code[] = "typedef FMAC1 void (* a) ();\n" "void *(*b) ();\n"; const std::string actual(sizeof_(code)); - ASSERT_EQUALS("; void * * b ;", actual); + ASSERT_EQUALS("void * * b ;", actual); ASSERT_EQUALS("", errout.str()); }