Skip to content

Commit 0442161

Browse files
datadiodedatadiode
authored
Allow reexpansion of currently expanding macros during argument evaluation (#364)
1 parent 2c66d08 commit 0442161

5 files changed

Lines changed: 86 additions & 54 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ option(DISABLE_CPP03_SYNTAX_CHECK "Disable the C++03 syntax check." OFF)
55

66
include(CheckCXXCompilerFlag)
77

8+
if (WIN32)
9+
# prevent simplifyPath_cppcheck() from wasting time on looking for a hypothetical network host
10+
add_definitions(-DUNCHOST=$ENV{COMPUTERNAME})
11+
endif()
12+
813
function(add_compile_options_safe FLAG)
914
string(MAKE_C_IDENTIFIER "HAS_CXX_FLAG${FLAG}" mangled_flag)
1015
check_cxx_compiler_flag(${FLAG} ${mangled_flag})

‎run-tests.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ def cleanup(out):
7171
'c99-6_10_3_4_p6.c',
7272
'expr_usual_conversions.c', # condition is true: 4U - 30 >= 0
7373
'stdint.c',
74-
'stringize_misc.c',
7574

7675
# GCC..
7776
'diagnostic-pragma-1.c',

‎simplecpp.cpp‎

Lines changed: 35 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ static const simplecpp::TokenString ONCE("once");
102102

103103
static const simplecpp::TokenString HAS_INCLUDE("__has_include");
104104

105-
static const simplecpp::TokenString INNER_COMMA(",,");
106-
107105
template<class T> static std::string toString(T t)
108106
{
109107
// NOLINTNEXTLINE(misc-const-correctness) - false positive
@@ -888,7 +886,7 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
888886
}
889887

890888
if (prefix.empty())
891-
push_back(new Token(s, location)); // push string without newlines
889+
push_back(new Token(s, location, isspace(stream.peekChar()))); // push string without newlines
892890
else
893891
back()->setstr(prefix + s);
894892

@@ -918,7 +916,7 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
918916
}
919917
}
920918

921-
push_back(new Token(currentToken, location));
919+
push_back(new Token(currentToken, location, isspace(stream.peekChar())));
922920

