Skip to content

Fix #13648: False positive: Misra C 16.3: warn on default in pragma #7314

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 6 commits into from
Feb 25, 2025
Merged

Fix #13648: False positive: Misra C 16.3: warn on default in pragma #7314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
880f496
Fix #13648: False positive: Misra C 16.5: warn on default in macro
olabetskyi Feb 21, 2025
b8dc47a
Fix CI
olabetskyi Feb 21, 2025
afa20fc
Nits
olabetskyi Feb 24, 2025
3f2e9cb
Nits
olabetskyi Feb 24, 2025
4967004
Nits 3
olabetskyi Feb 24, 2025
61f7a68
Nits 4
olabetskyi Feb 25, 2025
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
14 changes: 7 additions & 7 deletions addons/misra.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3157,15 +3157,15 @@ def misra_16_3(self, rawTokens):
STATE_OK = 2 # a case/default is allowed (we have seen 'break;'/'comment'/'{'/attribute)
STATE_SWITCH = 3 # walking through switch statement scope

define = None
directive = None
state = STATE_NONE
end_switch_token = None # end '}' for the switch scope
for token in rawTokens:
if simpleMatch(token, '# define'):
define = token
if define:
if token.linenr != define.linenr:
define = None
if simpleMatch(token, '# define') or simpleMatch(token, '# pragma'):
directive = token
if directive:
if token.linenr != directive.linenr:
directive = None
else:
continue

Expand Down Expand Up @@ -3231,7 +3231,7 @@ def misra_16_5(self, data):
for token in data.tokenlist:
if token.str != 'default':
continue
if token.previous and token.previous.str == '{':
if token.previous and (token.previous.str == '{'):
continue
tok2 = token
while tok2:
Expand Down
2 changes: 2 additions & 0 deletions addons/test/misra/misra-test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// ~/cppcheck/cppcheck --dump misra/misra-test.h --std=c89
// ~/cppcheck/cppcheck --dump -DDUMMY --suppress=uninitvar --inline-suppr misra/misra-test.c --std=c89 --platform=unix64 && python3 ../misra.py -verify misra/misra-test.c.dump

#pragma ghs section rodata=default // no warning

#include "path\file.h" // 20.2
#include "file//.h" // 20.2
#include "file/*.h" // 20.2
Expand Down