noisymime
/
cppcheck
mirror of https://github.com/noisymime/cppcheck.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

borland and visual c++ fixes

This commit is contained in:
Daniel Marjamäki 2009-01-23 21:28:45 +00:00
parent d9b9368238
commit 42e56153a4
8 changed files with 3371 additions and 3369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1198
src/checkbufferoverrun.cpp
View File

File diff suppressed because it is too large Load Diff

128
src/checkbufferoverrun.h
View File

@ -1,64 +1,64 @@
/* /*
* Cppcheck - A tool for static C/C++ code analysis * Cppcheck - A tool for static C/C++ code analysis
* Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam, * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
* Leandro Penz, Kimmo Varis * Leandro Penz, Kimmo Varis
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/ * along with this program. If not, see <http://www.gnu.org/licenses/
*/ */
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#ifndef CheckBufferOverrunH #ifndef CheckBufferOverrunH
#define CheckBufferOverrunH #define CheckBufferOverrunH
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "tokenize.h" #include "tokenize.h"
#include "errorlogger.h" #include "errorlogger.h"
class CheckBufferOverrunClass class CheckBufferOverrunClass
{ {
public: public:
CheckBufferOverrunClass(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger *errorLogger); CheckBufferOverrunClass(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger *errorLogger);
~CheckBufferOverrunClass(); ~CheckBufferOverrunClass();
/** Check for buffer overruns */ /** Check for buffer overruns */
void bufferOverrun(); void bufferOverrun();
/** Check that the code doesn't use dangerous functions that can cause buffer overruns (scanf and gets) */ /** Check that the code doesn't use dangerous functions that can cause buffer overruns (scanf and gets) */
void dangerousFunctions(); void dangerousFunctions();
private: private:
/** Check for buffer overruns - locate struct variables and check them with the .._CheckScope function */ /** Check for buffer overruns - locate struct variables and check them with the .._CheckScope function */
void CheckBufferOverrun_StructVariable(); void CheckBufferOverrun_StructVariable();
/** Check for buffer overruns - locate local function variables and check them with the .._CheckScope function */ /** Check for buffer overruns - locate local function variables and check them with the .._CheckScope function */
void CheckBufferOverrun_LocalVariable(); void CheckBufferOverrun_LocalVariable();
/** Check for buffer overruns - this is the function that performs the actual checking */ /** Check for buffer overruns - this is the function that performs the actual checking */
void CheckBufferOverrun_CheckScope(const Token *tok, const char *varname[], const int size, const int total_size, unsigned int varid); void CheckBufferOverrun_CheckScope(const Token *tok, const char *varname[], const int size, const int total_size, unsigned int varid);
/** Report error using the callstack */ /** Report error using the callstack */
void ReportError(const std::string &errmsg); void ReportError(const std::string &errmsg);
const Tokenizer *_tokenizer; const Tokenizer *_tokenizer;
const Settings _settings; const Settings _settings;
ErrorLogger *_errorLogger; ErrorLogger *_errorLogger;
/** callstack - used during intra-function checking */ /** callstack - used during intra-function checking */
std::list<const Token *> _callStack; std::list<const Token *> _callStack;
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#endif #endif

1626
src/checkother.cpp
View File

File diff suppressed because it is too large Load Diff

172
src/checkother.h
View File

@ -1,86 +1,86 @@
/* /*
* Cppcheck - A tool for static C/C++ code analysis * Cppcheck - A tool for static C/C++ code analysis
* Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam, * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
* Leandro Penz, Kimmo Varis * Leandro Penz, Kimmo Varis
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/ * along with this program. If not, see <http://www.gnu.org/licenses/
*/ */
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#ifndef CheckOtherH #ifndef CheckOtherH
#define CheckOtherH #define CheckOtherH
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "tokenize.h" #include "tokenize.h"
#include "errorlogger.h" #include "errorlogger.h"
class CheckOther class CheckOther
{ {
public: public:
CheckOther(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger *errorLogger); CheckOther(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger *errorLogger);
~CheckOther(); ~CheckOther();
// Casting // Casting
void WarningOldStylePointerCast(); void WarningOldStylePointerCast();
// Redundant code // Redundant code
void WarningRedundantCode(); void WarningRedundantCode();
// Warning upon: if (condition); // Warning upon: if (condition);
void WarningIf(); void WarningIf();
// Invalid function usage.. // Invalid function usage..
void InvalidFunctionUsage(); void InvalidFunctionUsage();
// Check for unsigned division that might create bad results // Check for unsigned division that might create bad results
void CheckUnsignedDivision(); void CheckUnsignedDivision();
// Check scope of variables // Check scope of variables
void CheckVariableScope(); void CheckVariableScope();
// Check for constant function parameter // Check for constant function parameter
void CheckConstantFunctionParameter(); void CheckConstantFunctionParameter();
// Check that all struct members are used // Check that all struct members are used
void CheckStructMemberUsage(); void CheckStructMemberUsage();
// Using char variable as array index / as operand in bit operation // Using char variable as array index / as operand in bit operation
void CheckCharVariable(); void CheckCharVariable();
// Incomplete statement. A statement that only contains a constant or variable // Incomplete statement. A statement that only contains a constant or variable
void CheckIncompleteStatement(); void CheckIncompleteStatement();
/** str plus char */ /** str plus char */
void strPlusChar(); void strPlusChar();
#ifndef UNIT_TESTING #ifndef UNIT_TESTING
private: private:
#endif #endif
void CheckVariableScope_LookupVar(const Token *tok1, const char varname[]); void CheckVariableScope_LookupVar(const Token *tok1, const char varname[]);
// Redundant condition // Redundant condition
// if (haystack.find(needle) != haystack.end()) // if (haystack.find(needle) != haystack.end())
// haystack.remove(needle); // haystack.remove(needle);
void redundantCondition2(); void redundantCondition2();
const Tokenizer *_tokenizer; const Tokenizer *_tokenizer;
ErrorLogger *_errorLogger; ErrorLogger *_errorLogger;
const Settings &_settings; const Settings &_settings;
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#endif #endif

17
src/preprocessor.cpp
View File

@ -1,4 +1,4 @@
/* /*
* Cppcheck - A tool for static C/C++ code analysis * Cppcheck - A tool for static C/C++ code analysis
* Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam, * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
* Leandro Penz, Kimmo Varis * Leandro Penz, Kimmo Varis
@ -27,6 +27,7 @@
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <cctype>
Preprocessor::Preprocessor() Preprocessor::Preprocessor()
{ {
@ -72,7 +73,7 @@ std::string Preprocessor::read(std::istream &istr)
++lineno; ++lineno;
// Replace assorted special chars with spaces.. // Replace assorted special chars with spaces..
if ((ch != '\n') && (isspace(ch) || iscntrl(ch))) if ((ch != '\n') && (std::isspace(ch) || std::iscntrl(ch)))
ch = ' '; ch = ' ';
// Skip spaces after ' ' and after '#' // Skip spaces after ' ' and after '#'
@ -491,9 +492,9 @@ void Preprocessor::handleIncludes(std::string &code, const std::string &filename
filename = getHeaderFileName(filename); filename = getHeaderFileName(filename);
if (filename.length() == 0) if (filename.length() == 0)
continue; continue;
std::string tempFile = filename; std::string tempFile = filename;
std::transform(tempFile.begin(), tempFile.end(), tempFile.begin(), static_cast < int(*)(int) > (std::tolower)); std::transform(tempFile.begin(), tempFile.end(), tempFile.begin(), static_cast < int(*)(int) > (std::tolower));
if (handledFiles.find(tempFile) != handledFiles.end()) if (handledFiles.find(tempFile) != handledFiles.end())
{ {
// We have processed this file already once, skip // We have processed this file already once, skip
@ -697,7 +698,7 @@ std::string Preprocessor::expandMacros(std::string code)
std::string::size_type pos = pos1 + macro.name().length(); std::string::size_type pos = pos1 + macro.name().length();
if (pos < code.length() if (pos < code.length()
&& code.substr(pos1, macro.name().length()) == macro.name() && code.substr(pos1, macro.name().length()) == macro.name()
&& !isalnum(code[pos]) && code[pos] != '_') && !std::isalnum(code[pos]) && code[pos] != '_')
break; break;
@ -720,7 +721,7 @@ std::string Preprocessor::expandMacros(std::string code)
// TODO, this code is here, because there is currently a bug in cppcheck // TODO, this code is here, because there is currently a bug in cppcheck
// Once it has been sorted out, this if can be removed // Once it has been sorted out, this if can be removed
std::cout << "\n\n####### There is a bug in preprocessor.cpp that can cause crash, shutting down.\n\n" << std::endl; std::cout << "\n\n####### There is a bug in preprocessor.cpp that can cause crash, shutting down.\n\n" << std::endl;
exit(0); std::exit(0);
} }
} }
continue; continue;
@ -732,14 +733,14 @@ std::string Preprocessor::expandMacros(std::string code)
continue; continue;
// Previous char must not be alphanumeric or '_' // Previous char must not be alphanumeric or '_'
if (pos1 != 0 && (isalnum(code[pos1-1]) || code[pos1-1] == '_')) if (pos1 != 0 && (std::isalnum(code[pos1-1]) || code[pos1-1] == '_'))
continue; continue;
// The char after the macroname must not be alphanumeric or '_' // The char after the macroname must not be alphanumeric or '_'
if (pos1 + macro.name().length() < code.length()) if (pos1 + macro.name().length() < code.length())
{ {
std::string::size_type pos2 = pos1 + macro.name().length(); std::string::size_type pos2 = pos1 + macro.name().length();
if (isalnum(code[pos2]) || code[pos2] == '_') if (std::isalnum(code[pos2]) || code[pos2] == '_')
continue; continue;
} }

264
src/preprocessor.h
View File

@ -1,132 +1,132 @@
/* /*
* Cppcheck - A tool for static C/C++ code analysis * Cppcheck - A tool for static C/C++ code analysis
* Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam, * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
* Leandro Penz, Kimmo Varis * Leandro Penz, Kimmo Varis
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/ * along with this program. If not, see <http://www.gnu.org/licenses/
*/ */
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#ifndef preprocessorH #ifndef preprocessorH
#define preprocessorH #define preprocessorH
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include <map> #include <map>
#include <istream> #include <istream>
#include <string> #include <string>
#include <list> #include <list>
class Preprocessor class Preprocessor
{ {
public: public:
Preprocessor(); Preprocessor();
/** /**
* Extract the code for each configuration * Extract the code for each configuration
* @param istr The (file/string) stream to read from. * @param istr The (file/string) stream to read from.
* @param result The map that will get the results * @param result The map that will get the results
* @param filename The name of the file to check e.g. "src/main.cpp" * @param filename The name of the file to check e.g. "src/main.cpp"
* @param includePaths List of paths where incude files should be searched from, * @param includePaths List of paths where incude files should be searched from,
* single path can be e.g. in format "include/". * single path can be e.g. in format "include/".
* There must be a path separator at the end. Default parameter is empty list. * There must be a path separator at the end. Default parameter is empty list.
* Note that if path from given filename is also extracted and that is used as * Note that if path from given filename is also extracted and that is used as
* a last include path if include file was not found from earlier paths. * a last include path if include file was not found from earlier paths.
*/ */
void preprocess(std::istream &istr, std::map<std::string, std::string> &result, const std::string &filename, const std::list<std::string> &includePaths = std::list<std::string>()); void preprocess(std::istream &istr, std::map<std::string, std::string> &result, const std::string &filename, const std::list<std::string> &includePaths = std::list<std::string>());
/** /**
* Extract the code for each configuration. Use this with getcode() to get the * Extract the code for each configuration. Use this with getcode() to get the
* file data for each individual configuration. * file data for each individual configuration.
* *
* @param istr The (file/string) stream to read from. * @param istr The (file/string) stream to read from.
* @param processedFile Give reference to empty string as a parameter, * @param processedFile Give reference to empty string as a parameter,
* function will fill processed file here. Use this also as a filedata parameter * function will fill processed file here. Use this also as a filedata parameter
* to getcode() if you recieved more than once configurations. * to getcode() if you recieved more than once configurations.
* @param resultConfigurations List of configurations. Pass these one by one * @param resultConfigurations List of configurations. Pass these one by one
* to getcode() with processedFile. * to getcode() with processedFile.
* @param filename The name of the file to check e.g. "src/main.cpp" * @param filename The name of the file to check e.g. "src/main.cpp"
* @param includePaths List of paths where incude files should be searched from, * @param includePaths List of paths where incude files should be searched from,
* single path can be e.g. in format "include/". * single path can be e.g. in format "include/".
* There must be a path separator at the end. Default parameter is empty list. * There must be a path separator at the end. Default parameter is empty list.
* Note that if path from given filename is also extracted and that is used as * Note that if path from given filename is also extracted and that is used as
* a last include path if include file was not found from earlier paths. * a last include path if include file was not found from earlier paths.
*/ */
void preprocess(std::istream &istr, std::string &processedFile, std::list<std::string> &resultConfigurations, const std::string &filename, const std::list<std::string> &includePaths); void preprocess(std::istream &istr, std::string &processedFile, std::list<std::string> &resultConfigurations, const std::string &filename, const std::list<std::string> &includePaths);
/** Just read the code into a string. Perform simple cleanup of the code */ /** Just read the code into a string. Perform simple cleanup of the code */
static std::string read(std::istream &istr); static std::string read(std::istream &istr);
/** /**
* Get preprocessed code for a given configuration * Get preprocessed code for a given configuration
*/ */
static std::string getcode(const std::string &filedata, std::string cfg); static std::string getcode(const std::string &filedata, std::string cfg);
#ifndef UNIT_TESTING #ifndef UNIT_TESTING
private: private:
#endif #endif
/** /**
* Remove space that has new line character on left or right side of it. * Remove space that has new line character on left or right side of it.
* *
* @param str The string to be converted * @param str The string to be converted
* @return The string where space characters have been removed. * @return The string where space characters have been removed.
*/ */
static std::string removeSpaceNearNL(const std::string &str); static std::string removeSpaceNearNL(const std::string &str);
/** /**
* Replace "#if defined" with "#ifdef" where possible * Replace "#if defined" with "#ifdef" where possible
* *
* @param str The string to be converted * @param str The string to be converted
* @return The replaced string * @return The replaced string
*/ */
static std::string replaceIfDefined(const std::string &str); static std::string replaceIfDefined(const std::string &str);
/** /**
* Get all possible configurations. By looking at the ifdefs and ifndefs in filedata * Get all possible configurations. By looking at the ifdefs and ifndefs in filedata
*/ */
std::list<std::string> getcfgs(const std::string &filedata); std::list<std::string> getcfgs(const std::string &filedata);
static std::string getdef(std::string line, bool def); static std::string getdef(std::string line, bool def);
static bool match_cfg_def(std::string cfg, const std::string &def); static bool match_cfg_def(std::string cfg, const std::string &def);
static std::string expandMacros(std::string code); static std::string expandMacros(std::string code);
/** /**
* Search includes from code and append code from the included * Search includes from code and append code from the included
* file * file
* @param code The source code to modify * @param code The source code to modify
* @param filename The name of the file to check e.g. "src/main.cpp" * @param filename The name of the file to check e.g. "src/main.cpp"
* @param includePaths List of paths where incude files should be searched from, * @param includePaths List of paths where incude files should be searched from,
* single path can be e.g. in format "include/". * single path can be e.g. in format "include/".
* There must be a path separator at the end. Default parameter is empty list. * There must be a path separator at the end. Default parameter is empty list.
* Note that if path from given filename is also extracted and that is used as * Note that if path from given filename is also extracted and that is used as
* a last include path if include file was not found from earlier paths. * a last include path if include file was not found from earlier paths.
* @return modified source code * @return modified source code
*/ */
static void handleIncludes(std::string &code, const std::string &filename, const std::list<std::string> &includePaths); static void handleIncludes(std::string &code, const std::string &filename, const std::list<std::string> &includePaths);
/** /**
* Returns the string between double quote characters. * Returns the string between double quote characters.
* @param str e.g. '#include "menu.h"' * @param str e.g. '#include "menu.h"'
* @return e.g. 'menu.h' or empty string if double quotes were * @return e.g. 'menu.h' or empty string if double quotes were
* not found. * not found.
*/ */
static std::string getHeaderFileName(const std::string &str); static std::string getHeaderFileName(const std::string &str);
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#endif #endif

3043
src/tokenize.cpp
View File

File diff suppressed because it is too large Load Diff

292
src/tokenize.h
View File

@ -1,146 +1,146 @@
/* /*
* Cppcheck - A tool for static C/C++ code analysis * Cppcheck - A tool for static C/C++ code analysis
* Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam, * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
* Leandro Penz, Kimmo Varis * Leandro Penz, Kimmo Varis
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/ * along with this program. If not, see <http://www.gnu.org/licenses/
*/ */
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#ifndef tokenizeH #ifndef tokenizeH
#define tokenizeH #define tokenizeH
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include <list> #include <list>
#include <string> #include <string>
#include <map> #include <map>
#include <vector> #include <vector>
#include "settings.h" #include "settings.h"
#include "errorlogger.h" #include "errorlogger.h"
#include "token.h" #include "token.h"
class Tokenizer class Tokenizer
{ {
private: private:
// Deallocate lists.. // Deallocate lists..
void DeallocateTokens(); void DeallocateTokens();
public: public:
Tokenizer(); Tokenizer();
~Tokenizer(); ~Tokenizer();
/** /**
* Tokenize code * Tokenize code
* @param code input stream for code * @param code input stream for code
* @param FileName The filename * @param FileName The filename
*/ */
void tokenize(std::istream &code, const char FileName[]); void tokenize(std::istream &code, const char FileName[]);
/** Set variable id */ /** Set variable id */
void setVarId(); void setVarId();
/** Simplify tokenlist */ /** Simplify tokenlist */
void simplifyTokenList(); void simplifyTokenList();
// Helper functions for handling the tokens list.. // Helper functions for handling the tokens list..
static void deleteTokens(Token *tok); static void deleteTokens(Token *tok);
static const char *getParameterName(const Token *ftok, int par); static const char *getParameterName(const Token *ftok, int par);
static bool SameFileName(const char fname1[], const char fname2[]); static bool SameFileName(const char fname1[], const char fname2[]);
std::string fileLine(const Token *tok) const; std::string fileLine(const Token *tok) const;
// Return size. // Return size.
int SizeOfType(const char type[]) const; int SizeOfType(const char type[]) const;
void initTokens(); void initTokens();
const std::vector<std::string> *getFiles() const; const std::vector<std::string> *getFiles() const;
void fillFunctionList(); void fillFunctionList();
const Token *GetFunctionTokenByName(const char funcname[]) const; const Token *GetFunctionTokenByName(const char funcname[]) const;
const Token *tokens() const; const Token *tokens() const;
#ifndef UNIT_TESTING #ifndef UNIT_TESTING
private: private:
#endif #endif
/** /**
* Finds matching "end" for "start". * Finds matching "end" for "start".
* @param tok The start tag * @param tok The start tag
* @param start e.g. "{" * @param start e.g. "{"
* @param end e.g. "}" * @param end e.g. "}"
* @return The end tag that matches given parameter or 0 if not found. * @return The end tag that matches given parameter or 0 if not found.
*/ */
static const Token *findClosing(const Token *tok, const char *start, const char *end); static const Token *findClosing(const Token *tok, const char *start, const char *end);
void addtoken(const char str[], const unsigned int lineno, const unsigned int fileno); void addtoken(const char str[], const unsigned int lineno, const unsigned int fileno);
/** Add braces to an if-block /** Add braces to an if-block
* @return true if something is modified * @return true if something is modified
* false if nothing is done. * false if nothing is done.
*/ */
bool simplifyIfAddBraces(); bool simplifyIfAddBraces();
/** Simplify conditions /** Simplify conditions
* @return true if something is modified * @return true if something is modified
* false if nothing is done. * false if nothing is done.
*/ */
bool simplifyConditions(); bool simplifyConditions();
/** Remove reduntant code, e.g. if( false ) { int a; } should be /** Remove reduntant code, e.g. if( false ) { int a; } should be
* removed, because it is never executed. * removed, because it is never executed.
* @return true if something is modified * @return true if something is modified
* false if nothing is done. * false if nothing is done.
*/ */
bool removeReduntantConditions(); bool removeReduntantConditions();
/** Simplify casts /** Simplify casts
* @return true if something is modified * @return true if something is modified
* false if nothing is done. * false if nothing is done.
*/ */
bool simplifyCasts(); bool simplifyCasts();
/** Simplify function calls - constant return value /** Simplify function calls - constant return value
* @return true if something is modified * @return true if something is modified
* false if nothing is done. * false if nothing is done.
*/ */
bool simplifyFunctionReturn(); bool simplifyFunctionReturn();
/** /**
* A simplify function that replaces a variable with its value in cases * A simplify function that replaces a variable with its value in cases
* when the value is known. e.g. "x=10; if(x)" => "x=10;if(10)" * when the value is known. e.g. "x=10; if(x)" => "x=10;if(10)"
* *
* @param token The token list to check and modify. * @param token The token list to check and modify.
* @return true if modifications to token-list are done. * @return true if modifications to token-list are done.
* false if no modifications are done. * false if no modifications are done.
*/ */
bool simplifyKnownVariables(); bool simplifyKnownVariables();
void InsertTokens(Token *dest, Token *src, unsigned int n); void InsertTokens(Token *dest, Token *src, unsigned int n);
Token *_tokensBack; Token *_tokensBack;
std::map<std::string, unsigned int> _typeSize; std::map<std::string, unsigned int> _typeSize;
std::vector<const Token *> _functionList; std::vector<const Token *> _functionList;
std::vector<std::string> _files; std::vector<std::string> _files;
Token *_tokens; Token *_tokens;
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#endif #endif