Skip to content

Commit 1ce9a10

Browse files
firewavefirewave
committed
removed support for #file/#endfile [skip ci]
1 parent 21163e8 commit 1ce9a10

File tree

7 files changed

+105
-79
lines changed

7 files changed

+105
-79
lines changed

‎lib/cppcheck.cpp‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,15 +1124,7 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
11241124
codeWithoutCfg = preprocessor.getcode(currentConfig, files, true);
11251125
});
11261126

1127-
if (startsWith(codeWithoutCfg,"#file"))
1128-
codeWithoutCfg.insert(0U, "//");
11291127
std::string::size_type pos = 0;
1130-
while ((pos = codeWithoutCfg.find("\n#file",pos)) != std::string::npos)
1131-
codeWithoutCfg.insert(pos+1U, "//");
1132-
pos = 0;
1133-
while ((pos = codeWithoutCfg.find("\n#endfile",pos)) != std::string::npos)
1134-
codeWithoutCfg.insert(pos+1U, "//");
1135-
pos = 0;
11361128
while ((pos = codeWithoutCfg.find(Preprocessor::macroChar,pos)) != std::string::npos)
11371129
codeWithoutCfg[pos] = ' ';
11381130
mErrorLogger.reportOut(codeWithoutCfg, Color::Reset);

‎test/cli/other_test.py‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3986,3 +3986,41 @@ def test_max_configs(tmp_path, max_configs, number_of_configs, check_config, exp
39863986
'{}:0:0: information: Too many #ifdef configurations - cppcheck only checks {} of {} configurations. Use --force to check all configurations. [toomanyconfigs]'
39873987
.format(test_file, max_configs, number_of_configs)
39883988
]
3989+
3990+
3991+
# The implementation for "A::a" is missing - so don't check if "A::b" is used or not
3992+
def test_unused_private_function_incomplete_impl(tmpdir):
3993+
test_inc = os.path.join(tmpdir, 'test.h')
3994+
with open(test_inc, 'wt') as f:
3995+
f.write(
3996+
"""
3997+
class A
3998+
{
3999+
public:
4000+
A();
4001+
void a();
4002+
private:
4003+
void b();
4004+
};
4005+
""")
4006+
4007+
test_file = os.path.join(tmpdir, 'test.cpp')
4008+
with open(test_file, 'wt') as f:
4009+
f.write(
4010+
"""
4011+
#include "test.h"
4012+
4013+
A::A() { }
4014+
void A::b() { }
4015+
""")
4016+
4017+
args = [
4018+
'-q',
4019+
'--template=simple',
4020+
test_file
4021+
]
4022+
4023+
ret, stdout, stderr = cppcheck(args)
4024+
assert stdout == ''
4025+
assert stderr.splitlines() == []
4026+
assert ret == 0, stdout

