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

#7490 sizeof('a') should be sizeof(int) in C mode. Previous fix was hardcoding 4 for C.

This commit is contained in:
Alexander Mai 2016-05-14 22:52:43 +02:00
parent 4816394511
commit 9d1302d523
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenize.cpp
View File

@ -3217,7 +3217,7 @@ bool Tokenizer::simplifySizeof()
tok->deleteThis(); tok->deleteThis();
tok->deleteNext(); tok->deleteNext();
std::ostringstream sz; std::ostringstream sz;
sz << ((isC()) ? 4 : 1) ; // #7490 sizeof('a') should be 4 in C mode sz << ((isC()) ? _settings->sizeof_int : 1) ; // #7490 sizeof('a') should be sizeof(int) in C mode
tok->str(sz.str()); tok->str(sz.str());
ret = true; ret = true;
continue; continue;

6
test/testtokenize.cpp
View File

@ -23,7 +23,7 @@
#include "path.h" #include "path.h"
#include "preprocessor.h" // usually tests here should not use preprocessor... #include "preprocessor.h" // usually tests here should not use preprocessor...
#include <cstring> #include <cstring>
#include <sstream>
class TestTokenizer : public TestFixture { class TestTokenizer : public TestFixture {
public: public:
@ -5878,7 +5878,9 @@ private:
} }
void sizeOfCharLiteral() { // #7490 sizeof('a') should be 4 in C mode void sizeOfCharLiteral() { // #7490 sizeof('a') should be 4 in C mode
ASSERT_EQUALS("unsigned long a ; a = 4 ;", std::stringstream expected;
expected << "unsigned long a ; a = " << settings1.sizeof_int << " ;";
ASSERT_EQUALS(expected.str(),
tokenizeAndStringify("unsigned long a = sizeof('x');", true, true, Settings::Native, "test.c", false)); tokenizeAndStringify("unsigned long a = sizeof('x');", true, true, Settings::Native, "test.c", false));
ASSERT_EQUALS("unsigned long a ; a = 1 ;", ASSERT_EQUALS("unsigned long a ; a = 1 ;",
tokenizeAndStringify("unsigned long a = sizeof('x');", true, true, Settings::Native, "test.cpp", true)); tokenizeAndStringify("unsigned long a = sizeof('x');", true, true, Settings::Native, "test.cpp", true));