923921
if (multiline)
924922
location.col += currentToken.size();
@@ -1548,9 +1546,9 @@ namespace simplecpp {
15481546
// Copy macro call to a new tokenlist with no linebreaks
15491547
const Token * const rawtok1 = rawtok;
15501548
TokenList rawtokens2(inputFiles);
1551-
rawtokens2.push_back(new Token(rawtok->str(), rawtok1->location));
1549+
rawtokens2.push_back(new Token(rawtok->str(), rawtok1->location, rawtok->whitespaceahead));
15521550
rawtok = rawtok->next;
1553-
rawtokens2.push_back(new Token(rawtok->str(), rawtok1->location));
1551+
rawtokens2.push_back(new Token(rawtok->str(), rawtok1->location, rawtok->whitespaceahead));
15541552
rawtok = rawtok->next;
15551553
int par = 1;
15561554
while (rawtok && par > 0) {
@@ -1560,13 +1558,10 @@ namespace simplecpp {
15601558
--par;
15611559
else if (rawtok->op == '#' && !sameline(rawtok->previous, rawtok))
15621560
throw Error(rawtok->location, "it is invalid to use a preprocessor directive as macro parameter");
1563-
rawtokens2.push_back(new Token(rawtok->str(), rawtok1->location));
1561+
rawtokens2.push_back(new Token(rawtok->str(), rawtok1->location, rawtok->whitespaceahead));
15641562
rawtok = rawtok->next;
15651563
}
1566-
bool first = true;
1567-
if (valueToken && valueToken->str() == rawtok1->str())
1568-
first = false;
1569-
if (expand(&output2, rawtok1->location, rawtokens2.cfront(), macros, expandedmacros, first))
1564+
if (expand(&output2, rawtok1->location, rawtokens2.cfront(), macros, expandedmacros))
15701565
rawtok = rawtok1->next;
15711566
} else {
15721567
rawtok = expand(&output2, rawtok->location, rawtok, macros, expandedmacros);
@@ -1622,10 +1617,6 @@ namespace simplecpp {
16221617
rawtok = rawtok2->next;
16231618
}
16241619
output->takeTokens(output2);
1625-
for (Token* tok = output->front(); tok; tok = tok->next) {
1626-
if (tok->str() == INNER_COMMA)
1627-
tok->setstr(",");
1628-
}
16291620
return rawtok;
16301621
}
16311622

@@ -1792,28 +1783,12 @@ namespace simplecpp {
17921783
// A##B => AB
17931784
tok = expandHashHash(tokens, rawloc, tok, macros, expandedmacros, parametertokens);
17941785
} else if (tok->op == '#' && sameline(tok, tok->next) && tok->next->op != '#') {
1795-
tok = expandHash(tokens, rawloc, tok, macros, expandedmacros, parametertokens);
1786+
tok = expandHash(tokens, rawloc, tok, expandedmacros, parametertokens);
17961787
} else {
17971788
if (!expandArg(tokens, tok, rawloc, macros, expandedmacros, parametertokens)) {
1798-
bool expanded = false;
1799-
const MacroMap::const_iterator it = macros.find(tok->str());
1800-
if (it != macros.end() && expandedmacros.find(tok->str()) == expandedmacros.end()) {
1801-
const Macro &m = it->second;
1802-
if (!m.functionLike()) {
1803-
Token* mtok = tokens->back();
1804-
m.expand(tokens, rawloc, tok, macros, expandedmacros);
1805-
for (mtok = mtok->next; mtok; mtok = mtok->next) {
1806-
if (mtok->op == ',')
1807-
mtok->setstr(INNER_COMMA);
1808-
}
1809-
expanded = true;
1810-
}
1811-
}
1812-
if (!expanded) {
1813-
tokens->push_back(new Token(*tok));
1814-
if (tok->macro.empty() && (par > 0 || tok->str() != "("))
1815-
tokens->back()->macro = name();
1816-
}
1789+
tokens->push_back(new Token(*tok));
1790+
if (tok->macro.empty() && (par > 0 || tok->str() != "("))
1791+
tokens->back()->macro = name();
18171792
}
18181793

18191794
if (tok->op == '(')
@@ -1831,10 +1806,8 @@ namespace simplecpp {
18311806
return sameline(lpar,tok) ? tok : nullptr;
18321807
}
18331808

1834-
const Token * expand(TokenList * const output, const Location &loc, const Token * const nameTokInst, const MacroMap &macros, std::set<TokenString> expandedmacros, bool first=false) const {
1835-
1836-
if (!first)
1837-
expandedmacros.insert(nameTokInst->str());
1809+
const Token * expand(TokenList * const output, const Location &loc, const Token * const nameTokInst, const MacroMap &macros, std::set<TokenString> expandedmacros) const {
1810+
expandedmacros.insert(nameTokInst->str());
18381811

18391812
usageList.push_back(loc);
18401813

@@ -1917,6 +1890,14 @@ namespace simplecpp {
19171890
if (sameline(tok, tok->next) && tok->next && tok->next->op == '#' && tok->next->next && tok->next->next->op == '#') {
19181891
if (!sameline(tok, tok->next->next->next))
19191892
throw invalidHashHash::unexpectedNewline(tok->location, name());
1893+
if (variadic && tok->op == ',' && tok->next->next->next->str() == args.back()) {
1894+
Token *const comma = newMacroToken(tok->str(), loc, isReplaced(expandedmacros), tok);
1895+
output->push_back(comma);
1896+
tok = expandToken(output, loc, tok->next->next->next, macros, expandedmacros, parametertokens2);
1897+
if (output->back() == comma)
1898+
output->deleteToken(comma);
1899+
continue;
1900+
}
19201901
TokenList new_output(files);
19211902
if (!expandArg(&new_output, tok, parametertokens2))
19221903
output->push_back(newMacroToken(tok->str(), loc, isReplaced(expandedmacros), tok));
@@ -1961,7 +1942,7 @@ namespace simplecpp {
19611942
tok = expandHashHash(output, loc, tok->previous, macros, expandedmacros, parametertokens2);
19621943
} else {
19631944
// #123 => "123"
1964-
tok = expandHash(output, loc, tok->previous, macros, expandedmacros, parametertokens2);
1945+
tok = expandHash(output, loc, tok->previous, expandedmacros, parametertokens2);
19651946
}
19661947
}
19671948

@@ -2138,14 +2119,17 @@ namespace simplecpp {
21382119
return true;
21392120
for (const Token *partok = parametertokens[argnr]->next; partok != parametertokens[argnr + 1U];) {
21402121
const MacroMap::const_iterator it = macros.find(partok->str());
2141-
if (it != macros.end() && !partok->isExpandedFrom(&it->second) && (partok->str() == name() || expandedmacros.find(partok->str()) == expandedmacros.end()))
2142-
partok = it->second.expand(output, loc, partok, macros, expandedmacros);
2143-
else {
2122+
if (it != macros.end() && !partok->isExpandedFrom(&it->second) && (partok->str() == name() || expandedmacros.find(partok->str()) == expandedmacros.end())) {
2123+
const std::set<TokenString> expandedmacros2; // temporary amnesia to allow reexpansion of currently expanding macros during argument evaluation
2124+
partok = it->second.expand(output, loc, partok, macros, expandedmacros2);
2125+
} else {
21442126
output->push_back(newMacroToken(partok->str(), loc, isReplaced(expandedmacros), partok));
21452127
output->back()->macro = partok->macro;
21462128
partok = partok->next;
21472129
}
21482130
}
2131+
if (tok->whitespaceahead && output->back())
2132+
output->back()->whitespaceahead = true;
21492133
return true;
21502134
}
21512135

@@ -2154,18 +2138,22 @@ namespace simplecpp {
21542138
* @param output destination tokenlist
21552139
* @param loc location for expanded token
21562140
* @param tok The # token
2157-
* @param macros all macros
21582141
* @param expandedmacros set with expanded macros, with this macro
21592142
* @param parametertokens parameters given when expanding this macro
21602143
* @return token after the X
21612144
*/
2162-
const Token *expandHash(TokenList *output, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
2145+
const Token *expandHash(TokenList *output, const Location &loc, const Token *tok, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
21632146
TokenList tokenListHash(files);
2164-
tok = expandToken(&tokenListHash, loc, tok->next, macros, expandedmacros, parametertokens);
2147+
const MacroMap macros2; // temporarily bypass macro expansion
2148+
tok = expandToken(&tokenListHash, loc, tok->next, macros2, expandedmacros, parametertokens);
21652149
std::ostringstream ostr;
21662150
ostr << '\"';
2167-
for (const Token *hashtok = tokenListHash.cfront(); hashtok; hashtok = hashtok->next)
2151+
for (const Token *hashtok = tokenListHash.cfront(), *next; hashtok; hashtok = next) {
2152+
next = hashtok->next;
21682153
ostr << hashtok->str();
2154+
if (next && hashtok->whitespaceahead)
2155+
ostr << ' ';
2156+
}
21692157
ostr << '\"';
21702158
output->push_back(newMacroToken(escapeString(ostr.str()), loc, isReplaced(expandedmacros)));
21712159
return tok;

‎simplecpp.h‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ namespace simplecpp {
9999
*/
100100
class SIMPLECPP_LIB Token {
101101
public:
102-
Token(const TokenString &s, const Location &loc) :
103-
location(loc), previous(nullptr), next(nullptr), string(s) {
102+
Token(const TokenString &s, const Location &loc, bool wsahead = false) :
103+
whitespaceahead(wsahead), location(loc), previous(nullptr), next(nullptr), string(s) {
104104
flags();
105105
}
106106

107107
Token(const Token &tok) :
108-
macro(tok.macro), op(tok.op), comment(tok.comment), name(tok.name), number(tok.number), location(tok.location), previous(nullptr), next(nullptr), string(tok.string), mExpandedFrom(tok.mExpandedFrom) {
108+
macro(tok.macro), op(tok.op), comment(tok.comment), name(tok.name), number(tok.number), whitespaceahead(tok.whitespaceahead), location(tok.location), previous(nullptr), next(nullptr), string(tok.string), mExpandedFrom(tok.mExpandedFrom) {
109109
}
110110

111111
void flags() {
@@ -137,6 +137,7 @@ namespace simplecpp {
137137
bool comment;
138138
bool name;
139139
bool number;
140+
bool whitespaceahead;
140141
Location location;
141142
Token *previous;
142143
Token *next;
@@ -158,6 +159,8 @@ namespace simplecpp {
158159
void setExpandedFrom(const Token *tok, const Macro* m) {
159160
mExpandedFrom = tok->mExpandedFrom;
160161
mExpandedFrom.insert(m);
162+
if (tok->whitespaceahead)
163+
whitespaceahead = true;
161164
}
162165
bool isExpandedFrom(const Macro* m) const {
163166
return mExpandedFrom.find(m) != mExpandedFrom.end();

‎test.cpp‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
#include <string>
1717
#include <vector>
1818

19+
#define STRINGIZE_(x) #x
20+
#define STRINGIZE(x) STRINGIZE_(x)
21+
1922
static int numberOfFailedAssertions = 0;
2023

2124
#define ASSERT_EQUALS(expected, actual) (assertEquals((expected), (actual), __LINE__))
@@ -44,7 +47,7 @@ static int assertEquals(const std::string &expected, const std::string &actual,
4447
return (expected == actual);
4548
}
4649

47-
static int assertEquals(const unsigned int &expected, const unsigned int &actual, int line)
50+
static int assertEquals(const long long &expected, const long long &actual, int line)
4851
{
4952
return assertEquals(std::to_string(expected), std::to_string(actual), line);
5053
}
@@ -717,6 +720,17 @@ static void define_define_11()
717720
ASSERT_EQUALS("\n\n\n\nP2DIR ;", preprocess(code));
718721
}
719722

723+
static void define_define_11a()
724+
{
725+
const char code[] = "#define A_B_C 0x1\n"
726+
"#define A_ADDRESS 0x00001000U\n"
727+
"#define A ((uint32_t ) A_ADDRESS)\n"
728+
"#define CONCAT(x, y, z) x ## _ ## y ## _ ## z\n"
729+
"#define TEST_MACRO CONCAT(A, B, C)\n"
730+
"TEST_MACRO\n";
731+
ASSERT_EQUALS("\n\n\n\n\n0x1", preprocess(code));
732+
}
733+
720734
static void define_define_12()
721735
{
722736
const char code[] = "#define XY(Z) Z\n"
@@ -1019,6 +1033,17 @@ static void hash()
10191033
preprocess("#define A(x) (x)\n"
10201034
"#define B(x) A(#x)\n"
10211035
"B(123)"));
1036+
1037+
ASSERT_EQUALS("\n\nprintf ( \"bar(3)\" \"\\n\" ) ;",
1038+
preprocess("#define bar(x) x % 2\n"
1039+
"#define foo(x) printf(#x \"\\n\")\n"
1040+
"foo(bar(3));"));
1041+
1042+
ASSERT_EQUALS("\n\n\n\"Y Y\"",
1043+
preprocess("#define X(x,y) x y\n"
1044+
"#define STR_(x) #x\n"
1045+
"#define STR(x) STR_(x)\n"
1046+
"STR(X(Y,Y))"));
10221047
}
10231048

10241049
static void hashhash1() // #4703
@@ -1058,6 +1083,16 @@ static void hashhash4() // nonstandard gcc/clang extension for empty varargs
10581083
ASSERT_EQUALS("\n\na ( 1 ) ;", preprocess(code));
10591084
}
10601085

1086+
static void hashhash4a()
1087+
{
1088+
const char code[] = "#define GETMYID(a) ((a))+1\n"
1089+
"#define FIGHT_FOO(c, ...) foo(c, ##__VA_ARGS__)\n"
1090+
"#define FIGHT_BAR(c, args...) bar(c, ##args)\n"
1091+
"FIGHT_FOO(1, GETMYID(a));\n"
1092+
"FIGHT_BAR(1, GETMYID(b));";
1093+
ASSERT_EQUALS("\n\n\nfoo ( 1 , ( ( a ) ) + 1 ) ;\nbar ( 1 , ( ( b ) ) + 1 ) ;", preprocess(code));
1094+
}
1095+
10611096
static void hashhash5()
10621097
{
10631098
ASSERT_EQUALS("x1", preprocess("x##__LINE__"));
@@ -2567,8 +2602,8 @@ static void simplifyPath_cppcheck()
25672602
ASSERT_EQUALS("src/", simplecpp::simplifyPath("src/abc/../"));
25682603

25692604
// Handling of UNC paths on Windows
2570-
ASSERT_EQUALS("//src/test.cpp", simplecpp::simplifyPath("//src/test.cpp"));
2571-
ASSERT_EQUALS("//src/test.cpp", simplecpp::simplifyPath("///src/test.cpp"));
2605+
ASSERT_EQUALS("//" STRINGIZE(UNCHOST) "/test.cpp", simplecpp::simplifyPath("//" STRINGIZE(UNCHOST) "/test.cpp"));
2606+
ASSERT_EQUALS("//" STRINGIZE(UNCHOST) "/test.cpp", simplecpp::simplifyPath("///" STRINGIZE(UNCHOST) "/test.cpp"));
25722607
}
25732608

25742609
static void simplifyPath_New()
@@ -2899,6 +2934,7 @@ int main(int argc, char **argv)
28992934
TEST_CASE(define_define_9); // line break in nested macro call
29002935
TEST_CASE(define_define_10);
29012936
TEST_CASE(define_define_11);
2937+
TEST_CASE(define_define_11a);
29022938
TEST_CASE(define_define_12); // expand result of ##
29032939
TEST_CASE(define_define_13);
29042940
TEST_CASE(define_define_14);
@@ -2936,6 +2972,7 @@ int main(int argc, char **argv)
29362972
TEST_CASE(hashhash2);
29372973
TEST_CASE(hashhash3);
29382974
TEST_CASE(hashhash4);
2975+
TEST_CASE(hashhash4a); // #66, #130
29392976
TEST_CASE(hashhash5);
29402977
TEST_CASE(hashhash6);
29412978
TEST_CASE(hashhash7); // # ## # (C standard; 6.10.3.3.p4)

0 commit comments

Comments
 (0)