walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'master' of http://github.com/danmar/cppcheck

This commit is contained in:
Sébastien Debrard 2011-02-10 20:21:43 +01:00
parent a8ca439b7a 2900d44ff0
commit 48a4efad90
16 changed files with 305 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gui/test/main.cpp
View File

@ -20,6 +20,8 @@
#include <QtTest> #include <QtTest>
#include "testtranslationhandler.h" #include "testtranslationhandler.h"
#include "testxmlreport.h" #include "testxmlreport.h"
#include "testxmlreportv1.h"
#include "testxmlreportv2.h"
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -31,5 +33,11 @@ int main(int argc, char *argv[])
TestXmlReport testXmlReport; TestXmlReport testXmlReport;
QTest::qExec(&testXmlReport); QTest::qExec(&testXmlReport);
TestXmlReportV1 testXmlReportV1;
QTest::qExec(&testXmlReportV1);
TestXmlReportV2 testXmlReportV2;
QTest::qExec(&testXmlReportV2);
return a.exec(); return a.exec();
} }

30
gui/test/test.pro
View File

@ -2,21 +2,37 @@ TEMPLATE = app
TARGET = test TARGET = test
CONFIG += qtestlib CONFIG += qtestlib
DEPENDPATH += . .. DEPENDPATH += . ..
INCLUDEPATH += . .. INCLUDEPATH += . .. ../../lib
LIBS += -L../../externals -lpcre
INCLUDEPATH += ../../externals
BASEPATH = ../../lib/
include($$PWD/../../lib/lib.pri)
# tests # tests
SOURCES += main.cpp \ SOURCES += main.cpp \
testtranslationhandler.cpp \ testtranslationhandler.cpp \
testxmlreport.cpp testxmlreport.cpp \
testxmlreportv1.cpp \
testxmlreportv2.cpp
HEADERS += testtranslationhandler.h \ HEADERS += testtranslationhandler.h \
testxmlreport.h testxmlreport.h \
testxmlreportv1.h \
testxmlreportv2.h
# GUI # GUI
SOURCES += report.cpp \ SOURCES += ../erroritem.cpp \
../report.cpp \
../translationhandler.cpp \ ../translationhandler.cpp \
../xmlreport.cpp ../xmlreport.cpp \
../xmlreportv1.cpp \
../xmlreportv2.cpp
HEADERS += report.h \ HEADERS += ../erroritem.h \
../report.h \
../translationhandler.h \ ../translationhandler.h \
../xmlreport.h ../xmlreport.h \
../xmlreportv1.h \
../xmlreportv2.h

15
gui/test/testxmlreport.cpp
View File

@ -25,13 +25,24 @@ void TestXmlReport::testQuoteMessage()
{ {
const QString toQuote("abcdefgh&\"'<>12345"); const QString toQuote("abcdefgh&\"'<>12345");
const QString quoted("abcdefgh&amp;&quot;&#039;&lt;&gt;12345"); const QString quoted("abcdefgh&amp;&quot;&#039;&lt;&gt;12345");
QCOMPARE(quoted, XmlReport::quoteMessage(toQuote)); QCOMPARE(XmlReport::quoteMessage(toQuote), quoted);
} }
void TestXmlReport::testUnquoteMessage() void TestXmlReport::testUnquoteMessage()
{ {
const QString toQuote("abcdefgh&\"'<>12345"); const QString toQuote("abcdefgh&\"'<>12345");
const QString quoted("abcdefgh&amp;&quot;&#039;&lt;&gt;12345"); const QString quoted("abcdefgh&amp;&quot;&#039;&lt;&gt;12345");
QCOMPARE(toQuote, XmlReport::unquoteMessage(quoted)); QCOMPARE(XmlReport::unquoteMessage(quoted), toQuote);
} }
void TestXmlReport::testGetVersion1()
{
const QString filepath("xmlfiles/xmlreport_v1.xml");
QCOMPARE(XmlReport::determineVersion(filepath), 1);
}
void TestXmlReport::testGetVersion2()
{
const QString filepath("xmlfiles/xmlreport_v2.xml");
QCOMPARE(XmlReport::determineVersion(filepath), 2);
}

2
gui/test/testxmlreport.h
View File

@ -26,4 +26,6 @@ class TestXmlReport: public QObject
private slots: private slots:
void testQuoteMessage(); void testQuoteMessage();
void testUnquoteMessage(); void testUnquoteMessage();
void testGetVersion1();
void testGetVersion2();
}; };