‎test/helpers.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,12 @@ ScopedFile::~ScopedFile() {
113113

114114
void SimpleTokenizer2::preprocess(const char* code, std::size_t size, std::vector<std::string> &files, const std::string& file0, Tokenizer& tokenizer, ErrorLogger& errorlogger)
115115
{
116-
simplecpp::TokenList tokens1(code, size, files, file0);
116+
simplecpp::OutputList outputList;
117+
simplecpp::TokenList tokens1(code, size, files, file0, &outputList);
117118

118119
Preprocessor preprocessor(tokens1, tokenizer.getSettings(), errorlogger, Path::identify(tokens1.getFiles()[0], false));
120+
(void)preprocessor.reportOutput(outputList, true);
121+
(void)preprocessor.loadFiles(files); // TODO: check result
119122
simplecpp::TokenList tokens2 = preprocessor.preprocess("", files, true);
120123

121124
// Tokenizer..

‎test/testpreprocessor.cpp‎

Lines changed: 57 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,13 @@ class TestPreprocessor : public TestFixture {
5050

5151
private:
5252
template<size_t size>
53-
std::string expandMacros(const char (&code)[size], ErrorLogger &errorLogger) const {
53+
std::string expandMacros(const char (&code)[size], ErrorLogger &errorLogger, bool throwError = true) const {
5454
simplecpp::OutputList outputList;
5555
std::vector<std::string> files;
5656
simplecpp::TokenList tokens1 = simplecpp::TokenList(code, files, "file.cpp", &outputList);
5757
Preprocessor p(tokens1, settingsDefault, errorLogger, Path::identify(tokens1.getFiles()[0], false));
58-
simplecpp::TokenList tokens2 = p.preprocess("", files, true);
58+
ASSERT(p.loadFiles(files));
59+
simplecpp::TokenList tokens2 = p.preprocess("", files, throwError);
5960
(void)p.reportOutput(outputList, true);
6061
return tokens2.stringify();
6162
}
@@ -69,13 +70,14 @@ class TestPreprocessor : public TestFixture {
6970
if (tokenlist.front())
7071
throw std::runtime_error("token list not empty");
7172

72-
const simplecpp::TokenList tokens1(code, files, file0);
73+
simplecpp::OutputList outputList;
74+
const simplecpp::TokenList tokens1(code, files, file0, &outputList);
7375

7476
// Preprocess..
7577
simplecpp::TokenList tokens2(files);
7678
simplecpp::FileDataCache cache;
77-
// TODO: provide and handle outputList
78-
simplecpp::preprocess(tokens2, tokens1, files, cache, dui);
79+
simplecpp::preprocess(tokens2, tokens1, files, cache, dui, outputList);
80+
// TODO: handle outputList
7981

8082
// Tokenizer..
8183
tokenlist.createTokens(std::move(tokens2));
@@ -135,7 +137,7 @@ class TestPreprocessor : public TestFixture {
135137
cfgs = preprocessor.getConfigs();
136138
for (const std::string & config : cfgs) {
137139
try {
138-
const bool writeLocations = (strstr(code, "#file") != nullptr) || (strstr(code, "#include") != nullptr);
140+
const bool writeLocations = (strstr(code, "#include") != nullptr);
139141
cfgcode[config] = preprocessor.getcode(config, files, writeLocations);
140142
} catch (const simplecpp::Output &) {
141143
cfgcode[config] = "";
@@ -368,9 +370,12 @@ class TestPreprocessor : public TestFixture {
368370
if (library)
369371
ASSERT(settings.library.load("", library, false).errorcode == Library::ErrorCode::OK);
370372
std::vector<std::string> files;
373+
simplecpp::OutputList outputList;
371374
// TODO: this adds an empty filename
372-
simplecpp::TokenList tokens(code,files);
373-
Preprocessor preprocessor(tokens, settings, *this, Standards::Language::C); // TODO: do we need to consider #file?
375+
simplecpp::TokenList tokens(code,files,"",&outputList);
376+
Preprocessor preprocessor(tokens, settings, *this, Standards::Language::C);
377+
ASSERT(preprocessor.loadFiles(files));
378+
ASSERT(!preprocessor.reportOutput(outputList, true));
374379
preprocessor.removeComments();
375380
const std::set<std::string> configs = preprocessor.getConfigs();
376381
std::string ret;
@@ -383,8 +388,9 @@ class TestPreprocessor : public TestFixture {
383388
std::size_t getHash(const char (&code)[size]) {
384389
std::vector<std::string> files;
385390
// TODO: this adds an empty filename
386-
simplecpp::TokenList tokens(code,files);
387-
Preprocessor preprocessor(tokens, settingsDefault, *this, Standards::Language::C); // TODO: do we need to consider #file?
391+
simplecpp::TokenList tokens(code,files,"");
392+
Preprocessor preprocessor(tokens, settingsDefault, *this, Standards::Language::C);
393+
ASSERT(preprocessor.loadFiles(files));
388394
preprocessor.removeComments();
389395
return preprocessor.calculateHash("");
390396
}
@@ -448,16 +454,19 @@ class TestPreprocessor : public TestFixture {
448454
void error4() {
449455
// In included file
450456
{
457+
ScopedFile header("ab.h", "#error hello world!\n");
451458
const auto settings = dinit(Settings, $.userDefines = "TEST");
452-
const char code[] = "#file \"ab.h\"\n#error hello world!\n#endfile";
459+
const char code[] = "#include \"ab.h\"";
453460
(void)getcodeforcfg(settings, *this, code, "TEST", "test.c");
454461
ASSERT_EQUALS("[ab.h:1:2]: (error) #error hello world! [preprocessorErrorDirective]\n", errout_str());
455462
}
456463

457464
// After including a file
458465
{
466+
ScopedFile header("ab.h", "");
459467
const auto settings = dinit(Settings, $.userDefines = "TEST");
460-
const char code[] = "#file \"ab.h\"\n\n#endfile\n#error aaa";
468+
const char code[] = "#include \"ab.h\"\n"
469+
"#error aaa";
461470
(void)getcodeforcfg(settings, *this, code, "TEST", "test.c");
462471
ASSERT_EQUALS("[test.c:2:2]: (error) #error aaa [preprocessorErrorDirective]\n", errout_str());
463472
}
@@ -560,35 +569,35 @@ class TestPreprocessor : public TestFixture {
560569
}
561570

562571
void includeguard1() {
572+
ScopedFile header("abc.h",
573+
"#ifndef abcH\n"
574+
"#define abcH\n"
575+
"#endif\n");
563576
// Handling include guards..
564-
const char filedata[] = "#file \"abc.h\"\n"
565-
"#ifndef abcH\n"
566-
"#define abcH\n"
567-
"#endif\n"
568-
"#endfile\n"
577+
const char filedata[] = "#include \"abc.h\"\n"
569578
"#ifdef ABC\n"
570579
"#endif";
571580
ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
572581
}
573582

574583
void includeguard2() {
584+
ScopedFile header("abc.h",
585+
"foo\n"
586+
"#ifdef ABC\n"
587+
"\n"
588+
"#endif\n");
575589
// Handling include guards..
576-
const char filedata[] = "#file \"abc.h\"\n"
577-
"foo\n"
578-
"#ifdef ABC\n"
579-
"\n"
580-
"#endif\n"
581-
"#endfile\n";
590+
const char filedata[] = "#include \"abc.h\"\n";
582591
ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
583592
}
584593

585594

586595
void ifdefwithfile() {
596+
ScopedFile header("abc.h", "class A{};/*\n\n\n\n\n\n\n*/\n");
597+
587598
// Handling include guards..
588599
const char filedata[] = "#ifdef ABC\n"
589-
"#file \"abc.h\"\n"
590-
"class A{};/*\n\n\n\n\n\n\n*/\n"
591-
"#endfile\n"
600+
"#include \"abc.h\"\n"
592601
"#endif\n"
593602
"int main() {}\n";
594603

@@ -1552,26 +1561,26 @@ class TestPreprocessor : public TestFixture {
15521561
}
15531562

15541563
{
1555-
const char filedata[] = "#file \"abc.h\"\n"
1556-
"#define a\n"
1557-
"\"\n"
1558-
"#endfile\n";
1564+
ScopedFile header("abc.h",
1565+
"#define a\n"
1566+
"\"\n");
1567+
const char filedata[] = "#include \"abc.h\"";
15591568

15601569
// expand macros..
1561-
const std::string actual(expandMacros(filedata, *this));
1570+
const std::string actual(expandMacros(filedata, *this, false));
15621571

15631572
ASSERT_EQUALS("", actual);
15641573
ASSERT_EQUALS("[abc.h:2:1]: (error) No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported. [syntaxError]\n", errout_str());
15651574
}
15661575

15671576
{
1568-
const char filedata[] = "#file \"abc.h\"\n"
1569-
"#define a\n"
1570-
"#endfile\n"
1577+
ScopedFile header("abc.h",
1578+
"#define a\n");
1579+
const char filedata[] = "#include \"abc.h\"\n"
15711580
"\"\n";
15721581

15731582
// expand macros..
1574-
const std::string actual(expandMacros(filedata, *this));
1583+
const std::string actual(expandMacros(filedata, *this, false));
15751584

15761585
ASSERT_EQUALS("", actual);
15771586
ASSERT_EQUALS("[file.cpp:2:1]: (error) No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported. [syntaxError]\n", errout_str());
@@ -2230,14 +2239,14 @@ class TestPreprocessor : public TestFixture {
22302239
}
22312240

22322241
void getConfigs7e() {
2242+
ScopedFile header("test.h",
2243+
"#ifndef test_h\n"
2244+
"#define test_h\n"
2245+
"#ifdef ABC\n"
2246+
"#endif\n"
2247+
"#endif\n");
22332248
const char filedata[] = "#ifdef ABC\n"
2234-
"#file \"test.h\"\n"
2235-
"#ifndef test_h\n"
2236-
"#define test_h\n"
2237-
"#ifdef ABC\n"
2238-
"#endif\n"
2239-
"#endif\n"
2240-
"#endfile\n"
2249+
"#include \"test.h\"\n"
22412250
"#endif\n";
22422251
ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
22432252
}
@@ -2259,12 +2268,12 @@ class TestPreprocessor : public TestFixture {
22592268
}
22602269

22612270
void getConfigs11() { // #9832 - include guards
2262-
const char filedata[] = "#file \"test.h\"\n"
2263-
"#if !defined(test_h)\n"
2264-
"#define test_h\n"
2265-
"123\n"
2266-
"#endif\n"
2267-
"#endfile\n";
2271+
ScopedFile header("test.h",
2272+
"#if !defined(test_h)\n"
2273+
"#define test_h\n"
2274+
"123\n"
2275+
"#endif\n");
2276+
const char filedata[] = "#include \"test.h\"\n";
22682277
ASSERT_EQUALS("\n", getConfigsStr(filedata));
22692278
}
22702279

‎test/testtokenize.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,8 @@ class TestTokenizer : public TestFixture {
599599
std::vector<std::string> files;
600600
simplecpp::TokenList tokens1(code, files, filename, &outputList);
601601
Preprocessor preprocessor(tokens1, settings, *this, Path::identify(tokens1.getFiles()[0], false));
602+
(void)preprocessor.reportOutput(outputList, true);
603+
ASSERT(preprocessor.loadFiles(files));
602604
std::list<Directive> directives = preprocessor.createDirectives();
603605

604606
TokenList tokenlist{settings, Path::identify(filename, false)};
@@ -8582,9 +8584,9 @@ class TestTokenizer : public TestFixture {
85828584
"#define macro2 val\n"
85838585
"#file \"inc2.h\"\n"
85848586
"#define macro3 val\n"
8585-
"#endfile\n"
8587+
"#endfile\n" // TODO
85868588
"#define macro4 val\n"
8587-
"#endfile\n"
8589+
"#endfile\n" // TODO
85888590
"#define macro5 val\n";
85898591
const char dumpdata[] = " <directivelist>\n"
85908592
" <directive file=\"test.c\" linenr=\"1\" str=\"#define macro1 val\">\n"

‎test/testtokenlist.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ class TestTokenList : public TestFixture {
158158
std::vector<std::string> files;
159159
simplecpp::TokenList tokens1(code, files, "poll.h", nullptr);
160160
Preprocessor preprocessor(tokens1, settingsDefault, *this, Path::identify(tokens1.getFiles()[0], false));
161+
ASSERT(preprocessor.loadFiles(files));
161162
simplecpp::TokenList tokensP = preprocessor.preprocess("", files, true);
162163
TokenList tokenlist(settingsDefault, Standards::Language::C); // headers are treated as C files
163164
tokenlist.createTokens(std::move(tokensP)); // do not assert

‎test/testunusedprivfunc.cpp‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ class TestUnusedPrivateFunction : public TestFixture {
5858

5959
TEST_CASE(classInClass);
6060
TEST_CASE(sameFunctionNames);
61-
TEST_CASE(incompleteImplementation);
6261

6362
TEST_CASE(derivedClass); // skip warning for derived classes. It might be a virtual function.
6463

@@ -482,24 +481,6 @@ class TestUnusedPrivateFunction : public TestFixture {
482481
ASSERT_EQUALS("", errout_str());
483482
}
484483

485-
void incompleteImplementation() {
486-
// The implementation for "A::a" is missing - so don't check if
487-
// "A::b" is used or not
488-
check("#file \"test.h\"\n"
489-
"class A\n"
490-
"{\n"
491-
"public:\n"
492-
" A();\n"
493-
" void a();\n"
494-
"private:\n"
495-
" void b();\n"
496-
"};\n"
497-
"#endfile\n"
498-
"A::A() { }\n"
499-
"void A::b() { }");
500-
ASSERT_EQUALS("", errout_str());
501-
}
502-
503484
void derivedClass() {
504485
// skip warning in derived classes in case the base class is invisible
505486
check("class derived : public base\n"
@@ -791,7 +772,7 @@ class TestUnusedPrivateFunction : public TestFixture {
791772
"private:\n"
792773
" void Init();\n"
793774
"};\n"
794-
"#endfile\n"
775+
"#endfile\n" // TODO
795776
"void Fred::Init()\n"
796777
"{\n"
797778
"}");

0 commit comments

Comments
 (0)