Skip to content

Fix including macros with '<file>' definition #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
baltth wants to merge 2 commits into from
Closed

Fix including macros with '<file>' definition #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c8413b
Include macros with '<file>' definition
baltth Dec 19, 2017
3b38c7f
Remove unused var
baltth Dec 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions simplecpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,10 +570,12 @@ void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filen
currentToken += ch;
}

if (currentToken == "<" && lastLine() == "# include") {
currentToken = readUntil(istr, location, '<', '>', outputList);
if (currentToken.size() < 2U)
return;
if (currentToken == "<") {
if ((lastLine() == "# include") || (lastLine() == (std::string("# define ") + lastTokenInLine()))) {
currentToken = readUntil(istr, location, '<', '>', outputList);
if (currentToken.size() < 2U)
return;
}
}

push_back(new Token(currentToken, location));
Expand Down Expand Up @@ -1015,6 +1017,19 @@ std::string simplecpp::TokenList::lastLine(int maxsize) const
return ret;
}

std::string simplecpp::TokenList::lastTokenInLine() const
{
std::string ret;
for (const Token *tok = cback(); sameline(tok,cback()); tok = tok->previous) {
if (!tok->comment) {
ret = (tok->str[0] == '\"' ? std::string("%str%")
: std::isdigit(static_cast<unsigned char>(tok->str[0])) ? std::string("%num%") : tok->str) + ret;
break;
}
}
return ret;
}

unsigned int simplecpp::TokenList::fileIndex(const std::string &filename)
{
for (unsigned int i = 0; i < files.size(); ++i) {
Expand Down
1 change: 1 addition & 0 deletions simplecpp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ namespace simplecpp {
std::string readUntil(std::istream &istr, const Location &location, const char start, const char end, OutputList *outputList);

std::string lastLine(int maxsize=10) const;
std::string lastTokenInLine() const;

unsigned int fileIndex(const std::string &filename);

Expand Down
23 changes: 23 additions & 0 deletions test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,6 +1055,28 @@ static void include6() // #57 - incomplete macro #include MACRO(,)
simplecpp::preprocess(out, rawtokens, files, filedata, dui);
}

static void include7() // #3 - handle #include MACRO with <>
{
const char code_c[] = "#define A <3.h>\n#include A\n";
const char code_h[] = "123\n";

std::vector<std::string> files;
std::istringstream istr_c(code_c);
simplecpp::TokenList rawtokens_c(istr_c, files, "3.c");
std::istringstream istr_h(code_h);
simplecpp::TokenList rawtokens_h(istr_h, files, "3.h");

std::map<std::string, simplecpp::TokenList *> filedata;
filedata["3.c"] = &rawtokens_c;
filedata["3.h"] = &rawtokens_h;

simplecpp::TokenList out(files);
simplecpp::DUI dui;
simplecpp::preprocess(out, rawtokens_c, files, filedata, dui);

ASSERT_EQUALS("\n#line 1 \"3.h\"\n123", out.stringify());
}

static void readfile_nullbyte()
{
const char code[] = "ab\0cd";
Expand Down Expand Up @@ -1445,6 +1467,7 @@ int main(int argc, char **argv)
TEST_CASE(include4); // -include
TEST_CASE(include5); // #include MACRO
TEST_CASE(include6); // invalid code: #include MACRO(,)
TEST_CASE(include7); // #include MACRO with <>

TEST_CASE(multiline1);
TEST_CASE(multiline2);
Expand Down