From 3fb420cbf080e106b3a0a8eb32b6633ccf354e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sun, 10 Jan 2010 20:03:46 +0100 Subject: [PATCH] fixed unlogged errors from the tokenizer and also some errors reported by valgrind --- lib/checkmemoryleak.cpp | 4 ++-- test/testmemleak.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp index 7cb4d0a45..4a4320ce4 100644 --- a/lib/checkmemoryleak.cpp +++ b/lib/checkmemoryleak.cpp @@ -1241,8 +1241,8 @@ void CheckMemoryLeakInFunction::simplifycode(Token *tok, bool &all) // Replace "{ }" with ";" if (Token::simpleMatch(tok2->next(), "{ }")) { - tok2->next()->str(";"); - Token::eraseTokens(tok2->next(), tok2->tokAt(3)); + tok2->eraseTokens(tok2, tok2->tokAt(3)); + tok2->insertToken(";"); done = false; } diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp index b1b7ebf8a..bb0aa7860 100644 --- a/test/testmemleak.cpp +++ b/test/testmemleak.cpp @@ -592,10 +592,10 @@ private: // switch.. ASSERT_EQUALS("; alloc ; dealloc ;", simplifycode(";alloc;switch{case;break;};dealloc;")); - ASSERT_EQUALS("; if return ; }", simplifycode("; switch { case ; return ; default ; break ; } }")); - ASSERT_EQUALS("; if return ; }", simplifycode("; switch { case ; if { return ; } break ; default ; break ; } }")); - ASSERT_EQUALS("; if return ; else use ; }", simplifycode("; switch { case ; return ; default ; use ; break ; } }")); - ASSERT_EQUALS("; use ; }", simplifycode("; while1 { loop { ; } switch { case ; dealloc ; return ; default ; break ; } } }")); + ASSERT_EQUALS("; if return ;", simplifycode("; switch { case ; return ; default ; break ; }")); + ASSERT_EQUALS("; if return ;", simplifycode("; switch { case ; if { return ; } break ; default ; break ; }")); + ASSERT_EQUALS("; if return ; else use ;", simplifycode("; switch { case ; return ; default ; use ; break ; }")); + ASSERT_EQUALS("; use ;", simplifycode("; while1 { loop { ; } switch { case ; dealloc ; return ; default ; break ; } }")); // loops.. ASSERT_EQUALS(";", simplifycode("; loop { ; }"));