Skip to content

Commit 3f43529

Browse files
firewavefirewave
committed
enabled and fixed modernize-use-emplace clang-tidy warnings
1 parent 0334a80 commit 3f43529

File tree

4 files changed

+24
-25
lines changed

4 files changed

+24
-25
lines changed

‎.clang-tidy‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ Checks: >
3131
-modernize-pass-by-value,
3232
-modernize-return-braced-init-list,
3333
-modernize-use-auto,
34-
-modernize-use-emplace,
3534
-modernize-use-equals-default,
3635
-modernize-use-equals-delete,
3736
-modernize-use-default-member-init,

‎main.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
5050
error = true;
5151
break;
5252
}
53-
dui.defines.push_back(value);
53+
dui.defines.emplace_back(value);
5454
break;
5555
}
5656
case 'U': { // undefine symbol
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
7272
error = true;
7373
break;
7474
}
75-
dui.includePaths.push_back(value);
75+
dui.includePaths.emplace_back(value);
7676
break;
7777
}
7878
case 'i':
@@ -84,7 +84,7 @@ int main(int argc, char **argv)
8484
error = true;
8585
break;
8686
}
87-
dui.includes.push_back(std::move(value));
87+
dui.includes.emplace_back(std::move(value));
8888
} else if (std::strncmp(arg, "-is",3)==0) {
8989
found = true;
9090
use_istream = true;

‎simplecpp.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1734,7 +1734,7 @@ namespace simplecpp {
17341734
argtok->next && argtok->next->op == ')') {
17351735
variadic = true;
17361736
if (!argtok->previous->name)
1737-
args.push_back("__VA_ARGS__");
1737+
args.emplace_back("__VA_ARGS__");
17381738
argtok = argtok->next; // goto ')'
17391739
break;
17401740
}
@@ -3647,7 +3647,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
36473647
E += (E.empty() ? "" : " ") + tok->str();
36483648
const long long result = evaluate(expr, dui, sizeOfType);
36493649
conditionIsTrue = (result != 0);
3650-
ifCond->push_back(IfCond(rawtok->location, E, result));
3650+
ifCond->emplace_back(rawtok->location, E, result);
36513651
} else {
36523652
const long long result = evaluate(expr, dui, sizeOfType);
36533653
conditionIsTrue = (result != 0);

‎test.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1717,7 +1717,7 @@ static void strict_ansi_4()
17171717
"#endif";
17181718
simplecpp::DUI dui;
17191719
dui.std = "gnu99";
1720-
dui.defines.push_back("__STRICT_ANSI__");
1720+
dui.defines.emplace_back("__STRICT_ANSI__");
17211721
ASSERT_EQUALS("\nA", preprocess(code, dui));
17221722
}
17231723

@@ -1764,7 +1764,7 @@ static void ifA()
17641764
ASSERT_EQUALS("", preprocess(code));
17651765

17661766
simplecpp::DUI dui;
1767-
dui.defines.push_back("A=1");
1767+
dui.defines.emplace_back("A=1");
17681768
ASSERT_EQUALS("\nX", preprocess(code, dui));
17691769
}
17701770

@@ -1783,7 +1783,7 @@ static void ifDefined()
17831783
"#endif";
17841784
simplecpp::DUI dui;
17851785
ASSERT_EQUALS("", preprocess(code, dui));
1786-
dui.defines.push_back("A=1");
1786+
dui.defines.emplace_back("A=1");
17871787
ASSERT_EQUALS("\nX", preprocess(code, dui));
17881788
}
17891789

@@ -1794,7 +1794,7 @@ static void ifDefinedNoPar()
17941794
"#endif";
17951795
simplecpp::DUI dui;
17961796
ASSERT_EQUALS("", preprocess(code, dui));
1797-
dui.defines.push_back("A=1");
1797+
dui.defines.emplace_back("A=1");
17981798
ASSERT_EQUALS("\nX", preprocess(code, dui));
17991799
}
18001800

@@ -1806,7 +1806,7 @@ static void ifDefinedNested()
18061806
"#endif";
18071807
simplecpp::DUI dui;
18081808
ASSERT_EQUALS("", preprocess(code, dui));
1809-
dui.defines.push_back("FOO=1");
1809+
dui.defines.emplace_back("FOO=1");
18101810
ASSERT_EQUALS("\n\nX", preprocess(code, dui));
18111811
}
18121812

@@ -1818,7 +1818,7 @@ static void ifDefinedNestedNoPar()
18181818
"#endif";
18191819
simplecpp::DUI dui;
18201820
ASSERT_EQUALS("", preprocess(code, dui));
1821-
dui.defines.push_back("FOO=1");
1821+
dui.defines.emplace_back("FOO=1");
18221822
ASSERT_EQUALS("\n\nX", preprocess(code, dui));
18231823
}
18241824

@@ -1871,10 +1871,10 @@ static void ifLogical()
18711871
simplecpp::DUI dui;
18721872
ASSERT_EQUALS("", preprocess(code, dui));
18731873
dui.defines.clear();
1874-
dui.defines.push_back("A=1");
1874+
dui.defines.emplace_back("A=1");
18751875
ASSERT_EQUALS("\nX", preprocess(code, dui));
18761876
dui.defines.clear();
1877-
dui.defines.push_back("B=1");
1877+
dui.defines.emplace_back("B=1");
18781878
ASSERT_EQUALS("\nX", preprocess(code, dui));
18791879
}
18801880