40
gui/test/testxmlreportv1.cpp Normal file
View File

@ -0,0 +1,40 @@
/*
* Cppcheck - A tool for static C/C++ code analysis
* Copyright (C) 2007-2011 Daniel Marjamäki and Cppcheck team.
*
* 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/>.
*/
#include <QtTest>
#include <QObject>
#include "testxmlreportv1.h"
#include "xmlreportv1.h"
#include "erroritem.h"
void TestXmlReportV1::readXml()
{
const QString filepath("xmlfiles/xmlreport_v1.xml");
XmlReportV1 report(filepath);
QVERIFY(report.Open());
QList<ErrorItem> errors = report.Read();
QCOMPARE(6, errors.size());
ErrorItem item = errors[0];
QCOMPARE(item.file, QString("test.cxx"));
QCOMPARE(item.lines[0], (unsigned int)11);
QCOMPARE(item.id, QString("unreadVariable"));
QCOMPARE(item.severity, QString("Style"));
QCOMPARE(item.summary, QString("Variable 'a' is assigned a value that is never used"));
QCOMPARE(item.message, QString("Variable 'a' is assigned a value that is never used"));
}

28
gui/test/testxmlreportv1.h Normal file
View File

@ -0,0 +1,28 @@
/*
* Cppcheck - A tool for static C/C++ code analysis
* Copyright (C) 2007-2011 Daniel Marjamäki and Cppcheck team.
*
* 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/>.
*/
#include <QtTest>
#include <QObject>
class TestXmlReportV1: public QObject
{
Q_OBJECT
private slots:
void readXml();
};

56
gui/test/testxmlreportv2.cpp Normal file
View File

@ -0,0 +1,56 @@
/*
* Cppcheck - A tool for static C/C++ code analysis
* Copyright (C) 2007-2011 Daniel Marjamäki and Cppcheck team.
*
* 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/>.
*/
#include <QtTest>
#include <QObject>
#include "testxmlreportv2.h"
#include "xmlreportv2.h"
#include "erroritem.h"
void TestXmlReportV2::readXml()
{
const QString filepath("xmlfiles/xmlreport_v2.xml");
XmlReportV2 report(filepath);
QVERIFY(report.Open());
QList<ErrorItem> errors = report.Read();
QCOMPARE(6, errors.size());
ErrorItem item = errors[0];
QCOMPARE(item.file, QString("test.cxx"));
QCOMPARE(item.files.size(), 1);
QCOMPARE(item.lines.size(), 1);
QCOMPARE(item.files[0], QString("test.cxx"));
QCOMPARE(item.lines[0], (unsigned int)11);
QCOMPARE(item.id, QString("unreadVariable"));
QCOMPARE(item.severity, QString("style"));
QCOMPARE(item.summary, QString("Variable 'a' is assigned a value that is never used"));
QCOMPARE(item.message, QString("Variable 'a' is assigned a value that is never used"));
ErrorItem item2 = errors[3];
QCOMPARE(item2.file, QString("test.cxx"));
QCOMPARE(item2.files.size(), 2);
QCOMPARE(item2.lines.size(), 2);
QCOMPARE(item2.files[0], QString("test.cxx"));
QCOMPARE(item2.lines[0], (unsigned int)32);
QCOMPARE(item2.files[1], QString("test.cxx"));
QCOMPARE(item2.lines[1], (unsigned int)16);
QCOMPARE(item2.id, QString("mismatchAllocDealloc"));
QCOMPARE(item2.severity, QString("error"));
QCOMPARE(item2.summary, QString("Mismatching allocation and deallocation: k"));
QCOMPARE(item2.message, QString("Mismatching allocation and deallocation: k"));
}

28
gui/test/testxmlreportv2.h Normal file
View File

@ -0,0 +1,28 @@
/*
* Cppcheck - A tool for static C/C++ code analysis
* Copyright (C) 2007-2011 Daniel Marjamäki and Cppcheck team.
*
* 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/>.
*/
#include <QtTest>
#include <QObject>
class TestXmlReportV2: public QObject
{
Q_OBJECT
private slots:
void readXml();
};

