walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fix hang from f48e195c31 (fix #10136 TODO test (#3117)) (#3120) 

Co-authored-by: Robert Reif <reif@FX6840>
This commit is contained in:
IOBYTE 2021-02-09 08:19:01 -05:00 committed by GitHub
parent 25fa7c55d8
commit d3d2e16137
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenize.cpp
View File

@ -1812,7 +1812,7 @@ namespace {
const ScopeInfo3 * tempScope = this; const ScopeInfo3 * tempScope = this;
while (tempScope) { while (tempScope) {
for (const auto & child : tempScope->children) { for (const auto & child : tempScope->children) {
if (child.name == scope || child.fullName == scope) if (child.type == Record && (child.name == scope || child.fullName == scope))
return &child; return &child;
} }

27
test/testsimplifyusing.cpp
View File

@ -974,6 +974,33 @@ private:
ASSERT_EQUALS(exp, tok(code, true)); ASSERT_EQUALS(exp, tok(code, true));
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
{
const char code[] = "foo::ResultCodes_e\n"
"GemImpl::setR(const ::foo::s _ipSource)\n"
"{\n"
" M3_LOG_EE_DEBUG();\n"
" using MLSource = foo::s::Literal;\n"
" auto ret = foo::ResultCodes_e::NO_ERROR;\n"
" M3_LOG_INFO(\"foo(\" << static_cast<int>(_ipSource) << \")\");\n"
" return ret;\n"
"}\n"
"foo::ResultCodes_e\n"
"GemImpl::getF(::foo::s &_ipSource)\n"
"{\n"
" M3_LOG_EE_DEBUG();\n"
" auto ret = foo::ResultCodes_e::NO_ERROR;\n"
" return ret;\n"
"}\n"
"foo::ResultCodes_e\n"
"GemImpl::setF(const ::foo::s _ipSource)\n"
"{\n"
" M3_LOG_EE_DEBUG();\n"
" using MLSource = foo::s::Literal;\n"
" auto ret = foo::ResultCodes_e::NO_ERROR;\n"
" return ret;\n"
"}";
tok(code, true); // don't crash
}
} }
void simplifyUsing10171() { void simplifyUsing10171() {