@@ -2069,7 +2069,7 @@ static void missingHeader2()
20692069
simplecpp::TokenList tokens2(files);
20702070
const simplecpp::TokenList rawtokens = makeTokenList(code,files);
20712071
simplecpp::DUI dui;
2072-
dui.includePaths.push_back(".");
2072+
dui.includePaths.emplace_back(".");
20732073
simplecpp::preprocess(tokens2, rawtokens, files, cache, dui, &outputList);
20742074
ASSERT_EQUALS("", toString(outputList));
20752075
}
@@ -2101,7 +2101,7 @@ static void nestedInclude()
21012101
simplecpp::OutputList outputList;
21022102
simplecpp::TokenList tokens2(files);
21032103
simplecpp::DUI dui;
2104-
dui.includePaths.push_back(".");
2104+
dui.includePaths.emplace_back(".");
21052105
simplecpp::preprocess(tokens2, rawtokens, files, cache, dui, &outputList);
21062106

21072107
ASSERT_EQUALS("file0,1,include_nested_too_deeply,#include nested too deeply\n", toString(outputList));
@@ -2119,7 +2119,7 @@ static void systemInclude()
21192119
simplecpp::OutputList outputList;
21202120
simplecpp::TokenList tokens2(files);
21212121
simplecpp::DUI dui;
2122-
dui.includePaths.push_back("include");
2122+
dui.includePaths.emplace_back("include");
21232123
simplecpp::preprocess(tokens2, rawtokens, files, cache, dui, &outputList);
21242124

21252125
ASSERT_EQUALS("", toString(outputList));
@@ -2345,7 +2345,7 @@ static void include3() // #16 - crash when expanding macro from header
23452345

23462346
simplecpp::TokenList out(files);
23472347
simplecpp::DUI dui;
2348-
dui.includePaths.push_back(".");
2348+
dui.includePaths.emplace_back(".");
23492349
simplecpp::preprocess(out, rawtokens_c, files, cache, dui);
23502350

23512351
ASSERT_EQUALS("\n1234", out.stringify());
@@ -2372,8 +2372,8 @@ static void include4() // #27 - -include
23722372

23732373
simplecpp::TokenList out(files);
23742374
simplecpp::DUI dui;
2375-
dui.includePaths.push_back(".");
2376-
dui.includes.push_back("27.h");
2375+
dui.includePaths.emplace_back(".");
2376+
dui.includes.emplace_back("27.h");
23772377
simplecpp::preprocess(out, rawtokens_c, files, cache, dui);
23782378

23792379
ASSERT_EQUALS("123", out.stringify());
@@ -2399,7 +2399,7 @@ static void include5() // #3 - handle #include MACRO
23992399

24002400
simplecpp::TokenList out(files);
24012401
simplecpp::DUI dui;
2402-
dui.includePaths.push_back(".");
2402+
dui.includePaths.emplace_back(".");
24032403
simplecpp::preprocess(out, rawtokens_c, files, cache, dui);
24042404

24052405
ASSERT_EQUALS("\n#line 1 \"3.h\"\n123", out.stringify());
@@ -2445,7 +2445,7 @@ static void include7() // #include MACRO
24452445

24462446
simplecpp::TokenList out(files);
24472447
simplecpp::DUI dui;
2448-
dui.includePaths.push_back(".");
2448+
dui.includePaths.emplace_back(".");
24492449
simplecpp::preprocess(out, rawtokens_c, files, cache, dui);
24502450

24512451
ASSERT_EQUALS("\n#line 1 \"3.h\"\n123", out.stringify());
@@ -2483,7 +2483,7 @@ static void include9()
24832483

24842484
simplecpp::TokenList out(files);
24852485
simplecpp::DUI dui;
2486-
dui.includePaths.push_back(".");
2486+
dui.includePaths.emplace_back(".");
24872487
simplecpp::preprocess(out, rawtokens_c, files, cache, dui);
24882488

24892489
ASSERT_EQUALS("\n#line 2 \"1.h\"\nx = 1 ;", out.stringify());
@@ -2665,7 +2665,7 @@ static void stringify1()
26652665

26662666
simplecpp::TokenList out(files);
26672667
simplecpp::DUI dui;
2668-
dui.includePaths.push_back(".");
2668+
dui.includePaths.emplace_back(".");
26692669
simplecpp::preprocess(out, rawtokens_c, files, cache, dui);
26702670

26712671
ASSERT_EQUALS("\n#line 1 \"A.h\"\n1\n2\n#line 1 \"A.h\"\n1\n2", out.stringify());
@@ -2768,7 +2768,7 @@ static void userdef()
27682768
{
27692769
const char code[] = "#ifdef A\n123\n#endif\n";
27702770
simplecpp::DUI dui;
2771-
dui.defines.push_back("A=1");
2771+
dui.defines.emplace_back("A=1");
27722772
ASSERT_EQUALS("\n123", preprocess(code, dui));
27732773
}
27742774

0 commit comments

Comments
 (0)