9
gui/test/xmlfiles/xmlreport_v1.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<results>
<error file="test.cxx" line="11" id="unreadVariable" severity="Style" msg="Variable &amp;#039;a&amp;#039; is assigned a value that is never used"/>
<error file="test.cxx" line="28" id="unreadVariable" severity="Style" msg="Variable &amp;#039;b&amp;#039; is assigned a value that is never used"/>
<error file="test.cxx" line="31" id="memleak" severity="Error" msg="Memory leak: b"/>
<error file="test.cxx" line="16" id="mismatchAllocDealloc" severity="Error" msg="Mismatching allocation and deallocation: k"/>
<error file="test.cxx" line="31" id="obsoleteFunctionsgets" severity="Style" msg="Found obsolete function &amp;#039;gets&amp;#039;. With gets you&amp;#039;ll get buffer overruns if the input data too big for the buffer. It is recommended to use the function &amp;#039;fgets&amp;#039; instead."/>
<error file="test.cxx" line="22" id="postfixOperator" severity="performance" msg="Prefix ++/-- operators should be preferred for non-primitive types. Pre-increment/decrement can be more efficient than post-increment/decrement. Post-increment/decrement usually involves keeping a copy of the previous value around and adds a little extra code."/>
</results>

25
gui/test/xmlfiles/xmlreport_v2.xml Normal file
View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<results version="2">
<cppcheck version="1.47"/>
<errors>
<error id="unreadVariable" severity="style" msg="Variable &amp;#039;a&amp;#039; is assigned a value that is never used" verbose="Variable &amp;#039;a&amp;#039; is assigned a value that is never used">
<location file="test.cxx" line="11"/>
</error>
<error id="unreadVariable" severity="style" msg="Variable &amp;#039;b&amp;#039; is assigned a value that is never used" verbose="Variable &amp;#039;b&amp;#039; is assigned a value that is never used">
<location file="test.cxx" line="28"/>
</error>
<error id="memleak" severity="error" msg="Memory leak: b" verbose="Memory leak: b">
<location file="test.cxx" line="31"/>
</error>
<error id="mismatchAllocDealloc" severity="error" msg="Mismatching allocation and deallocation: k" verbose="Mismatching allocation and deallocation: k">
<location file="test.cxx" line="32"/>
<location file="test.cxx" line="16"/>
</error>
<error id="obsoleteFunctionsgets" severity="style" msg="Found obsolete function &amp;#039;gets&amp;#039;. It is recommended to use the function &amp;#039;fgets&amp;#039; instead" verbose="Found obsolete function &amp;#039;gets&amp;#039;. With gets you&amp;#039;ll get buffer overruns if the input data too big for the buffer. It is recommended to use the function &amp;#039;fgets&amp;#039; instead.">
<location file="test.cxx" line="31"/>
</error>
<error id="postfixOperator" severity="performance" msg="Prefer prefix ++/-- operators for non-primitive types." verbose="Prefix ++/-- operators should be preferred for non-primitive types. Pre-increment/decrement can be more efficient than post-increment/decrement. Post-increment/decrement usually involves keeping a copy of the previous value around and adds a little extra code.">
<location file="test.cxx" line="22"/>
</error>
</errors>
</results>

1
gui/xmlreportv2.h
View File

@ -26,6 +26,7 @@
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include <QXmlStreamWriter> #include <QXmlStreamWriter>
#include "report.h" #include "report.h"
#include "xmlreport.h"
/// @addtogroup GUI /// @addtogroup GUI
/// @{ /// @{

2
lib/symboldatabase.cpp
View File

