Skip to content

Commit 3b36db9

Browse files
firewavefirewave
authored
fixed #13129 - apply --std with --clang / fixed usage of Standards::stdValue (#6742)
1 parent c563801 commit 3b36db9

8 files changed

Lines changed: 192 additions & 23 deletions

File tree

‎Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ TESTOBJ = test/fixture.o \
347347
test/testsimplifyusing.o \
348348
test/testsingleexecutor.o \
349349
test/testsizeof.o \
350+
test/teststandards.o \
350351
test/teststl.o \
351352
test/teststring.o \
352353
test/testsummaries.o \
@@ -943,6 +944,9 @@ test/testsingleexecutor.o: test/testsingleexecutor.cpp cli/executor.h cli/single
943944
test/testsizeof.o: test/testsizeof.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checksizeof.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
944945
$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsizeof.cpp
945946

947+
test/teststandards.o: test/teststandards.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
948+
$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/teststandards.cpp
949+
946950
test/teststl.o: test/teststl.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkstl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
947951
$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/teststl.cpp
948952

‎cli/cmdlineparser.cpp‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,12 +1252,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
12521252
// --std
12531253
else if (std::strncmp(argv[i], "--std=", 6) == 0) {
12541254
const std::string std = argv[i] + 6;
1255-
Standards tmp;
1256-
if (tmp.setC(std)) {
1257-
mSettings.standards.c = tmp.c;
1258-
} else if (tmp.setCPP(std)) {
1259-
mSettings.standards.cpp = tmp.cpp;
1260-
} else {
1255+
if (!mSettings.standards.setStd(std)) {
12611256
mLogger.printError("unknown --std value '" + std + "'");
12621257
return Result::Fail;
12631258
}

‎lib/cppcheck.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -449,9 +449,10 @@ unsigned int CppCheck::checkClang(const FileWithDetails &file)
449449
#endif
450450

451451
std::string flags(langOpt + " ");
452-
// TODO: does not apply C standard
453-
if (isCpp && !mSettings.standards.stdValue.empty())
454-
flags += "-std=" + mSettings.standards.stdValue + " ";
452+
if (isCpp && !mSettings.standards.stdValueCPP.empty())
453+
flags += "-std=" + mSettings.standards.stdValueCPP + " ";
454+
if (!isCpp && !mSettings.standards.stdValueC.empty())
455+
flags += "-std=" + mSettings.standards.stdValueC + " ";
455456

456457
for (const std::string &i: mSettings.includePaths)
457458
flags += "-I" + i + " ";

‎lib/standards.h‎

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,27 @@ struct Standards {
4444
enum cppstd_t : std::uint8_t { CPP03, CPP11, CPP14, CPP17, CPP20, CPP23, CPP26, CPPLatest = CPP26 } cpp = CPPLatest;
4545

4646
/** --std value given on command line */
47-
std::string stdValue;
47+
std::string stdValueC;
48+
49+
/** --std value given on command line */
50+
std::string stdValueCPP;
4851

4952
bool setC(std::string str) {
50-
stdValue = str;
51-
strTolower(str);
52-
c = getC(str);
53-
return !stdValue.empty() && str == getC();
53+
if (str.empty())
54+
return false;
55+
const cstd_t c_new = getC(str);
56+
const bool b = (str == getC(c_new));
57+
if (b) {
58+
c = c_new;
59+
stdValueC = std::move(str);
60+
}
61+
return b;
5462
}
5563
std::string getC() const {
56-
switch (c) {
64+
return getC(c);
65+
}
66+
static std::string getC(cstd_t c_std) {
67+
switch (c_std) {
5768
case C89:
5869
return "c89";
5970
case C99:
@@ -86,10 +97,15 @@ struct Standards {
8697
return Standards::CLatest;
8798
}
8899
bool setCPP(std::string str) {
89-
stdValue = str;
90-
strTolower(str);
91-
cpp = getCPP(str);
92-
return !stdValue.empty() && str == getCPP();
100+
if (str.empty())
101+
return false;
102+
const cppstd_t cpp_new = getCPP(str);
103+
const bool b = (str == getCPP(cpp_new));
104+
if (b) {
105+
cpp = cpp_new;
106+
stdValueCPP = std::move(str);
107+
}
108+
return b;
93109
}
94110
std::string getCPP() const {
95111
return getCPP(cpp);
@@ -137,6 +153,9 @@ struct Standards {
137153
}
138154
return Standards::CPPLatest;
139155
}
156+
bool setStd(const std::string& str) {
157+
return setC(str) || setCPP(str);
158+
}
140159
};
141160

142161
/// @}

‎test/cli/clang-import_test.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,22 +192,18 @@ def test_cmd_enforce_cpp(tmp_path): # #13128
192192
__test_cmd(tmp_path, 'test.c',['-x', 'c++'], '-x c++')
193193

194194

195-
@pytest.mark.xfail(strict=True)
196195
def test_cmd_std_c(tmp_path): # #13129
197196
__test_cmd(tmp_path, 'test.cpp',['--std=c89', '--std=c++14'], '-x c++ -std=c++14')
198197

199198

200-
@pytest.mark.xfail(strict=True)
201199
def test_cmd_std_cpp(tmp_path): # #13129
202200
__test_cmd(tmp_path, 'test.c',['--std=c89', '--std=c++14'], '-x c -std=c89')
203201

204202

205-
@pytest.mark.xfail(strict=True)
206203
def test_cmd_std_c_enforce(tmp_path): # #13128/#13129
207204
__test_cmd(tmp_path, 'test.cpp',['--language=c', '--std=c89', '--std=c++14'], '-x c -std=c89')
208205

209206

210-
@pytest.mark.xfail(strict=True)
211207
def test_cmd_std_cpp_enforce(tmp_path): # #13128/#13129
212208
__test_cmd(tmp_path, 'test.c',['--language=c++', '--std=c89', '--std=c++14'], '-x c++ -std=c++14')
213209

‎test/fixture.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,14 @@ class TestFixture : public ErrorLogger {
9090
assertEquals(filename, linenr, static_cast<std::int64_t>(expected), static_cast<std::int64_t>(actual), msg);
9191
}
9292

93+
template<typename T>
94+
void todoAssertEqualsEnum(const char* const filename, const unsigned int linenr, const T& wanted, const T& current, const T& actual) const {
95+
if (std::is_unsigned<T>())
96+
todoAssertEquals(filename, linenr, static_cast<std::uint64_t>(wanted), static_cast<std::uint64_t>(current), static_cast<std::uint64_t>(actual));
97+
else
98+
todoAssertEquals(filename, linenr, static_cast<std::int64_t>(wanted), static_cast<std::int64_t>(current), static_cast<std::int64_t>(actual));
99+
}
100+
93101
void assertEquals(const char * filename, unsigned int linenr, const std::string &expected, const std::string &actual, const std::string &msg = emptyString) const;
94102
void assertEqualsWithoutLineNumbers(const char * filename, unsigned int linenr, const std::string &expected, const std::string &actual, const std::string &msg = emptyString) const;
95103
void assertEquals(const char * filename, unsigned int linenr, const char expected[], const std::string& actual, const std::string &msg = emptyString) const;
@@ -308,6 +316,7 @@ class TestInstance {
308316
#define ASSERT_EQUALS_LOC_MSG( EXPECTED, ACTUAL, MSG, FILE_, LINE_ ) assertEquals(FILE_, LINE_, EXPECTED, ACTUAL, MSG)
309317
#define ASSERT_EQUALS_MSG( EXPECTED, ACTUAL, MSG ) assertEquals(__FILE__, __LINE__, EXPECTED, ACTUAL, MSG)
310318
#define ASSERT_EQUALS_ENUM( EXPECTED, ACTUAL ) assertEqualsEnum(__FILE__, __LINE__, (EXPECTED), (ACTUAL))
319+
#define TODO_ASSERT_EQUALS_ENUM( WANTED, CURRENT, ACTUAL ) todoAssertEqualsEnum(__FILE__, __LINE__, WANTED, CURRENT, ACTUAL)
311320
#define ASSERT_THROW( CMD, EXCEPTION ) do { try { (void)(CMD); assertThrowFail(__FILE__, __LINE__); } catch (const EXCEPTION&) {} catch (...) { assertThrowFail(__FILE__, __LINE__); } } while (false)
312321
#define ASSERT_THROW_EQUALS( CMD, EXCEPTION, EXPECTED ) do { try { (void)(CMD); assertThrowFail(__FILE__, __LINE__); } catch (const EXCEPTION&e) { assertEquals(__FILE__, __LINE__, EXPECTED, e.errorMessage); } catch (...) { assertThrowFail(__FILE__, __LINE__); } } while (false)
313322
#define ASSERT_THROW_EQUALS_2( CMD, EXCEPTION, EXPECTED ) do { try { (void)(CMD); assertThrowFail(__FILE__, __LINE__); } catch (const EXCEPTION&e) { assertEquals(__FILE__, __LINE__, EXPECTED, e.what()); } catch (...) { assertThrowFail(__FILE__, __LINE__); } } while (false)

‎test/testrunner.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
<ClCompile Include="testsimplifyusing.cpp" />
9292
<ClCompile Include="testsingleexecutor.cpp" />
9393
<ClCompile Include="testsizeof.cpp" />
94+
<ClCompile Include="teststandards.cpp" />
9495
<ClCompile Include="teststl.cpp" />
9596
<ClCompile Include="teststring.cpp" />
9697
<ClCompile Include="testsummaries.cpp" />

‎test/teststandards.cpp‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
/*
2+
* Cppcheck - A tool for static C/C++ code analysis
3+
* Copyright (C) 2007-2024 Cppcheck team.
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
19+
#include "fixture.h"
20+
#include "standards.h"
21+
22+
class TestStandards : public TestFixture {
23+
public:
24+
TestStandards() : TestFixture("TestStandards") {}
25+
26+
private:
27+
void run() override {
28+
TEST_CASE(set);
29+
TEST_CASE(setAlias1);
30+
TEST_CASE(setAlias2);
31+
TEST_CASE(getC);
32+
TEST_CASE(getCPP);
33+
TEST_CASE(setStd);
34+
}
35+
36+
void set() const {
37+
Standards stds;
38+
ASSERT_EQUALS_ENUM(Standards::CLatest, stds.c);
39+
ASSERT_EQUALS("", stds.stdValueC);
40+
ASSERT_EQUALS_ENUM(Standards::CPPLatest, stds.cpp);
41+
ASSERT_EQUALS("", stds.stdValueCPP);
42+
43+
ASSERT_EQUALS(true, stds.setC("c99"));
44+
ASSERT_EQUALS_ENUM(Standards::C99, stds.c);
45+
ASSERT_EQUALS("c99", stds.stdValueC);
46+
ASSERT_EQUALS_ENUM(Standards::CPPLatest, stds.cpp);
47+
ASSERT_EQUALS("", stds.stdValueCPP);
48+
49+
ASSERT_EQUALS(true, stds.setC("c11"));
50+
ASSERT_EQUALS_ENUM(Standards::C11, stds.c);
51+
ASSERT_EQUALS("c11", stds.stdValueC);
52+
ASSERT_EQUALS_ENUM(Standards::CPPLatest, stds.cpp);
53+
ASSERT_EQUALS("", stds.stdValueCPP);
54+
55+
ASSERT_EQUALS(true, stds.setCPP("c++11"));
56+
ASSERT_EQUALS_ENUM(Standards::C11, stds.c);
57+
ASSERT_EQUALS("c11", stds.stdValueC);
58+
ASSERT_EQUALS_ENUM(Standards::CPP11, stds.cpp);
59+
ASSERT_EQUALS("c++11", stds.stdValueCPP);
60+
61+
ASSERT_EQUALS(true, stds.setCPP("c++23"));
62+
ASSERT_EQUALS_ENUM(Standards::C11, stds.c);
63+
ASSERT_EQUALS("c11", stds.stdValueC);
64+
ASSERT_EQUALS_ENUM(Standards::CPP23, stds.cpp);
65+
ASSERT_EQUALS("c++23", stds.stdValueCPP);
66+
67+
ASSERT_EQUALS(false, stds.setC("c77"));
68+
ASSERT_EQUALS_ENUM(Standards::C11, stds.c);
69+
ASSERT_EQUALS("c11", stds.stdValueC);
70+
ASSERT_EQUALS_ENUM(Standards::CPP23, stds.cpp);
71+
ASSERT_EQUALS("c++23", stds.stdValueCPP);
72+
73+
ASSERT_EQUALS(false, stds.setCPP("c+77"));
74+
ASSERT_EQUALS_ENUM(Standards::C11, stds.c);
75+
ASSERT_EQUALS("c11", stds.stdValueC);
76+
ASSERT_EQUALS_ENUM(Standards::CPP23, stds.cpp);
77+
ASSERT_EQUALS("c++23", stds.stdValueCPP);
78+
79+
ASSERT_EQUALS(false, stds.setC("C23"));
80+
ASSERT_EQUALS_ENUM(Standards::C11, stds.c);
81+
ASSERT_EQUALS("c11", stds.stdValueC);
82+
ASSERT_EQUALS_ENUM(Standards::CPP23, stds.cpp);
83+
ASSERT_EQUALS("c++23", stds.stdValueCPP);
84+
85+
ASSERT_EQUALS(false, stds.setCPP("C++11"));
86+
ASSERT_EQUALS_ENUM(Standards::C11, stds.c);
87+
ASSERT_EQUALS("c11", stds.stdValueC);
88+
ASSERT_EQUALS_ENUM(Standards::CPP23, stds.cpp);
89+
ASSERT_EQUALS("c++23", stds.stdValueCPP);
90+
}
91+
92+
void setAlias1() const {
93+
Standards stds;
94+
TODO_ASSERT_EQUALS(true, false, stds.setCPP("gnu++11"));
95+
ASSERT_EQUALS_ENUM(Standards::CLatest, stds.c);
96+
ASSERT_EQUALS("", stds.stdValueC);
97+
TODO_ASSERT_EQUALS_ENUM(Standards::CPP11, Standards::CPPLatest, stds.cpp);
98+
TODO_ASSERT_EQUALS("gnu++11", "", stds.stdValueCPP);
99+
}
100+
101+
void setAlias2() const {
102+
Standards stds;
103+
TODO_ASSERT_EQUALS(true, false, stds.setC("gnu17"));
104+
TODO_ASSERT_EQUALS_ENUM(Standards::C17, Standards::CLatest, stds.c);
105+
TODO_ASSERT_EQUALS("gnu17", "", stds.stdValueC);
106+
ASSERT_EQUALS_ENUM(Standards::CPPLatest, stds.cpp);
107+
ASSERT_EQUALS("", stds.stdValueCPP);
108+
}
109+
110+
void getC() const {
111+
ASSERT_EQUALS_ENUM(Standards::C99, Standards::getC("c99"));
112+
ASSERT_EQUALS_ENUM(Standards::C11, Standards::getC("c11"));
113+
TODO_ASSERT_EQUALS_ENUM(Standards::C17, Standards::CLatest, Standards::getC("gnu17"));
114+
TODO_ASSERT_EQUALS_ENUM(Standards::C11, Standards::CLatest, Standards::getC("iso9899:2011"));
115+
116+
ASSERT_EQUALS_ENUM(Standards::CLatest, Standards::getC(""));
117+
ASSERT_EQUALS_ENUM(Standards::CLatest, Standards::getC("c77"));
118+
ASSERT_EQUALS_ENUM(Standards::CLatest, Standards::getC("C99"));
119+
}
120+
121+
void getCPP() const {
122+
ASSERT_EQUALS_ENUM(Standards::CPP11, Standards::getCPP("c++11"));
123+
ASSERT_EQUALS_ENUM(Standards::CPP23, Standards::getCPP("c++23"));
124+
TODO_ASSERT_EQUALS_ENUM(Standards::CPP23, Standards::CPPLatest, Standards::getCPP("gnu++23"));
125+
126+
ASSERT_EQUALS_ENUM(Standards::CPPLatest, Standards::getCPP(""));
127+
ASSERT_EQUALS_ENUM(Standards::CPPLatest, Standards::getCPP("c++77"));
128+
ASSERT_EQUALS_ENUM(Standards::CPPLatest, Standards::getCPP("C++11"));
129+
}
130+
131+
void setStd() const {
132+
Standards stds;
133+
ASSERT(stds.setStd("c11"));
134+
ASSERT(stds.setStd("c++11"));
135+
TODO_ASSERT(stds.setStd("gnu11"));
136+
TODO_ASSERT(stds.setStd("gnu++17"));
137+
TODO_ASSERT(stds.setStd("iso9899:2011"));
138+
139+
ASSERT(!stds.setStd("C++11"));
140+
ASSERT(!stds.setStd("Gnu++11"));
141+
}
142+
};
143+
144+
REGISTER_TEST(TestStandards)

0 commit comments

Comments
 (0)