2013-01-10 11:10:45 +01:00
|
|
|
/*
|
|
|
|
* Cppcheck - A tool for static C/C++ code analysis
|
2016-01-01 14:34:45 +01:00
|
|
|
* Copyright (C) 2007-2016 Cppcheck team.
|
2013-01-10 11:10:45 +01:00
|
|
|
*
|
|
|
|
* 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 <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
2013-08-18 18:19:24 +02:00
|
|
|
#include "cppcheck.h"
|
|
|
|
#include "mathlib.h"
|
|
|
|
#include "path.h"
|
|
|
|
|
2012-12-31 12:41:36 +01:00
|
|
|
#include <fstream>
|
|
|
|
#include <iostream>
|
|
|
|
#include <sstream>
|
|
|
|
#include <cstdlib>
|
|
|
|
#include <cstring>
|
2013-01-03 15:22:54 +01:00
|
|
|
#include <ctime>
|
2012-12-31 12:41:36 +01:00
|
|
|
|
2013-08-18 18:15:46 +02:00
|
|
|
class ReduceSettings : public Settings {
|
|
|
|
public:
|
2013-08-19 06:06:53 +02:00
|
|
|
ReduceSettings() : filename(0), linenr(0), hang(false), maxtime(0) { }
|
2013-08-18 18:15:46 +02:00
|
|
|
|
|
|
|
const char *filename;
|
|
|
|
std::size_t linenr;
|
|
|
|
bool hang;
|
|
|
|
unsigned int maxtime;
|
|
|
|
};
|
|
|
|
|
2012-12-31 12:41:36 +01:00
|
|
|
class CppcheckExecutor : public ErrorLogger {
|
|
|
|
private:
|
|
|
|
CppCheck cppcheck;
|
2013-01-01 16:18:06 +01:00
|
|
|
std::string pattern;
|
2012-12-31 12:41:36 +01:00
|
|
|
bool foundLine;
|
2013-01-03 15:22:54 +01:00
|
|
|
std::time_t stopTime;
|
2012-12-31 12:41:36 +01:00
|
|
|
|
|
|
|
public:
|
2015-04-07 01:25:46 +02:00
|
|
|
explicit CppcheckExecutor(const ReduceSettings & settings)
|
2012-12-31 12:41:36 +01:00
|
|
|
: ErrorLogger()
|
|
|
|
, cppcheck(*this,false)
|
2013-01-03 15:22:54 +01:00
|
|
|
, foundLine(false)
|
2014-11-20 14:20:09 +01:00
|
|
|
, stopTime(0) {
|
2013-01-03 15:22:54 +01:00
|
|
|
|
2013-08-18 18:15:46 +02:00
|
|
|
if (!settings.hang)
|
2013-10-06 19:07:47 +02:00
|
|
|
pattern = ":" + MathLib::toString(settings.linenr) + "]";
|
2013-08-17 19:46:56 +02:00
|
|
|
|
2013-08-18 18:15:46 +02:00
|
|
|
cppcheck.settings() = settings;
|
2012-12-31 12:41:36 +01:00
|
|
|
}
|
|
|
|
|
2014-11-20 14:20:09 +01:00
|
|
|
bool run(const char filename[], unsigned int maxtime) {
|
2012-12-31 12:41:36 +01:00
|
|
|
foundLine = false;
|
2013-01-03 15:22:54 +01:00
|
|
|
stopTime = std::time(0) + maxtime;
|
2012-12-31 12:41:36 +01:00
|
|
|
cppcheck.check(filename);
|
|
|
|
return foundLine;
|
|
|
|
}
|
|
|
|
|
2013-01-02 15:37:41 +01:00
|
|
|
void reportOut(const std::string &/*outmsg*/) { }
|
2014-11-20 14:20:09 +01:00
|
|
|
void reportErr(const ErrorLogger::ErrorMessage &msg) {
|
2013-01-03 15:22:54 +01:00
|
|
|
if (!pattern.empty() && msg.toString(false).find(pattern) != std::string::npos) {
|
2013-01-01 13:56:37 +01:00
|
|
|
foundLine = true;
|
|
|
|
cppcheck.terminate();
|
|
|
|
}
|
2012-12-31 12:41:36 +01:00
|
|
|
}
|
2014-11-20 14:20:09 +01:00
|
|
|
void reportProgress(const std::string &/*filename*/, const char /*stage*/[], const std::size_t /*value*/) {
|
2013-01-03 15:22:54 +01:00
|
|
|
if (std::time(0) > stopTime) {
|
|
|
|
if (pattern.empty())
|
|
|
|
foundLine = true;
|
2013-01-08 07:10:14 +01:00
|
|
|
else
|
|
|
|
std::cerr << "timeout. You might want to use a longer --maxtime timeout" << std::endl;
|
2013-01-03 15:22:54 +01:00
|
|
|
std::cout << "terminate" << std::endl;
|
|
|
|
cppcheck.terminate();
|
|
|
|
}
|
|
|
|
}
|
2012-12-31 12:41:36 +01:00
|
|
|
};
|
|
|
|
|
2013-01-03 15:22:54 +01:00
|
|
|
static bool test(const ReduceSettings &settings, const std::vector<std::string> &filedata, const std::size_t line1, const std::size_t line2)
|
2012-12-31 12:41:36 +01:00
|
|
|
{
|
2013-01-03 15:22:54 +01:00
|
|
|
std::string path(settings.filename);
|
2012-12-31 12:41:36 +01:00
|
|
|
if (path.find_first_of("\\/") != std::string::npos)
|
|
|
|
path = path.erase(1 + path.find_last_of("\\/"));
|
|
|
|
else
|
|
|
|
path.clear();
|
|
|
|
|
2013-01-03 15:22:54 +01:00
|
|
|
const std::string tempfilename(path + "__temp__" + std::strrchr(settings.filename,'.'));
|
2012-12-31 12:41:36 +01:00
|
|
|
std::ofstream fout(tempfilename.c_str());
|
|
|
|
for (std::size_t i = 0; i < filedata.size(); i++)
|
|
|
|
fout << ((i>=line1 && i<=line2) ? "" : filedata[i]) << std::endl;
|
|
|
|
fout.close();
|
2013-01-01 16:18:06 +01:00
|
|
|
|
2013-08-18 18:15:46 +02:00
|
|
|
CppcheckExecutor cppcheck(settings);
|
2013-01-03 15:22:54 +01:00
|
|
|
return cppcheck.run(tempfilename.c_str(), settings.maxtime);
|
2012-12-31 12:41:36 +01:00
|
|
|
}
|
|
|
|
|
2013-01-03 15:22:54 +01:00
|
|
|
static bool test(const ReduceSettings &settings, const std::vector<std::string> &filedata, const std::size_t line)
|
2012-12-31 12:41:36 +01:00
|
|
|
{
|
2013-01-03 15:22:54 +01:00
|
|
|
return test(settings, filedata, line, line);
|
2012-12-31 12:41:36 +01:00
|
|
|
}
|
|
|
|
|
2014-05-15 21:02:08 +02:00
|
|
|
#ifdef GDB_HELPERS
|
2012-12-31 12:41:36 +01:00
|
|
|
static void printstr(const std::vector<std::string> &filedata, int i1, int i2)
|
|
|
|
{
|
|
|
|
std::cout << filedata.size();
|
|
|
|
for (int i = i1; i < i2; ++i)
|
|
|
|
std::cout << i << ":" << filedata[i] << std::endl;
|
|
|
|
}
|
2014-05-15 21:02:08 +02:00
|
|
|
#endif
|
2012-12-31 12:41:36 +01:00
|
|
|
|
2014-07-30 17:53:41 +02:00
|
|
|
static char getEndChar(const std::string &line)
|
|
|
|
{
|
2014-07-30 17:43:24 +02:00
|
|
|
std::size_t pos = line.find_last_not_of(" \t");
|
|
|
|
return (pos == std::string::npos) ? '\0' : line[pos];
|
|
|
|
}
|
|
|
|
|
2013-01-01 16:18:06 +01:00
|
|
|
static std::vector<std::string> readfile(const std::string &filename)
|
|
|
|
{
|
|
|
|
std::vector<std::string> filedata;
|
|
|
|
std::ifstream fin(filename.c_str());
|
|
|
|
std::string line;
|
|
|
|
bool blockComment = false;
|
|
|
|
while (std::getline(fin,line)) {
|
|
|
|
// replace various space characters with space
|
|
|
|
for (std::string::size_type pos = 0; pos < line.size(); ++pos) {
|
|
|
|
if (line[pos] & 0x80 || std::isspace(line[pos]))
|
|
|
|
line[pos] = ' ';
|
|
|
|
}
|
|
|
|
|
|
|
|
// remove block comments TODO: Handle /* inside strings
|
|
|
|
if (blockComment) {
|
|
|
|
if (line.find("*/") == std::string::npos)
|
|
|
|
line.clear();
|
|
|
|
else {
|
|
|
|
if (line.find("*/") + 2U == line.size())
|
|
|
|
line.clear();
|
|
|
|
else
|
|
|
|
line = line.substr(line.find("*/") + 2U);
|
|
|
|
blockComment = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (!blockComment && line.find("/*") != std::string::npos) {
|
|
|
|
std::string::size_type pos = line.find("/*");
|
|
|
|
if (line.find("*/",pos) == std::string::npos) {
|
|
|
|
blockComment = true;
|
|
|
|
if (pos==0)
|
|
|
|
line.clear();
|
|
|
|
else
|
|
|
|
line = line.substr(0,pos);
|
|
|
|
} else {
|
|
|
|
blockComment = false;
|
|
|
|
line = line.erase(pos, 2U + line.find("*/", pos) - pos);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Remove // comments
|
|
|
|
if (line.find("//") != std::string::npos)
|
|
|
|
line = line.substr(0, line.find("//"));
|
|
|
|
|
|
|
|
// empty line
|
|
|
|
if (line.find_first_not_of(" ") == std::string::npos)
|
|
|
|
line.clear();
|
|
|
|
else {
|
|
|
|
const std::string::size_type pos = line.find_first_not_of(" ");
|
|
|
|
|
|
|
|
// remove spaces before leading #
|
|
|
|
if (line[pos]=='#')
|
|
|
|
line = line.substr(pos);
|
|
|
|
}
|
|
|
|
|
|
|
|
// remove trailing spaces
|
|
|
|
while (!line.empty() && std::isspace(line[line.size()-1U]))
|
|
|
|
line = line.substr(0, line.size() - 1U);
|
|
|
|
|
|
|
|
filedata.push_back(line);
|
|
|
|
}
|
2014-07-30 17:53:41 +02:00
|
|
|
|
2014-08-01 13:35:31 +02:00
|
|
|
// put function declarations in a single line..
|
2014-07-30 17:43:24 +02:00
|
|
|
for (unsigned int linenr = 0U; linenr+1U < filedata.size(); ++linenr) {
|
|
|
|
// Does this look like start of a function declaration?
|
|
|
|
if (filedata[linenr].empty() ||
|
|
|
|
!std::isalpha(filedata[linenr][0U]) ||
|
|
|
|
getEndChar(filedata[linenr]) != ',' ||
|
|
|
|
filedata[linenr].find("(") == std::string::npos ||
|
|
|
|
filedata[linenr].find(")") != std::string::npos)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
// Where does function declaration end?
|
|
|
|
unsigned int linenr2 = linenr + 1U;
|
2014-07-30 17:53:41 +02:00
|
|
|
while (linenr2 < filedata.size() &&
|
2014-07-30 17:43:24 +02:00
|
|
|
getEndChar(filedata[linenr2]) == ',' &&
|
|
|
|
filedata[linenr2].find("(") == std::string::npos &&
|
|
|
|
filedata[linenr2].find(")") == std::string::npos)
|
|
|
|
++linenr2;
|
|
|
|
|
|
|
|
// If function declaration looks correct.. simplify it
|
|
|
|
if (linenr2 < filedata.size() &&
|
|
|
|
getEndChar(filedata[linenr2]) == ';' &&
|
|
|
|
filedata[linenr2].find("(") == std::string::npos &&
|
|
|
|
filedata[linenr2].size() > 2U &&
|
|
|
|
filedata[linenr2].find(")") == filedata[linenr2].size() - 2U) {
|
|
|
|
std::string code;
|
|
|
|
for (unsigned int i = linenr; i <= linenr2; i++) {
|
|
|
|
code = code + filedata[i];
|
|
|
|
filedata[i].clear();
|
|
|
|
}
|
|
|
|
filedata[linenr] = code;
|
|
|
|
}
|
|
|
|
}
|
2014-07-30 17:53:41 +02:00
|
|
|
|
2014-08-01 13:35:31 +02:00
|
|
|
// put #define statements in a single line..
|
|
|
|
for (unsigned int linenr = 0U; linenr+1U < filedata.size(); ++linenr) {
|
|
|
|
// is this a multiline #define statement?
|
|
|
|
if (filedata[linenr].compare(0,8,"#define ")!=0 || getEndChar(filedata[linenr])!='\\')
|
|
|
|
continue;
|
|
|
|
|
|
|
|
// where does statement end?
|
|
|
|
unsigned int linenr2 = linenr + 1U;
|
|
|
|
while (linenr2 < filedata.size() && getEndChar(filedata[linenr2]) == '\\')
|
|
|
|
++linenr2;
|
|
|
|
|
|
|
|
// simplify
|
|
|
|
if (linenr2 < filedata.size()) {
|
|
|
|
std::string code;
|
|
|
|
for (unsigned int i = linenr; i <= linenr2; i++) {
|
|
|
|
code = code + filedata[i].substr(0,filedata[i].size() - 1U);
|
|
|
|
filedata[i].clear();
|
|
|
|
}
|
|
|
|
filedata[linenr] = code;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-01 16:18:06 +01:00
|
|
|
return filedata;
|
|
|
|
}
|
|
|
|
|
2013-01-03 15:22:54 +01:00
|
|
|
static bool removeMacrosInGlobalScope(const ReduceSettings &settings, std::vector<std::string> &filedata)
|
2012-12-31 12:41:36 +01:00
|
|
|
{
|
2013-01-01 20:18:31 +01:00
|
|
|
bool changed = false;
|
2012-12-31 12:41:36 +01:00
|
|
|
|
2013-01-01 20:18:31 +01:00
|
|
|
// Remove macros in global scope..
|
|
|
|
for (std::size_t i = 0; i < filedata.size(); i++) {
|
|
|
|
const std::string line = (i==0U&&filedata.empty()) ? std::string(";") : filedata[i];
|
|
|
|
if (line.empty())
|
|
|
|
continue;
|
2012-12-31 12:41:36 +01:00
|
|
|
|
2013-01-01 20:18:31 +01:00
|
|
|
const char startChar = line[0];
|
|
|
|
const char endChar = line[line.size() - 1U];
|
2012-12-31 12:41:36 +01:00
|
|
|
|
2013-01-01 20:18:31 +01:00
|
|
|
bool decl = bool(!std::isspace(startChar) && (endChar=='}' || endChar==';'));
|
|
|
|
while (decl) {
|
|
|
|
decl = false; // might be set to true below
|
|
|
|
std::size_t pos = i + 1U;
|
|
|
|
while (pos < filedata.size() && filedata[pos].empty())
|
|
|
|
++pos;
|
|
|
|
if (pos >= filedata.size())
|
|
|
|
break;
|
|
|
|
const std::string &s = filedata[pos]; // possible macro : make sure it matches '[A-Z0-9_]+\(.*\)'
|
|
|
|
std::string::size_type si = 0;
|
|
|
|
while (si < s.size() && ((s[si]>='A' && s[si]<='Z') || (i>0 && s[si]>='0' && s[si]<='9') || s[si]=='_'))
|
|
|
|
si++;
|
|
|
|
while (si < s.size() && std::isspace(s[si]))
|
|
|
|
si++;
|
|
|
|
if (si == 0U || si >= s.size() || s[si] != '(')
|
|
|
|
break;
|
|
|
|
si++;
|
|
|
|
unsigned int parlevel = 1;
|
|
|
|
while (si < s.size() && parlevel >= 1U) {
|
|
|
|
if (s[si] == '(')
|
|
|
|
++parlevel;
|
|
|
|
else if (s[si] == ')')
|
|
|
|
--parlevel;
|
|
|
|
si++;
|
|
|
|
}
|
|
|
|
if (!(parlevel == 0U && si == s.size()))
|
|
|
|
break;
|
2013-01-03 15:22:54 +01:00
|
|
|
if (test(settings, filedata, pos)) {
|
2013-01-01 20:18:31 +01:00
|
|
|
decl = true;
|
|
|
|
filedata[pos].clear();
|
|
|
|
std::cout << "removed declaration at line " << pos << std::endl;
|
|
|
|
changed = true;
|
2012-12-31 12:41:36 +01:00
|
|
|
} else {
|
2013-01-01 20:18:31 +01:00
|
|
|
std::cout << "kept declaration at line " << pos << std::endl;
|
2012-12-31 12:41:36 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-01 20:18:31 +01:00
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
|
2013-01-03 15:22:54 +01:00
|
|
|
static bool removeBlocksOfCode(const ReduceSettings &settings, std::vector<std::string> &filedata)
|
2013-01-01 20:18:31 +01:00
|
|
|
{
|
|
|
|
bool changed = false;
|
|
|
|
|
2012-12-31 12:41:36 +01:00
|
|
|
// Remove blocks of code..
|
|
|
|
for (std::size_t i = 0; i < filedata.size(); i++) {
|
|
|
|
const std::string line = (i==0U&&filedata.empty()) ? std::string(";") : filedata[i];
|
|
|
|
if (line.empty())
|
|
|
|
continue;
|
|
|
|
|
|
|
|
const char startChar = line[0];
|
|
|
|
const char endChar = line[line.size() - 1U];
|
|
|
|
|
|
|
|
// some kind of single line declaration
|
|
|
|
if (std::isalpha(startChar) && endChar==';') {
|
2013-01-03 15:22:54 +01:00
|
|
|
if (test(settings, filedata, i)) {
|
2012-12-31 12:41:36 +01:00
|
|
|
filedata[i].clear();
|
|
|
|
std::cout << "removed declaration at line " << i << std::endl;
|
2013-01-01 20:18:31 +01:00
|
|
|
changed = true;
|
2012-12-31 12:41:36 +01:00
|
|
|
} else {
|
|
|
|
std::cout << "kept declaration at line " << i << std::endl;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// remove a function body below a '}'
|
|
|
|
bool decl = bool(!std::isspace(startChar) && (endChar=='}' || endChar==';'));
|
|
|
|
while (decl) {
|
|
|
|
decl = false; // might be set to true below
|
|
|
|
std::size_t pos = ++i;
|
|
|
|
while (pos < filedata.size() && filedata[pos].empty())
|
|
|
|
++pos;
|
|
|
|
if ((pos+2U < filedata.size()) && (std::isalpha(filedata[pos].at(0)))) {
|
|
|
|
|
|
|
|
// does code block start with "{"
|
|
|
|
std::size_t pos2 = pos;
|
2013-01-20 09:05:50 +01:00
|
|
|
|
|
|
|
// struct X { ..
|
|
|
|
if (filedata[pos].find_first_of("();}") == std::string::npos && filedata[pos].at(filedata[pos].size()-1U) == '{') {
|
|
|
|
|
2012-12-31 12:41:36 +01:00
|
|
|
}
|
2013-01-20 09:05:50 +01:00
|
|
|
|
|
|
|
// function declaration ..
|
|
|
|
else {
|
|
|
|
if (filedata[pos].find("(") != std::string::npos && filedata[pos].find(")")==std::string::npos) {
|
|
|
|
++pos2;
|
|
|
|
while (pos2+2U < filedata.size() && !filedata[pos2].empty() && filedata[pos2].find_first_of("(){}") == std::string::npos)
|
|
|
|
++pos2;
|
|
|
|
if (filedata[pos2].find_first_of("({}")!=std::string::npos || filedata[pos2].find(")") == std::string::npos)
|
|
|
|
break;
|
|
|
|
}
|
2013-01-02 17:08:04 +01:00
|
|
|
pos2++;
|
2013-01-20 09:05:50 +01:00
|
|
|
if (pos2 < filedata.size() && !filedata[pos2].empty() && filedata[pos2].at(filedata[pos2].find_first_not_of(" ")) == ':') {
|
2013-01-02 17:08:04 +01:00
|
|
|
pos2++;
|
2013-01-20 09:05:50 +01:00
|
|
|
while (pos2 < filedata.size() && !filedata[pos2].empty() && filedata[pos2].at(filedata[pos2].find_first_not_of(" ")) == ',')
|
|
|
|
pos2++;
|
|
|
|
}
|
|
|
|
if (pos2+2U >= filedata.size() || filedata[pos2] != "{")
|
|
|
|
break;
|
2013-01-02 17:08:04 +01:00
|
|
|
}
|
|
|
|
pos2++;
|
2012-12-31 12:41:36 +01:00
|
|
|
|
|
|
|
// find end of block..
|
2013-01-01 14:33:32 +01:00
|
|
|
int level = 0;
|
2013-01-02 17:08:04 +01:00
|
|
|
while ((pos2 < filedata.size()) && (filedata[pos2].empty() || std::isspace(filedata[pos2].at(0)) || (std::isalpha(filedata[pos2].at(0)) && filedata[pos2].at(filedata[pos2].size()-1U) == ':') || filedata[pos2].compare(0,3,"#if")==0 || filedata[pos2].compare(0,3,"#el")==0 || filedata[pos2]=="#endif")) {
|
2013-01-01 14:33:32 +01:00
|
|
|
if (filedata[pos2].compare(0,3,"#if") == 0)
|
|
|
|
++level;
|
|
|
|
else if (filedata[pos2] == "#endif")
|
|
|
|
--level;
|
2012-12-31 12:41:36 +01:00
|
|
|
++pos2;
|
2013-01-01 14:33:32 +01:00
|
|
|
}
|
|
|
|
if (level != 0)
|
|
|
|
break;
|
2012-12-31 12:41:36 +01:00
|
|
|
|
|
|
|
// does block of code end with a '}'
|
|
|
|
if ((pos2 < filedata.size()) && (filedata[pos2] == "}" || filedata[pos2] == "};")) {
|
2013-01-03 15:22:54 +01:00
|
|
|
if (test(settings, filedata, pos, pos2)) {
|
2012-12-31 12:41:36 +01:00
|
|
|
for (i = pos; i <= pos2; i++)
|
|
|
|
filedata[i].clear();
|
|
|
|
std::cout << "removed block of code at lines " << pos << "-" << pos2 << std::endl;
|
|
|
|
decl = true;
|
2013-01-01 20:18:31 +01:00
|
|
|
changed = true;
|
2012-12-31 12:41:36 +01:00
|
|
|
} else {
|
|
|
|
std::cout << "kept block of code at lines " << pos << "-" << pos2 << std::endl;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-01-01 20:18:31 +01:00
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
|
2013-01-03 15:22:54 +01:00
|
|
|
static bool removeClassAndStructMembers(const ReduceSettings &settings, std::vector<std::string> &filedata)
|
2013-01-01 20:18:31 +01:00
|
|
|
{
|
|
|
|
bool changed = false;
|
|
|
|
|
|
|
|
// remove class and struct members
|
|
|
|
for (std::size_t i = 0; i + 2U < filedata.size(); i++) {
|
|
|
|
if ((filedata[i].compare(0,6,"class ")==0 || filedata[i].compare(0,7,"struct ")==0) && filedata[i].find(";")==std::string::npos && filedata[i+1]=="{") {
|
|
|
|
bool decl = true;
|
|
|
|
for (std::size_t pos = i+2U; pos < filedata.size(); pos++) {
|
|
|
|
const std::string line = filedata[pos];
|
|
|
|
if (line.empty())
|
|
|
|
continue;
|
|
|
|
|
|
|
|
// count { and }
|
|
|
|
unsigned int c1=0, c2=0;
|
|
|
|
for (std::string::size_type c = 0; c < line.size(); c++) {
|
|
|
|
if (line[c] == '{')
|
|
|
|
++c1;
|
|
|
|
else if (line[c] == '}')
|
|
|
|
++c2;
|
|
|
|
}
|
|
|
|
if (c2>0 && (c1!=1 || c2!=1))
|
|
|
|
break;
|
|
|
|
|
|
|
|
const char endChar = line[line.size() - 1U];
|
|
|
|
|
|
|
|
if (decl && (endChar == ';' || (c1==1 && c2==1 && endChar=='}'))) {
|
2013-01-03 15:22:54 +01:00
|
|
|
if (test(settings, filedata, pos)) {
|
2013-01-01 20:18:31 +01:00
|
|
|
std::cout << "removed struct/class declaration at line " << pos << std::endl;
|
|
|
|
filedata[pos].clear();
|
|
|
|
changed = true;
|
|
|
|
} else {
|
|
|
|
std::cout << "kept struct/class declaration at line " << pos << std::endl;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-02 15:37:41 +01:00
|
|
|
if (line[0] != '#') {
|
|
|
|
if (decl && std::isalpha(line[0]) && endChar == ':') {
|
|
|
|
decl = true;
|
|
|
|
for (std::string::size_type linepos = 0U; linepos+1U < line.size(); ++linepos)
|
|
|
|
decl &= (std::isspace(line[linepos]) || std::isalpha(line[linepos]));
|
|
|
|
} else
|
|
|
|
decl = bool(endChar == ';' || endChar == '}');
|
|
|
|
}
|
2013-01-01 20:18:31 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
|
2013-01-03 15:22:54 +01:00
|
|
|
static bool removeIfEndIf(const ReduceSettings &settings, std::vector<std::string> &filedata)
|
2013-01-01 20:18:31 +01:00
|
|
|
{
|
|
|
|
bool changed = false;
|
|
|
|
|
|
|
|
// #if - #endif
|
|
|
|
for (std::size_t i = 0; i < filedata.size(); ++i) {
|
|
|
|
while (filedata[i].compare(0,3,"#if") == 0) {
|
|
|
|
std::size_t pos2 = i + 1;
|
|
|
|
while (pos2 < filedata.size() && filedata[pos2].empty())
|
|
|
|
++pos2;
|
|
|
|
if (pos2 < filedata.size() && filedata[pos2] == "#endif") {
|
2013-01-03 15:22:54 +01:00
|
|
|
if (test(settings, filedata, i, pos2)) {
|
2013-01-01 20:18:31 +01:00
|
|
|
std::cout << "Removed #if - #endif block at lines " << i << "-" << pos2 << std::endl;
|
|
|
|
filedata[i].clear();
|
|
|
|
filedata[pos2].clear();
|
|
|
|
i = 0;
|
|
|
|
changed = true;
|
|
|
|
} else {
|
|
|
|
std::cout << "Kept #if - #endif block at lines " << i << "-" << pos2 << std::endl;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-01-02 17:08:04 +01:00
|
|
|
|
|
|
|
// #ifndef UNUSED_ID
|
|
|
|
for (std::size_t i = 0; i < filedata.size(); ++i) {
|
|
|
|
if (filedata[i].compare(0,8,"#ifndef ") == 0) {
|
|
|
|
bool erase = true;
|
|
|
|
bool def = false;
|
|
|
|
const std::string id(filedata[i].substr(8));
|
|
|
|
for (std::size_t i2 = 0; i2 < filedata.size(); i2++) {
|
|
|
|
if (i2 == i)
|
|
|
|
continue;
|
|
|
|
if (filedata[i2].find(id) != std::string::npos) {
|
|
|
|
if (!def && filedata[i2].compare(0,8,"#define ")==0)
|
|
|
|
def = true;
|
|
|
|
else
|
|
|
|
erase = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (erase) {
|
|
|
|
unsigned int level = 0;
|
|
|
|
for (std::size_t i2 = i + 1U; i2 < filedata.size(); i2++) {
|
|
|
|
if (filedata[i2].compare(0,3,"#if")==0)
|
|
|
|
++level;
|
|
|
|
else if (filedata[i2] == "#else")
|
|
|
|
break;
|
|
|
|
else if (filedata[i2] == "#endif") {
|
|
|
|
if (level > 0)
|
|
|
|
--level;
|
|
|
|
else {
|
|
|
|
std::vector<std::string> filedata2(filedata);
|
|
|
|
filedata2[i].clear();
|
|
|
|
filedata2[i2].clear();
|
|
|
|
|
2013-01-03 15:22:54 +01:00
|
|
|
if (test(settings, filedata2, i)) {
|
2013-01-02 17:08:04 +01:00
|
|
|
std::cout << "Removed #ifndef at line " << i << std::endl;
|
|
|
|
filedata.swap(filedata2);
|
|
|
|
changed = true;
|
|
|
|
} else {
|
|
|
|
std::cout << "Kept #ifndef at line " << i << std::endl;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
|
2013-01-03 15:22:54 +01:00
|
|
|
static bool removeUnusedDefines(const ReduceSettings &settings, std::vector<std::string> &filedata)
|
2013-01-02 17:08:04 +01:00
|
|
|
{
|
|
|
|
bool changed = false;
|
|
|
|
|
|
|
|
for (std::size_t i = 0; i < filedata.size(); ++i) {
|
|
|
|
if (filedata[i].compare(0,8,"#define ")==0 && filedata[i].find("\\")==std::string::npos) {
|
|
|
|
// Try to remove macro..
|
|
|
|
|
2013-01-03 15:22:54 +01:00
|
|
|
if (test(settings, filedata, i)) {
|
2013-01-02 17:08:04 +01:00
|
|
|
std::cout << "Removed #define at line " << i << std::endl;
|
|
|
|
filedata[i].clear();
|
|
|
|
changed = true;
|
|
|
|
} else {
|
|
|
|
std::cout << "Kept #define at line " << i << std::endl;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-01 20:18:31 +01:00
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
|
2013-01-03 15:22:54 +01:00
|
|
|
static bool removeSingleLines(const ReduceSettings &settings, std::vector<std::string> &filedata)
|
|
|
|
{
|
|
|
|
bool changed = false;
|
|
|
|
|
|
|
|
bool decl = true;
|
|
|
|
for (std::size_t i = 0; i < filedata.size(); ++i) {
|
|
|
|
const std::string line = filedata[i];
|
|
|
|
if (line.empty())
|
|
|
|
continue;
|
|
|
|
|
|
|
|
const char endChar = line[line.size() - 1U];
|
|
|
|
if (decl && endChar == ';') {
|
|
|
|
if (test(settings, filedata, i)) {
|
|
|
|
std::cout << "Removed statement at line " << i << std::endl;
|
|
|
|
filedata[i].clear();
|
|
|
|
} else {
|
|
|
|
std::cout << "Kept statement at line " << i << std::endl;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
decl = bool (endChar == ';' || endChar == '{' || endChar == '}');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try to remove stuff from statements
|
|
|
|
static bool cleanupStatements(const ReduceSettings &settings, std::vector<std::string> &filedata)
|
|
|
|
{
|
|
|
|
bool changed = false;
|
|
|
|
|
|
|
|
for (std::size_t i = 0; i < filedata.size(); ++i) {
|
|
|
|
std::string line = filedata[i];
|
|
|
|
if (line.empty())
|
|
|
|
continue;
|
|
|
|
|
|
|
|
for (std::string::size_type pos = 0U; pos < line.size(); ++pos) {
|
|
|
|
|
|
|
|
// function parameter..
|
|
|
|
if (std::strchr("(,", line[pos])) {
|
2013-01-03 18:28:20 +01:00
|
|
|
const std::string::size_type pos1 = (line[pos] == ',') ? pos : (pos + 1U);
|
2013-01-03 15:22:54 +01:00
|
|
|
std::string::size_type pos2 = pos + 1;
|
|
|
|
while (pos2 < line.size() && std::isspace(line[pos2]))
|
|
|
|
++pos2;
|
|
|
|
while (pos2 < line.size() && (std::isalnum(line[pos2]) || line[pos2]=='_'))
|
|
|
|
++pos2;
|
|
|
|
while (pos2 < line.size() && std::isspace(line[pos2]))
|
|
|
|
++pos2;
|
|
|
|
if (pos2 >= pos+2U && pos2<line.size() && std::strchr(",)", line[pos2])) {
|
|
|
|
const std::string backup(filedata[i]);
|
|
|
|
filedata[i] = line.substr(0,pos) + line.substr(pos2);
|
|
|
|
if (test(settings, filedata, ~0U)) {
|
|
|
|
std::cout << "Removed function parameter at line " << i << ", column " << pos1 << std::endl;
|
|
|
|
line = filedata[i];
|
|
|
|
changed = true;
|
2013-01-03 18:28:20 +01:00
|
|
|
continue;
|
2013-01-03 15:22:54 +01:00
|
|
|
} else {
|
|
|
|
std::cout << "Kept function parameter at line " << i << ", column " << pos1 << std::endl;
|
|
|
|
filedata[i] = backup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// cast
|
2013-01-03 18:28:20 +01:00
|
|
|
if (line[pos] == '=' || line[pos] == '(') {
|
2013-01-03 15:22:54 +01:00
|
|
|
const std::string::size_type pos1 = pos + 1;
|
|
|
|
std::string::size_type pos2 = pos + 1;
|
|
|
|
while (pos2 < line.size() && std::isspace(line[pos2]))
|
|
|
|
++pos2;
|
|
|
|
if (pos2>=line.size() || line[pos2]!='(')
|
|
|
|
continue;
|
|
|
|
pos2++;
|
|
|
|
while (pos2 < line.size() && std::isalpha(line[pos2]))
|
|
|
|
++pos2;
|
|
|
|
while (pos2 < line.size() && std::isspace(line[pos2]))
|
|
|
|
++pos2;
|
|
|
|
if (pos2>=line.size() || line[pos2]!='*')
|
|
|
|
continue;
|
|
|
|
while (pos2 < line.size() && line[pos2]=='*')
|
|
|
|
++pos2;
|
|
|
|
if (pos2<line.size() && line[pos2]==')') {
|
|
|
|
pos2++;
|
|
|
|
const std::string backup(filedata[i]);
|
|
|
|
filedata[i] = line.substr(0,pos1) + line.substr(pos2);
|
|
|
|
if (test(settings, filedata, ~0U)) {
|
|
|
|
std::cout << "Removed cast at line " << i << ", column " << pos1 << std::endl;
|
|
|
|
line = filedata[i];
|
|
|
|
changed = true;
|
|
|
|
} else {
|
|
|
|
std::cout << "Kept cast at line " << i << ", column " << pos1 << std::endl;
|
|
|
|
filedata[i] = backup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-01-01 20:18:31 +01:00
|
|
|
int main(int argc, char *argv[])
|
|
|
|
{
|
2013-01-03 15:22:54 +01:00
|
|
|
std::cout << "cppcheck tool that reduce code for a hang / false positive" << std::endl;
|
2013-01-01 20:18:31 +01:00
|
|
|
|
2013-01-07 18:45:29 +01:00
|
|
|
bool print = false;
|
2013-08-18 18:15:46 +02:00
|
|
|
ReduceSettings settings;
|
2013-01-08 07:10:14 +01:00
|
|
|
settings.maxtime = 300; // default timeout = 5 minutes
|
2013-08-19 06:06:53 +02:00
|
|
|
bool def = false;
|
|
|
|
bool maxconfigs = false;
|
2013-01-02 15:37:41 +01:00
|
|
|
|
2014-04-27 18:56:54 +02:00
|
|
|
for (int i = 1; i < argc; i++) {
|
2013-01-02 15:37:41 +01:00
|
|
|
if (strcmp(argv[i], "--stdout") == 0)
|
2013-01-07 18:45:29 +01:00
|
|
|
print = true;
|
2013-08-17 19:46:56 +02:00
|
|
|
else if (strcmp(argv[i], "--hang") == 0)
|
2013-01-03 15:22:54 +01:00
|
|
|
settings.hang = true;
|
2013-08-18 07:24:30 +02:00
|
|
|
else if (strncmp(argv[i],"-D", 2) == 0) {
|
2013-08-18 18:15:46 +02:00
|
|
|
if (!settings.userDefines.empty())
|
2013-08-19 06:06:53 +02:00
|
|
|
settings.userDefines += ";";
|
2013-08-18 07:24:30 +02:00
|
|
|
if ((strcmp(argv[i], "-D") == 0) && (i+1<argc))
|
2013-08-18 18:15:46 +02:00
|
|
|
settings.userDefines += argv[++i];
|
|
|
|
else
|
|
|
|
settings.userDefines += argv[i] + 2;
|
2013-08-19 06:06:53 +02:00
|
|
|
def = true;
|
2013-08-18 18:15:46 +02:00
|
|
|
} else if (std::strncmp(argv[i], "-I", 2) == 0) {
|
|
|
|
std::string path;
|
|
|
|
|
|
|
|
if ((std::strcmp(argv[i], "-I") == 0) && (i+1<argc))
|
|
|
|
path = argv[++i];
|
2013-08-18 07:24:30 +02:00
|
|
|
else
|
2013-08-18 18:15:46 +02:00
|
|
|
path = argv[i] + 2;
|
|
|
|
|
|
|
|
if (!path.empty()) {
|
|
|
|
path = Path::fromNativeSeparators(path);
|
|
|
|
path = Path::removeQuotationMarks(path);
|
|
|
|
|
|
|
|
// If path doesn't end with / or \, add it
|
|
|
|
if (path[path.length()-1] != '/')
|
|
|
|
path += '/';
|
|
|
|
|
|
|
|
settings._includePaths.push_back(path);
|
|
|
|
}
|
|
|
|
} else if (strncmp(argv[i], "--maxtime=", 10) == 0)
|
2013-01-03 15:22:54 +01:00
|
|
|
settings.maxtime = std::atoi(argv[i] + 10);
|
2013-08-18 07:24:30 +02:00
|
|
|
else if (strncmp(argv[i],"--cfg=",6)==0) {
|
2013-08-18 18:15:46 +02:00
|
|
|
if (!settings.userDefines.empty())
|
2013-08-19 06:06:53 +02:00
|
|
|
settings.userDefines += ";";
|
2013-08-18 18:15:46 +02:00
|
|
|
settings.userDefines += argv[i] + 6;
|
|
|
|
} else if (std::strncmp(argv[i], "--platform=", 11) == 0) {
|
|
|
|
std::string platform(11+argv[i]);
|
|
|
|
|
|
|
|
if (platform == "win32A")
|
|
|
|
settings.platform(Settings::Win32A);
|
|
|
|
else if (platform == "win32W")
|
|
|
|
settings.platform(Settings::Win32W);
|
|
|
|
else if (platform == "win64")
|
|
|
|
settings.platform(Settings::Win64);
|
|
|
|
else if (platform == "unix32")
|
|
|
|
settings.platform(Settings::Unix32);
|
|
|
|
else if (platform == "unix64")
|
|
|
|
settings.platform(Settings::Unix64);
|
|
|
|
else {
|
|
|
|
std::cerr << "unrecognized platform: " << platform << std::endl;
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
}
|
|
|
|
} else if (std::strcmp(argv[i], "--debug-warnings") == 0)
|
|
|
|
settings.debugwarnings = true;
|
2013-08-19 06:06:53 +02:00
|
|
|
else if (std::strcmp(argv[i], "-f") == 0 || std::strcmp(argv[i], "--force") == 0)
|
|
|
|
settings._force = true;
|
|
|
|
else if (std::strncmp(argv[i], "--enable=", 9) == 0) {
|
|
|
|
std::string errmsg = settings.addEnabled(argv[i] + 9);
|
|
|
|
if (!errmsg.empty()) {
|
|
|
|
errmsg.erase(0, 11); // erase "cppcheck: " from message
|
|
|
|
std::cerr << errmsg << std::endl;
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
}
|
|
|
|
// when "style" is enabled, also enable "warning", "performance" and "portability"
|
|
|
|
if (settings.isEnabled("style")) {
|
|
|
|
settings.addEnabled("warning");
|
|
|
|
settings.addEnabled("performance");
|
|
|
|
settings.addEnabled("portability");
|
|
|
|
}
|
|
|
|
} else if (std::strcmp(argv[i], "--inconclusive") == 0)
|
|
|
|
settings.inconclusive = true;
|
|
|
|
else if (std::strncmp(argv[i], "--max-configs=", 14) == 0) {
|
|
|
|
settings._force = false;
|
|
|
|
|
|
|
|
std::istringstream iss(14+argv[i]);
|
|
|
|
if (!(iss >> settings._maxConfigs)) {
|
|
|
|
std::cerr << "argument to '--max-configs=' is not a number." << std::endl;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (settings._maxConfigs < 1) {
|
|
|
|
std::cerr << "argument to '--max-configs=' must be greater than 0." << std::endl;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
maxconfigs = true;
|
2015-11-30 22:13:49 +01:00
|
|
|
} else if (settings.filename==nullptr && strchr(argv[i],'.'))
|
2013-01-03 15:22:54 +01:00
|
|
|
settings.filename = argv[i];
|
|
|
|
else if (settings.linenr == 0U && MathLib::isInt(argv[i]))
|
|
|
|
settings.linenr = std::atoi(argv[i]);
|
2013-01-02 15:37:41 +01:00
|
|
|
else {
|
|
|
|
std::cerr << "invalid option " << argv[i] << std::endl;
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
}
|
2013-01-01 20:18:31 +01:00
|
|
|
}
|
|
|
|
|
2013-08-19 06:06:53 +02:00
|
|
|
if (def && !settings._force && !maxconfigs)
|
|
|
|
settings._maxConfigs = 1U;
|
|
|
|
|
|
|
|
if (settings._force)
|
|
|
|
settings._maxConfigs = ~0U;
|
|
|
|
|
2015-11-30 22:13:49 +01:00
|
|
|
if ((!settings.hang && settings.linenr == 0U) || settings.filename == nullptr) {
|
2013-01-02 15:37:41 +01:00
|
|
|
std::cerr << "Syntax:" << std::endl
|
2013-08-19 06:06:53 +02:00
|
|
|
<< argv[0] << " [--stdout] [--cfg=X] [--hang] [--maxtime=60] [-D define] [-I includepath] [--force] [--enable=<id>] [--inconclusive] [--debug-warnings] [--max-configs=<limit>] filename [linenr]" << std::endl;
|
2013-01-02 15:37:41 +01:00
|
|
|
return EXIT_FAILURE;
|
|
|
|
}
|
2013-01-01 20:18:31 +01:00
|
|
|
|
2013-01-03 15:22:54 +01:00
|
|
|
std::cout << "make sure " << (settings.hang ? "hang" : "false positive") << " can be reproduced" << std::endl;
|
2013-01-01 20:18:31 +01:00
|
|
|
|
|
|
|
// Execute Cppcheck on the file..
|
|
|
|
{
|
2013-08-18 18:15:46 +02:00
|
|
|
CppcheckExecutor cppcheck(settings);
|
2013-01-03 15:22:54 +01:00
|
|
|
if (!cppcheck.run(settings.filename, settings.maxtime)) {
|
|
|
|
std::cerr << "Can't reproduce false positive at line " << settings.linenr << std::endl;
|
2013-01-01 20:18:31 +01:00
|
|
|
return EXIT_FAILURE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Read file..
|
2013-01-03 15:22:54 +01:00
|
|
|
std::vector<std::string> filedata(readfile(settings.filename));
|
2013-01-01 20:18:31 +01:00
|
|
|
|
|
|
|
// Write resulting code..
|
2013-01-03 15:22:54 +01:00
|
|
|
if (!test(settings, filedata, ~0)) {
|
2013-01-01 20:18:31 +01:00
|
|
|
std::cerr << "Cleanup failed." << std::endl;
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Remove includes..
|
|
|
|
std::set<std::string> headers;
|
|
|
|
for (std::size_t i = 0; i < filedata.size(); i++) {
|
|
|
|
if (filedata[i].compare(0,8,"#include")==0) {
|
2013-01-03 15:22:54 +01:00
|
|
|
if (test(settings, filedata, i)) {
|
2013-01-01 20:18:31 +01:00
|
|
|
std::cout << "removed #include : " << filedata[i] << std::endl;
|
|
|
|
filedata[i].clear();
|
|
|
|
} else {
|
|
|
|
std::string header = filedata[i];
|
|
|
|
header = header.substr(1U + header.find_first_of("\"<"));
|
|
|
|
header = header.erase(header.find_last_of("\">"));
|
|
|
|
if (headers.find(header) != headers.end()) {
|
|
|
|
std::cerr << "Failed to reduce headers" << std::endl;
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
}
|
|
|
|
headers.insert(header);
|
2013-01-03 15:22:54 +01:00
|
|
|
std::string path(settings.filename);
|
2013-01-01 20:18:31 +01:00
|
|
|
if (path.find_first_of("\\/") != std::string::npos)
|
|
|
|
path = path.erase(1 + path.find_last_of("\\/"));
|
|
|
|
else
|
|
|
|
path.clear();
|
|
|
|
std::cout << "expand #include : " << (path+header) << std::endl;
|
|
|
|
std::vector<std::string> data(readfile(path+header));
|
|
|
|
if (!data.empty()) {
|
|
|
|
filedata[i].clear();
|
|
|
|
filedata.insert(filedata.begin()+i, data.begin(), data.end());
|
2013-01-03 15:22:54 +01:00
|
|
|
settings.linenr += data.size();
|
2013-01-01 20:18:31 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bool changed = true;
|
|
|
|
while (changed) {
|
|
|
|
changed = false;
|
2013-01-03 15:22:54 +01:00
|
|
|
changed |= removeMacrosInGlobalScope(settings,filedata);
|
|
|
|
changed |= removeBlocksOfCode(settings,filedata);
|
|
|
|
changed |= removeClassAndStructMembers(settings,filedata);
|
|
|
|
changed |= removeIfEndIf(settings,filedata);
|
|
|
|
changed |= removeUnusedDefines(settings,filedata);
|
|
|
|
|
|
|
|
if (settings.hang) {
|
|
|
|
changed |= removeSingleLines(settings,filedata);
|
|
|
|
changed |= cleanupStatements(settings,filedata);
|
|
|
|
}
|
2013-01-01 20:18:31 +01:00
|
|
|
}
|
2012-12-31 12:41:36 +01:00
|
|
|
|
|
|
|
// Write resulting code..
|
|
|
|
{
|
2013-01-03 15:22:54 +01:00
|
|
|
const std::string outfilename(std::string("__out__") + std::strrchr(settings.filename,'.'));
|
2013-01-02 15:37:41 +01:00
|
|
|
std::ofstream fout;
|
2013-01-07 18:45:29 +01:00
|
|
|
if (!print)
|
2013-01-02 15:37:41 +01:00
|
|
|
fout.open(outfilename.c_str());
|
2013-01-17 21:02:52 +01:00
|
|
|
std::ostream &os = print ? std::cout : fout;
|
2012-12-31 12:41:36 +01:00
|
|
|
for (std::size_t i = 0; i < filedata.size(); i++) {
|
|
|
|
if (!filedata[i].empty())
|
2013-01-02 15:37:41 +01:00
|
|
|
os << filedata[i] << std::endl;
|
2012-12-31 12:41:36 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return EXIT_SUCCESS;
|
|
|
|
}
|