Skip to content

TokenList: actually consider configured standard in isKeyword() #5619

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

Merged
danmar merged 2 commits into from
Nov 7, 2023
Merged

TokenList: actually consider configured standard in isKeyword() #5619

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
776b197
TestTokenList: added more tests for `isKeyword()`
firewave Nov 4, 2023
dbc8f61
TokenList: actually consider configured standard in `isKeyword()`
firewave Nov 3, 2023
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
21 changes: 12 additions & 9 deletions lib/tokenlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2051,14 +2051,13 @@ bool TokenList::isKeyword(const std::string &str) const
if (cpp_types.find(str) != cpp_types.end())
return false;

// TODO: properly apply configured standard
if (!mSettings || mSettings->standards.cpp >= Standards::CPP20) {
static const auto& cpp20_keywords = Keywords::getAll(Standards::cppstd_t::CPP20);
return cpp20_keywords.find(str) != cpp20_keywords.end();
if (mSettings) {
const auto &cpp_keywords = Keywords::getAll(mSettings->standards.cpp);
return cpp_keywords.find(str) != cpp_keywords.end();
Comment thread
danmar marked this conversation as resolved.
}

static const auto& cpp_keywords = Keywords::getAll(Standards::cppstd_t::CPP11);
return cpp_keywords.find(str) != cpp_keywords.end();
static const auto& latest_cpp_keywords = Keywords::getAll(Standards::cppstd_t::CPPLatest);
return latest_cpp_keywords.find(str) != latest_cpp_keywords.end();
}

// TODO: integrate into Keywords?
Expand All @@ -2067,7 +2066,11 @@ bool TokenList::isKeyword(const std::string &str) const
if (c_types.find(str) != c_types.end())
return false;

// TODO: use configured standard
static const auto& c_keywords = Keywords::getAll(Standards::cstd_t::C99);
return c_keywords.find(str) != c_keywords.end();
if (mSettings) {
const auto &c_keywords = Keywords::getAll(mSettings->standards.c);
return c_keywords.find(str) != c_keywords.end();
}

static const auto& latest_c_keywords = Keywords::getAll(Standards::cstd_t::CLatest);
return latest_c_keywords.find(str) != latest_c_keywords.end();
}
50 changes: 50 additions & 0 deletions test/testtokenlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,56 @@ class TestTokenList : public TestFixture {
ASSERT_EQUALS(true, tokenlist.front()->tokAt(4)->isLiteral());
ASSERT_EQUALS(false, tokenlist.front()->tokAt(4)->isControlFlowKeyword());
}

{
const char code2[] = "_Generic"; // C11 keyword
TokenList tokenlist(nullptr); // no settings use latest standard
std::istringstream istr(code2);
tokenlist.createTokens(istr, "a.cpp");
ASSERT_EQUALS(false, tokenlist.front()->isKeyword());
}

{
const char code2[] = "_Generic"; // C11 keyword
TokenList tokenlist(nullptr); // no settings use latest standard
std::istringstream istr(code2);
tokenlist.createTokens(istr, "a.c");
ASSERT_EQUALS(true, tokenlist.front()->isKeyword());
}

{
const char code2[] = "_Generic"; // C11 keyword
const Settings s = settingsBuilder().c(Standards::C89).build();
TokenList tokenlist(&s);
std::istringstream istr(code2);
tokenlist.createTokens(istr, "a.c");
ASSERT_EQUALS(false, tokenlist.front()->isKeyword());
}

{
const char code2[] = "co_return"; // C++20 keyword
TokenList tokenlist(nullptr); // no settings use latest standard
std::istringstream istr(code2);
tokenlist.createTokens(istr, "a.cpp");
ASSERT_EQUALS(true, tokenlist.front()->isKeyword());
}

{
const char code2[] = "co_return"; // C++20 keyword
TokenList tokenlist(nullptr); // no settings use latest standard
std::istringstream istr(code2);
tokenlist.createTokens(istr, "a.c");
ASSERT_EQUALS(false, tokenlist.front()->isKeyword());
}

{
const char code2[] = "noexcept"; // C++11 keyword
const Settings s = settingsBuilder().cpp(Standards::CPP03).build();
TokenList tokenlist(&s);
std::istringstream istr(code2);
tokenlist.createTokens(istr, "a.cpp");
ASSERT_EQUALS(false, tokenlist.front()->isKeyword());
}
}
};

Expand Down