Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion lib/cppcheck.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,8 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
if (mUnusedFunctionsCheck && mSettings.useSingleJob() && mSettings.buildDir.empty()) {
// this is not a real source file - we just want to tokenize it. treat it as C anyways as the language needs to be determined.
Tokenizer tokenizer(mSettings, *this);
tokenizer.list.setLang(Standards::Language::C);
// enforce the language since markup files are special and do not adhere to the enforced language
tokenizer.list.setLang(Standards::Language::C, true);
if (fileStream) {
tokenizer.list.createTokens(*fileStream, filename);
}
Expand Down
7 changes: 5 additions & 2 deletions lib/tokenlist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2180,10 +2180,13 @@ bool TokenList::isCPP() const
return mLang == Standards::Language::CPP;
}

void TokenList::setLang(Standards::Language lang)
void TokenList::setLang(Standards::Language lang, bool force)
{
ASSERT_LANG(lang != Standards::Language::None);
ASSERT_LANG(mLang == Standards::Language::None);
if (!force)
{
ASSERT_LANG(mLang == Standards::Language::None);
}

mLang = lang;
}
3 changes: 2 additions & 1 deletion lib/tokenlist.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ class CPPCHECKLIB TokenList {
/** @return true if the code is C++ */
bool isCPP() const;

void setLang(Standards::Language lang);
// TODO: get rid of this
void setLang(Standards::Language lang, bool force = false);

/**
* Delete all tokens in given token list
Expand Down
24 changes: 23 additions & 1 deletion test/cli/other_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -1357,4 +1357,26 @@ def test_rule(tmpdir):
lines = stderr.splitlines()
assert lines == [
"{}:4:0: style: found 'f' [rule]".format(test_file)
]
]


def test_markup_lang(tmpdir):
test_file_1 = os.path.join(tmpdir, 'test_1.qml')
with open(test_file_1, 'wt') as f:
pass
test_file_2 = os.path.join(tmpdir, 'test_2.cpp')
with open(test_file_2, 'wt') as f:
pass

# do not assert processing markup file with enforced language
args = [
'--library=qt',
'--enable=unusedFunction',
'--language=c++',
'-j1',
test_file_1,
test_file_2
]

exitcode, stdout, _ = cppcheck(args)
assert exitcode == 0, stdout