From 0a148a9433011a04b0b9d66e8caf4ee86ca27d5d Mon Sep 17 00:00:00 2001 From: Martin Ettl Date: Mon, 1 Jun 2015 22:09:56 +0200 Subject: [PATCH] Running astyle, no functional changes. --- lib/tokenize.cpp | 16 ++++++++-------- test/testgarbage.cpp | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp index 9c4e614ef..3df1a170c 100644 --- a/lib/tokenize.cpp +++ b/lib/tokenize.cpp @@ -1490,13 +1490,13 @@ void Tokenizer::simplifyTypedef() } tok2 = copyTokens(tok2, arrayStart, arrayEnd); - if (!tok2->next()) - syntaxError(tok2); + if (!tok2->next()) + syntaxError(tok2); tok2 = tok2->next(); if (tok2->str() == "=") { - if (!tok2->next()) - syntaxError(tok2); + if (!tok2->next()) + syntaxError(tok2); if (tok2->next()->str() == "{") tok2 = tok2->next()->link()->next(); else if (tok2->next()->str().at(0) == '\"') @@ -3036,10 +3036,10 @@ bool Tokenizer::simplifySizeof() sizeOfVar[varId] = size; declTokOfVar[varId] = tok; } - if (!tok2) { - syntaxError(tok); - return false; - } + if (!tok2) { + syntaxError(tok); + return false; + } tok = tok2; } diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp index b4de88738..a9fbec8b6 100644 --- a/test/testgarbage.cpp +++ b/test/testgarbage.cpp @@ -97,8 +97,8 @@ private: TEST_CASE(garbageCode56); // #6713 TEST_CASE(garbageCode57); // #6733 TEST_CASE(garbageCode58); // #6732 - TEST_CASE(garbageCode59); // #6735 - TEST_CASE(garbageCode60); // #6736 + TEST_CASE(garbageCode59); // #6735 + TEST_CASE(garbageCode60); // #6736 TEST_CASE(garbageValueFlow); TEST_CASE(garbageSymbolDatabase); @@ -552,13 +552,13 @@ private: ASSERT_THROW(checkCode("{ }> {= ~A()^{} }P { }"), InternalError); } - void garbageCode59() { // #6735 - ASSERT_THROW(checkCode("{ { } }; char font8x8[256][8]"), InternalError); - } + void garbageCode59() { // #6735 + ASSERT_THROW(checkCode("{ { } }; char font8x8[256][8]"), InternalError); + } - void garbageCode60() { // #6736 - ASSERT_THROW(checkCode("{ } { } typedef int int_array[]; int_array &right ="), InternalError); - } + void garbageCode60() { // #6736 + ASSERT_THROW(checkCode("{ } { } typedef int int_array[]; int_array &right ="), InternalError); + } void garbageValueFlow() {