@ -583,7 +583,7 @@ bool SymbolDatabase::isFunction(const Token *tok, const Token **funcStart, const
// regular function? // regular function?
else if (Token::Match(tok, "%var% (") && else if (Token::Match(tok, "%var% (") &&
(Token::Match(tok->next()->link(), ") const| ;|{|=") || (Token::Match(tok->next()->link(), ") const| ;|{|=") ||
Token::Match(tok->next()->link(), ") : %var% ("))) Token::Match(tok->next()->link(), ") : %var% (|::")))
{ {
*funcStart = tok; *funcStart = tok;
*argStart = tok->next(); *argStart = tok->next();

276
lib/tokenize.cpp
View File

@ -246,6 +246,36 @@ void Tokenizer::insertTokens(Token *dest, const Token *src, unsigned int n)
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
Token *Tokenizer::copyTokens(Token *dest, const Token *first, const Token *last)
{
std::stack<Token *> links;
Token *tok2 = dest;
for (const Token *tok = first; tok != last->next(); tok = tok->next())
{
tok2->insertToken(tok->str());
tok2 = tok2->next();
tok2->fileIndex(dest->fileIndex());
tok2->linenr(dest->linenr());
tok2->isUnsigned(tok->isUnsigned());
tok2->isSigned(tok->isSigned());
tok2->isLong(tok->isLong());
// Check for links and fix them up
if (tok2->str() == "(" || tok2->str() == "[" || tok2->str() == "{")
links.push(tok2);
else if (tok2->str() == ")" || tok2->str() == "]" || tok2->str() == "}")
{
Token * link = links.top();
tok2->link(link);
link->link(tok2);
links.pop();
}
}
return tok2;
}
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Tokenize - tokenizes a given file. // Tokenize - tokenizes a given file.
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -1412,26 +1442,7 @@ void Tokenizer::simplifyTypedef()
// start substituting at the typedef name by replacing it with the type // start substituting at the typedef name by replacing it with the type
tok2->str(typeStart->str()); tok2->str(typeStart->str());
Token * nextToken; tok2 = copyTokens(tok2, typeStart->next(), typeEnd);
std::stack<Token *> links;
for (nextToken = typeStart->next(); nextToken != typeEnd->next(); nextToken = nextToken->next())
{
tok2->insertToken(nextToken->str());
tok2 = tok2->next();
// Check for links and fix them up
if (tok2->str() == "(" || tok2->str() == "[")
links.push(tok2);
if (tok2->str() == ")" || tok2->str() == "]")
{
Token * link = links.top();
tok2->link(link);
link->link(tok2);
links.pop();
}
}
if (!pointers.empty()) if (!pointers.empty())
{ {
@ -1448,25 +1459,7 @@ void Tokenizer::simplifyTypedef()
tok2->insertToken("("); tok2->insertToken("(");
tok2 = tok2->next(); tok2 = tok2->next();
Token *tok3 = tok2; Token *tok3 = tok2;
Token *nextTok; tok2 = copyTokens(tok2, funcStart, funcEnd);
for (nextTok = funcStart; nextTok != funcEnd->next(); nextTok = nextTok->next())
{
tok2->insertToken(nextTok->str());
tok2 = tok2->next();
// Check for links and fix them up
if (tok2->str() == "(" || tok2->str() == "[")
links.push(tok2);
if (tok2->str() == ")" || tok2->str() == "]")
{
Token * link = links.top();
tok2->link(link);
link->link(tok2);
links.pop();
}
}
if (!inCast) if (!inCast)
{ {
@ -1517,30 +1510,7 @@ void Tokenizer::simplifyTypedef()
tok2 = tok2->next(); tok2 = tok2->next();
Token::createMutualLinks(tok2, tok3); Token::createMutualLinks(tok2, tok3);
tok2->insertToken("("); tok2 = copyTokens(tok2, argStart, argEnd);
tok2 = tok2->next();
tok3 = tok2;
for (nextTok = argStart->next(); nextTok != argEnd; nextTok = nextTok->next())
{
tok2->insertToken(nextTok->str());
tok2 = tok2->next();
// Check for links and fix them up
if (tok2->str() == "(" || tok2->str() == "[")
links.push(tok2);
if (tok2->str() == ")" || tok2->str() == "]")
{
Token * link = links.top();
tok2->link(link);
link->link(tok2);
links.pop();
}
}
tok2->insertToken(")");
tok2 = tok2->next();
Token::createMutualLinks(tok2, tok3);
if (specStart) if (specStart)
{ {
@ -1652,32 +1622,7 @@ void Tokenizer::simplifyTypedef()
Token::createMutualLinks(tok2, tok3); Token::createMutualLinks(tok2, tok3);
} }
tok2->insertToken("("); tok2 = copyTokens(tok2, argStart, argEnd);
tok2 = tok2->next();
tok3 = tok2;
Token * nextArgTok;
std::stack<Token *> argLinks;
for (nextArgTok = argStart->next(); nextArgTok != argEnd; nextArgTok = nextArgTok->next())
{
tok2->insertToken(nextArgTok->str());
tok2 = tok2->next();
// Check for links and fix them up
if (tok2->str() == "(" || tok2->str() == "[")
argLinks.push(tok2);
if (tok2->str() == ")" || tok2->str() == "]")
{
Token * link = argLinks.top();
tok2->link(link);
link->link(tok2);
argLinks.pop();
}
}
tok2->insertToken(")");
tok2 = tok2->next();
Token::createMutualLinks(tok2, tok3);
if (inTemplate) if (inTemplate)
tok2 = tok2->next(); tok2 = tok2->next();
@ -1727,64 +1672,13 @@ void Tokenizer::simplifyTypedef()
Token::createMutualLinks(tok2, tok4); Token::createMutualLinks(tok2, tok4);
} }
tok2->insertToken("("); tok2 = copyTokens(tok2, argStart, argEnd);
tok2 = tok2->next();
Token *tok5 = tok2;
Token *nextArgTok;
std::stack<Token *> argLinks;
for (nextArgTok = argStart->next(); nextArgTok != argEnd; nextArgTok = nextArgTok->next())
{
tok2->insertToken(nextArgTok->str());
tok2 = tok2->next();
// Check for links and fix them up
if (tok2->str() == "(" || tok2->str() == "[")
argLinks.push(tok2);
if (tok2->str() == ")" || tok2->str() == "]")
{
Token * link = argLinks.top();
tok2->link(link);
link->link(tok2);
argLinks.pop();
}
}
tok2->insertToken(")");
tok2 = tok2->next();
Token::createMutualLinks(tok2, tok5);
tok2->insertToken(")"); tok2->insertToken(")");
tok2 = tok2->next(); tok2 = tok2->next();
Token::createMutualLinks(tok2, tok3); Token::createMutualLinks(tok2, tok3);
tok2->insertToken("("); tok2 = copyTokens(tok2, argFuncRetStart, argFuncRetEnd);
tok2 = tok2->next();
Token *tok6 = tok2;
for (nextArgTok = argFuncRetStart->next(); nextArgTok != argFuncRetEnd; nextArgTok = nextArgTok->next())
{
tok2->insertToken(nextArgTok->str());
tok2 = tok2->next();
// Check for links and fix them up
if (tok2->str() == "(" || tok2->str() == "[")
argLinks.push(tok2);
if (tok2->str() == ")" || tok2->str() == "]")
{
Token * link = argLinks.top();
tok2->link(link);
link->link(tok2);
argLinks.pop();
}
}
tok2->insertToken(")");
tok2 = tok2->next();
Token::createMutualLinks(tok2, tok6);
} }
else if (ptrToArray || refToArray) else if (ptrToArray || refToArray)
{ {
@ -1857,33 +1751,7 @@ void Tokenizer::simplifyTypedef()
} }
else if (typeOf) else if (typeOf)
{ {
tok2->insertToken("("); tok2 = copyTokens(tok2, argStart, argEnd);
tok2 = tok2->next();
Token *tok3 = tok2;
Token *nextArgTok;
std::stack<Token *> argLinks;
for (nextArgTok = argStart->next(); nextArgTok != argEnd; nextArgTok = nextArgTok->next())
{
tok2->insertToken(nextArgTok->str());
tok2 = tok2->next();
// Check for links and fix them up
if (tok2->str() == "(" || tok2->str() == "[")
argLinks.push(tok2);
if (tok2->str() == ")" || tok2->str() == "]")
{
Token * link = argLinks.top();
tok2->link(link);
link->link(tok2);
argLinks.pop();
}
}
tok2->insertToken(")");
tok2 = tok2->next();
Token::createMutualLinks(tok2, tok3);
} }
else if (tok2->tokAt(2) && tok2->tokAt(2)->str() == "[") else if (tok2->tokAt(2) && tok2->tokAt(2)->str() == "[")
{ {
@ -1897,27 +1765,7 @@ void Tokenizer::simplifyTypedef()
{ {
if (!inCast && !inSizeof) if (!inCast && !inSizeof)
tok2 = tok2->next(); tok2 = tok2->next();
Token * nextArrTok; tok2 = copyTokens(tok2, arrayStart, arrayEnd);
std::stack<Token *> arrLinks;
for (nextArrTok = arrayStart; nextArrTok != arrayEnd->next(); nextArrTok = nextArrTok->next())
{
tok2->insertToken(nextArrTok->str());
tok2 = tok2->next();
// Check for links and fix them up
if (tok2->str() == "(" || tok2->str() == "[")
arrLinks.push(tok2);
if (tok2->str() == ")" || tok2->str() == "]")
{
Token * link = arrLinks.top();
tok2->link(link);
link->link(tok2);
arrLinks.pop();
}
}
tok2 = tok2->next(); tok2 = tok2->next();
if (tok2->str() == "=") if (tok2->str() == "=")
@ -7691,26 +7539,8 @@ void Tokenizer::simplifyEnum()
if (lastEnumValueStart && lastEnumValueEnd) if (lastEnumValueStart && lastEnumValueEnd)
{ {
// previous value was an expression // previous value was an expression
Token * valueStart = tok1; Token *valueStart = tok1;
std::stack<Token *> links; tok1 = copyTokens(tok1, lastEnumValueStart, lastEnumValueEnd);
for (Token *tok2 = lastEnumValueStart; tok2 != lastEnumValueEnd->next(); tok2 = tok2->next())
{
tok1->insertToken(tok2->str());
tok1 = tok1->next();
// Check for links and fix them up
if (tok1->str() == "(" || tok1->str() == "[" || tok1->str() == "{")
links.push(tok1);
else if (tok1->str() == ")" || tok1->str() == "]" || tok1->str() == "}")
{
Token * link = links.top();
tok1->link(link);
link->link(tok1);
links.pop();
}
}
// value is previous expression + 1 // value is previous expression + 1
tok1->insertToken("+"); tok1->insertToken("+");
@ -7852,29 +7682,9 @@ void Tokenizer::simplifyEnum()
tok2->str(enumValue->str()); tok2->str(enumValue->str());
else else
{ {
std::stack<Token *> links; tok2 = tok2->previous();
tok2->str(enumValueStart->str()); tok2->deleteNext();
if (tok2->str() == "(" || tok2->str() == "[" || tok2->str() == "{") tok2 = copyTokens(tok2, enumValueStart, enumValueEnd);
links.push(tok2);
Token * nextToken = enumValueStart->next();
for (; nextToken != enumValueEnd->next(); nextToken = nextToken->next())
{
tok2->insertToken(nextToken->str());
tok2 = tok2->next();
// Check for links and fix them up
if (tok2->str() == "(" || tok2->str() == "[" || tok2->str() == "{")
links.push(tok2);
else if (tok2->str() == ")" || tok2->str() == "]" || tok2->str() == "}")
{
Token * link = links.top();
tok2->link(link);
link->link(tok2);
links.pop();
}
}
} }
if (hasClass) if (hasClass)

9
lib/tokenize.h
View File

@ -450,6 +450,15 @@ public:
void insertTokens(Token *dest, const Token *src, unsigned int n); void insertTokens(Token *dest, const Token *src, unsigned int n);
/**
* Copy tokens.
* @param dest destination token where copied tokens will be inserted after
* @param first first token to copy
* @param last last token to copy
* @return new location of last token copied
*/
Token *copyTokens(Token *dest, const Token *first, const Token *last);
/** /**
* Send error message to error logger about internal bug. * Send error message to error logger about internal bug.
* @param tok the token that this bug concerns. * @param tok the token that this bug concerns.

18
test/testconstructors.cpp
View File

@ -60,6 +60,7 @@ private:
TEST_CASE(simple2); TEST_CASE(simple2);
TEST_CASE(simple3); TEST_CASE(simple3);
TEST_CASE(simple4); TEST_CASE(simple4);
TEST_CASE(simple5); // ticket #2560
TEST_CASE(initvar_with_this); // BUG 2190300 TEST_CASE(initvar_with_this); // BUG 2190300
TEST_CASE(initvar_if); // BUG 2190290 TEST_CASE(initvar_if); // BUG 2190290
@ -258,6 +259,23 @@ private:
ASSERT_EQUALS("[test.cpp:7]: (warning) Member variable 'Fred::i' is not initialised in the constructor.\n", errout.str()); ASSERT_EQUALS("[test.cpp:7]: (warning) Member variable 'Fred::i' is not initialised in the constructor.\n", errout.str());
} }
void simple5() // ticket #2560
{
check("namespace Nsp\n"
"{\n"
" class B { };\n"
"}\n"
"class Altren : public Nsp::B\n"
"{\n"
"public:\n"
" Altren () : Nsp::B(), mValue(0)\n"
" {\n"
" }\n"
"private:\n"
" int mValue;\n"
"};");
ASSERT_EQUALS("", errout.str());
}
void initvar_with_this() void initvar_with_this()
{ {

2
tools/dmake.cpp
View File

@ -26,7 +26,7 @@
#include <sstream> #include <sstream>
#if defined(_WIN32) #if defined(_WIN32)
#include "../cli/fileLister_win32.h" #include "../cli/filelister_win32.h"
#else // POSIX-style system #else // POSIX-style system
#include "../cli/filelister_unix.h" #include "../cli/filelister_unix.h"
#endif #endif