From df5adc5f4fe1f36cda9fe887cb6bc5a688fbbaff Mon Sep 17 00:00:00 2001 From: Reijo Tomperi Date: Mon, 19 Jan 2009 21:45:59 +0000 Subject: [PATCH] Added test case preprocessor_doublesharp, executed ./runastyle for errormessage.h --- src/errormessage.h | 716 +++++++++++++++++++------------------- test/testpreprocessor.cpp | 18 + 2 files changed, 376 insertions(+), 358 deletions(-) diff --git a/src/errormessage.h b/src/errormessage.h index bb3870bc9..68bf8df04 100644 --- a/src/errormessage.h +++ b/src/errormessage.h @@ -1,358 +1,358 @@ -/* - * cppcheck - c/c++ syntax checking - * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see -#include "settings.h" -class Token; -class Tokenizer; -class ErrorMessage -{ -private: - ErrorMessage() { } - static std::string msg1(const Tokenizer *tokenizer, const Token *Location); -public: - static std::string arrayIndexOutOfBounds(const Tokenizer *tokenizer, const Token *Location) - { - return msg1(tokenizer, Location) + "Array index out of bounds"; - } - static bool arrayIndexOutOfBounds(const Settings &s) - { - return s._showAll; - } - - static std::string bufferOverrun(const Tokenizer *tokenizer, const Token *Location) - { - return msg1(tokenizer, Location) + "Buffer overrun"; - } - static bool bufferOverrun(const Settings &s) - { - return s._showAll; - } - - static std::string outOfBounds(const Tokenizer *tokenizer, const Token *Location, const std::string &what) - { - return msg1(tokenizer, Location) + "" + what + " is out of bounds"; - } - static bool outOfBounds() - { - return true; - } - - static std::string noConstructor(const Tokenizer *tokenizer, const Token *Location, const std::string &classname) - { - return msg1(tokenizer, Location) + "The class '" + classname + "' has no constructor"; - } - static bool noConstructor(const Settings &s) - { - return s._checkCodingStyle; - } - - static std::string uninitVar(const Tokenizer *tokenizer, const Token *Location, const std::string &classname, const std::string &varname) - { - return msg1(tokenizer, Location) + "Uninitialized member variable '" + classname + "::" + varname + "'"; - } - static bool uninitVar() - { - return true; - } - - static std::string unusedPrivateFunction(const Tokenizer *tokenizer, const Token *Location, const std::string &classname, const std::string &funcname) - { - return msg1(tokenizer, Location) + "Unused private function '" + classname + "::" + funcname + "'"; - } - static bool unusedPrivateFunction(const Settings &s) - { - return s._checkCodingStyle; - } - - static std::string memsetClass(const Tokenizer *tokenizer, const Token *Location, const std::string &memfunc) - { - return msg1(tokenizer, Location) + "Using '" + memfunc + "' on class"; - } - static bool memsetClass() - { - return true; - } - - static std::string memsetStruct(const Tokenizer *tokenizer, const Token *Location, const std::string &memfunc, const std::string &classname) - { - return msg1(tokenizer, Location) + "Using '" + memfunc + "' on struct that contains a 'std::" + classname + "'"; - } - static bool memsetStruct() - { - return true; - } - - static std::string operatorEq(const Tokenizer *tokenizer, const Token *Location) - { - return msg1(tokenizer, Location) + "'operator=' should return something"; - } - static bool operatorEq(const Settings &s) - { - return s._checkCodingStyle; - } - - static std::string virtualDestructor(const Tokenizer *tokenizer, const Token *Location, const std::string &Base, const std::string &Derived) - { - return msg1(tokenizer, Location) + "Class " + Base + " which is inherited by class " + Derived + " does not have a virtual destructor"; - } - static bool virtualDestructor() - { - return true; - } - - static std::string unusedFunction(const std::string &filename, const std::string &funcname) - { - return "[" + filename + "]: The function '" + funcname + "' is never used"; - } - static bool unusedFunction(const Settings &s) - { - return s._showAll & s._checkCodingStyle; - } - - static std::string mismatchAllocDealloc(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) - { - return msg1(tokenizer, Location) + "Mismatching allocation and deallocation: " + varname + ""; - } - static bool mismatchAllocDealloc() - { - return true; - } - - static std::string memleak(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) - { - return msg1(tokenizer, Location) + "Memory leak: " + varname + ""; - } - static bool memleak() - { - return true; - } - - static std::string resourceLeak(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) - { - return msg1(tokenizer, Location) + "Resource leak: " + varname + ""; - } - static bool resourceLeak() - { - return true; - } - - static std::string deallocDealloc(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) - { - return msg1(tokenizer, Location) + "Deallocating a deallocated pointer: " + varname + ""; - } - static bool deallocDealloc() - { - return true; - } - - static std::string cstyleCast(const Tokenizer *tokenizer, const Token *Location) - { - return msg1(tokenizer, Location) + "C-style pointer casting"; - } - static bool cstyleCast(const Settings &s) - { - return s._checkCodingStyle; - } - - static std::string redundantIfDelete0(const Tokenizer *tokenizer, const Token *Location) - { - return msg1(tokenizer, Location) + "Redundant condition. It is safe to deallocate a NULL pointer"; - } - static bool redundantIfDelete0(const Settings &s) - { - return s._checkCodingStyle; - } - - static std::string redundantIfRemove(const Tokenizer *tokenizer, const Token *Location) - { - return msg1(tokenizer, Location) + "Redundant condition. The remove function in the STL will not do anything if element doesn't exist"; - } - static bool redundantIfRemove(const Settings &s) - { - return s._checkCodingStyle; - } - - static std::string dangerousUsageStrtol(const Tokenizer *tokenizer, const Token *Location) - { - return msg1(tokenizer, Location) + "Invalid radix in call to strtol or strtoul. Must be 0 or 2-36"; - } - static bool dangerousUsageStrtol() - { - return true; - } - - static std::string ifNoAction(const Tokenizer *tokenizer, const Token *Location) - { - return msg1(tokenizer, Location) + "Found redundant if condition - 'if (condition);'"; - } - static bool ifNoAction(const Settings &s) - { - return s._checkCodingStyle; - } - - static std::string sprintfOverlappingData(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) - { - return msg1(tokenizer, Location) + "Overlapping data buffer " + varname + ""; - } - static bool sprintfOverlappingData() - { - return true; - } - - static std::string udivError(const Tokenizer *tokenizer, const Token *Location) - { - return msg1(tokenizer, Location) + "Unsigned division. The result will be wrong."; - } - static bool udivError() - { - return true; - } - - static std::string udivWarning(const Tokenizer *tokenizer, const Token *Location) - { - return msg1(tokenizer, Location) + "Warning: Division with signed and unsigned operators"; - } - static bool udivWarning(const Settings &s) - { - return s._showAll & s._checkCodingStyle; - } - - static std::string unusedStructMember(const Tokenizer *tokenizer, const Token *Location, const std::string &structname, const std::string &varname) - { - return msg1(tokenizer, Location) + "struct or union member '" + structname + "::" + varname + "' is never used"; - } - static bool unusedStructMember(const Settings &s) - { - return s._checkCodingStyle; - } - - static std::string unreachableCode(const Tokenizer *tokenizer, const Token *Location) - { - return msg1(tokenizer, Location) + "Unreachable code below a 'return'"; - } - static bool unreachableCode() - { - return true; - } - - static std::string passedByValue(const Tokenizer *tokenizer, const Token *Location, const std::string &parname) - { - return msg1(tokenizer, Location) + "Function parameter '" + parname + "' is passed by value. It could be passed by reference instead."; - } - static bool passedByValue() - { - return true; - } - - static std::string unusedVariable(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) - { - return msg1(tokenizer, Location) + "Unused variable '" + varname + "'"; - } - static bool unusedVariable(const Settings &s) - { - return s._checkCodingStyle; - } - - static std::string unreadVariable(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) - { - return msg1(tokenizer, Location) + "Variable '" + varname + "' is assigned a value that is never used"; - } - static bool unreadVariable(const Settings &s) - { - return s._checkCodingStyle; - } - - static std::string unassignedVariable(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) - { - return msg1(tokenizer, Location) + "Variable '" + varname + "' is not assigned a value"; - } - static bool unassignedVariable(const Settings &s) - { - return s._checkCodingStyle; - } - - static std::string constStatement(const Tokenizer *tokenizer, const Token *Location, const std::string &type) - { - return msg1(tokenizer, Location) + "Redundant code: Found a statement that begins with " + type + " constant"; - } - static bool constStatement(const Settings &s) - { - return s._checkCodingStyle; - } - - static std::string charArrayIndex(const Tokenizer *tokenizer, const Token *Location) - { - return msg1(tokenizer, Location) + "Warning - using char variable as array index"; - } - static bool charArrayIndex(const Settings &s) - { - return s._checkCodingStyle; - } - - static std::string charBitOp(const Tokenizer *tokenizer, const Token *Location) - { - return msg1(tokenizer, Location) + "Warning - using char variable in bit operation"; - } - static bool charBitOp(const Settings &s) - { - return s._checkCodingStyle; - } - - static std::string variableScope(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) - { - return msg1(tokenizer, Location) + "The scope of the variable " + varname + " can be limited"; - } - static bool variableScope() - { - return false; - } - - static std::string ifAssignment(const Tokenizer *tokenizer, const Token *Location) - { - return msg1(tokenizer, Location) + "Assignment in if-condition"; - } - static bool ifAssignment(const Settings &s) - { - return s._checkCodingStyle; - } - - static std::string conditionAlwaysTrueFalse(const Tokenizer *tokenizer, const Token *Location, const std::string &truefalse) - { - return msg1(tokenizer, Location) + "Condition is always " + truefalse + ""; - } - static bool conditionAlwaysTrueFalse(const Settings &s) - { - return s._checkCodingStyle; - } - - static std::string strPlusChar(const Tokenizer *tokenizer, const Token *Location) - { - return msg1(tokenizer, Location) + "Unusual pointer arithmetic"; - } - static bool strPlusChar() - { - return true; - } - -}; -#endif +/* + * cppcheck - c/c++ syntax checking + * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see +#include "settings.h" +class Token; +class Tokenizer; +class ErrorMessage +{ +private: + ErrorMessage() { } + static std::string msg1(const Tokenizer *tokenizer, const Token *Location); +public: + static std::string arrayIndexOutOfBounds(const Tokenizer *tokenizer, const Token *Location) + { + return msg1(tokenizer, Location) + "Array index out of bounds"; + } + static bool arrayIndexOutOfBounds(const Settings &s) + { + return s._showAll; + } + + static std::string bufferOverrun(const Tokenizer *tokenizer, const Token *Location) + { + return msg1(tokenizer, Location) + "Buffer overrun"; + } + static bool bufferOverrun(const Settings &s) + { + return s._showAll; + } + + static std::string outOfBounds(const Tokenizer *tokenizer, const Token *Location, const std::string &what) + { + return msg1(tokenizer, Location) + "" + what + " is out of bounds"; + } + static bool outOfBounds() + { + return true; + } + + static std::string noConstructor(const Tokenizer *tokenizer, const Token *Location, const std::string &classname) + { + return msg1(tokenizer, Location) + "The class '" + classname + "' has no constructor"; + } + static bool noConstructor(const Settings &s) + { + return s._checkCodingStyle; + } + + static std::string uninitVar(const Tokenizer *tokenizer, const Token *Location, const std::string &classname, const std::string &varname) + { + return msg1(tokenizer, Location) + "Uninitialized member variable '" + classname + "::" + varname + "'"; + } + static bool uninitVar() + { + return true; + } + + static std::string unusedPrivateFunction(const Tokenizer *tokenizer, const Token *Location, const std::string &classname, const std::string &funcname) + { + return msg1(tokenizer, Location) + "Unused private function '" + classname + "::" + funcname + "'"; + } + static bool unusedPrivateFunction(const Settings &s) + { + return s._checkCodingStyle; + } + + static std::string memsetClass(const Tokenizer *tokenizer, const Token *Location, const std::string &memfunc) + { + return msg1(tokenizer, Location) + "Using '" + memfunc + "' on class"; + } + static bool memsetClass() + { + return true; + } + + static std::string memsetStruct(const Tokenizer *tokenizer, const Token *Location, const std::string &memfunc, const std::string &classname) + { + return msg1(tokenizer, Location) + "Using '" + memfunc + "' on struct that contains a 'std::" + classname + "'"; + } + static bool memsetStruct() + { + return true; + } + + static std::string operatorEq(const Tokenizer *tokenizer, const Token *Location) + { + return msg1(tokenizer, Location) + "'operator=' should return something"; + } + static bool operatorEq(const Settings &s) + { + return s._checkCodingStyle; + } + + static std::string virtualDestructor(const Tokenizer *tokenizer, const Token *Location, const std::string &Base, const std::string &Derived) + { + return msg1(tokenizer, Location) + "Class " + Base + " which is inherited by class " + Derived + " does not have a virtual destructor"; + } + static bool virtualDestructor() + { + return true; + } + + static std::string unusedFunction(const std::string &filename, const std::string &funcname) + { + return "[" + filename + "]: The function '" + funcname + "' is never used"; + } + static bool unusedFunction(const Settings &s) + { + return s._showAll & s._checkCodingStyle; + } + + static std::string mismatchAllocDealloc(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) + { + return msg1(tokenizer, Location) + "Mismatching allocation and deallocation: " + varname + ""; + } + static bool mismatchAllocDealloc() + { + return true; + } + + static std::string memleak(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) + { + return msg1(tokenizer, Location) + "Memory leak: " + varname + ""; + } + static bool memleak() + { + return true; + } + + static std::string resourceLeak(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) + { + return msg1(tokenizer, Location) + "Resource leak: " + varname + ""; + } + static bool resourceLeak() + { + return true; + } + + static std::string deallocDealloc(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) + { + return msg1(tokenizer, Location) + "Deallocating a deallocated pointer: " + varname + ""; + } + static bool deallocDealloc() + { + return true; + } + + static std::string cstyleCast(const Tokenizer *tokenizer, const Token *Location) + { + return msg1(tokenizer, Location) + "C-style pointer casting"; + } + static bool cstyleCast(const Settings &s) + { + return s._checkCodingStyle; + } + + static std::string redundantIfDelete0(const Tokenizer *tokenizer, const Token *Location) + { + return msg1(tokenizer, Location) + "Redundant condition. It is safe to deallocate a NULL pointer"; + } + static bool redundantIfDelete0(const Settings &s) + { + return s._checkCodingStyle; + } + + static std::string redundantIfRemove(const Tokenizer *tokenizer, const Token *Location) + { + return msg1(tokenizer, Location) + "Redundant condition. The remove function in the STL will not do anything if element doesn't exist"; + } + static bool redundantIfRemove(const Settings &s) + { + return s._checkCodingStyle; + } + + static std::string dangerousUsageStrtol(const Tokenizer *tokenizer, const Token *Location) + { + return msg1(tokenizer, Location) + "Invalid radix in call to strtol or strtoul. Must be 0 or 2-36"; + } + static bool dangerousUsageStrtol() + { + return true; + } + + static std::string ifNoAction(const Tokenizer *tokenizer, const Token *Location) + { + return msg1(tokenizer, Location) + "Found redundant if condition - 'if (condition);'"; + } + static bool ifNoAction(const Settings &s) + { + return s._checkCodingStyle; + } + + static std::string sprintfOverlappingData(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) + { + return msg1(tokenizer, Location) + "Overlapping data buffer " + varname + ""; + } + static bool sprintfOverlappingData() + { + return true; + } + + static std::string udivError(const Tokenizer *tokenizer, const Token *Location) + { + return msg1(tokenizer, Location) + "Unsigned division. The result will be wrong."; + } + static bool udivError() + { + return true; + } + + static std::string udivWarning(const Tokenizer *tokenizer, const Token *Location) + { + return msg1(tokenizer, Location) + "Warning: Division with signed and unsigned operators"; + } + static bool udivWarning(const Settings &s) + { + return s._showAll & s._checkCodingStyle; + } + + static std::string unusedStructMember(const Tokenizer *tokenizer, const Token *Location, const std::string &structname, const std::string &varname) + { + return msg1(tokenizer, Location) + "struct or union member '" + structname + "::" + varname + "' is never used"; + } + static bool unusedStructMember(const Settings &s) + { + return s._checkCodingStyle; + } + + static std::string unreachableCode(const Tokenizer *tokenizer, const Token *Location) + { + return msg1(tokenizer, Location) + "Unreachable code below a 'return'"; + } + static bool unreachableCode() + { + return true; + } + + static std::string passedByValue(const Tokenizer *tokenizer, const Token *Location, const std::string &parname) + { + return msg1(tokenizer, Location) + "Function parameter '" + parname + "' is passed by value. It could be passed by reference instead."; + } + static bool passedByValue() + { + return true; + } + + static std::string unusedVariable(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) + { + return msg1(tokenizer, Location) + "Unused variable '" + varname + "'"; + } + static bool unusedVariable(const Settings &s) + { + return s._checkCodingStyle; + } + + static std::string unreadVariable(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) + { + return msg1(tokenizer, Location) + "Variable '" + varname + "' is assigned a value that is never used"; + } + static bool unreadVariable(const Settings &s) + { + return s._checkCodingStyle; + } + + static std::string unassignedVariable(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) + { + return msg1(tokenizer, Location) + "Variable '" + varname + "' is not assigned a value"; + } + static bool unassignedVariable(const Settings &s) + { + return s._checkCodingStyle; + } + + static std::string constStatement(const Tokenizer *tokenizer, const Token *Location, const std::string &type) + { + return msg1(tokenizer, Location) + "Redundant code: Found a statement that begins with " + type + " constant"; + } + static bool constStatement(const Settings &s) + { + return s._checkCodingStyle; + } + + static std::string charArrayIndex(const Tokenizer *tokenizer, const Token *Location) + { + return msg1(tokenizer, Location) + "Warning - using char variable as array index"; + } + static bool charArrayIndex(const Settings &s) + { + return s._checkCodingStyle; + } + + static std::string charBitOp(const Tokenizer *tokenizer, const Token *Location) + { + return msg1(tokenizer, Location) + "Warning - using char variable in bit operation"; + } + static bool charBitOp(const Settings &s) + { + return s._checkCodingStyle; + } + + static std::string variableScope(const Tokenizer *tokenizer, const Token *Location, const std::string &varname) + { + return msg1(tokenizer, Location) + "The scope of the variable " + varname + " can be limited"; + } + static bool variableScope() + { + return false; + } + + static std::string ifAssignment(const Tokenizer *tokenizer, const Token *Location) + { + return msg1(tokenizer, Location) + "Assignment in if-condition"; + } + static bool ifAssignment(const Settings &s) + { + return s._checkCodingStyle; + } + + static std::string conditionAlwaysTrueFalse(const Tokenizer *tokenizer, const Token *Location, const std::string &truefalse) + { + return msg1(tokenizer, Location) + "Condition is always " + truefalse + ""; + } + static bool conditionAlwaysTrueFalse(const Settings &s) + { + return s._checkCodingStyle; + } + + static std::string strPlusChar(const Tokenizer *tokenizer, const Token *Location) + { + return msg1(tokenizer, Location) + "Unusual pointer arithmetic"; + } + static bool strPlusChar() + { + return true; + } + +}; +#endif diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp index 9d44a7c25..3aa6fcc94 100644 --- a/test/testpreprocessor.cpp +++ b/test/testpreprocessor.cpp @@ -78,6 +78,7 @@ private: TEST_CASE(string1); TEST_CASE(string2); TEST_CASE(preprocessor_undef); +// TODO TEST_CASE(preprocessor_doublesharp); TEST_CASE(preprocessor_include_in_str); } @@ -523,6 +524,23 @@ private: ASSERT_EQUALS("\n\n\nchar b=0;\n", Preprocessor::expandMacros(filedata)); } + void preprocessor_doublesharp() + { + const char filedata[] = "#define TEST(var,val) var = val\n" + "TEST(foo,20);\n"; + + // Compare results.. + ASSERT_EQUALS("\nfoo=20;\n", Preprocessor::expandMacros(filedata)); + + const char filedata2[] = "#define TEST(var,val) var##_##val = val\n" + "TEST(foo,20);\n"; + + // Compare results.. + ASSERT_EQUALS("\nfoo_20=20;\n", Preprocessor::expandMacros(filedata2)); + } + + + void preprocessor_include_in_str() { const char filedata[] = "int main()\n"