From 4dcb2ef57b75551367dae82468ca974286f0f6af Mon Sep 17 00:00:00 2001 From: PKEuS Date: Mon, 16 Apr 2012 20:02:52 +0200 Subject: [PATCH] Refactorizations in test suite: - Removed again one custom stringify implementation - Avoided unnecessary std::string creation in testbufferoverrun.cpp --- test/testbufferoverrun.cpp | 4 ++-- test/testmemleak.cpp | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp index bd08ef853..9faed9af8 100644 --- a/test/testbufferoverrun.cpp +++ b/test/testbufferoverrun.cpp @@ -33,7 +33,7 @@ public: private: - void check(const char code[], bool experimental = true, const std::string &filename="test.cpp") { + void check(const char code[], bool experimental = true, const char filename[] = "test.cpp") { // Clear the error buffer.. errout.str(""); @@ -47,7 +47,7 @@ private: // Tokenize.. Tokenizer tokenizer(&settings, this); std::istringstream istr(code); - tokenizer.tokenize(istr, filename.c_str()); + tokenizer.tokenize(istr, filename); // Assign variable ids tokenizer.simplifyTokenList(); diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp index 2d15c5db7..afe6399c1 100644 --- a/test/testmemleak.cpp +++ b/test/testmemleak.cpp @@ -635,11 +635,7 @@ private: CheckMemoryLeakInFunction checkMemoryLeak(&tokenizer, &settings, NULL); checkMemoryLeak.simplifycode(tokens); - std::ostringstream ret; - for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) - ret << (tok->previous() ? " " : "") << tok->str(); - - return ret.str(); + return tokenizer.tokens()->stringifyList(0, false); }