Commit
I recently noticed there were several invocations of `wcwidth()` that should have been `fish_wcwidth()`. This adds custom cppcheck rules to detect that mistake.
- Loading branch information
There are no files selected for viewing
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,18 @@ | |||
<?xml version="1.0"?> | |||
<rule version="1"> | |||
<pattern> wcwidth \(</pattern> | |||
<message> | |||
<id>wcwidthForbidden</id> | |||
<severity>warning</severity> | |||
<summary>Always use fish_wcwidth rather than wcwidth.</summary> | |||
</message> | |||
</rule> | |||
|
|||
<rule version="1"> | |||
<pattern> wcswidth \(</pattern> | |||
<message> | |||
<id>wcswidthForbidden</id> | |||
<severity>warning</severity> | |||
<summary>Always use fish_wcswidth rather than wcswidth.</summary> | |||
</message> | |||
</rule> |
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
|
@@ -92,7 +92,7 @@ if set -q c_files[1] | ||
# The stderr to stdout redirection is because cppcheck, incorrectly IMHO, writes its | # The stderr to stdout redirection is because cppcheck, incorrectly IMHO, writes its | ||
# diagnostic messages to stderr. Anyone running this who wants to capture its output will | # diagnostic messages to stderr. Anyone running this who wants to capture its output will | ||
# expect those messages to be written to stdout. | # expect those messages to be written to stdout. | ||
cppcheck -q --verbose --std=posix --std=c11 --language=c++ --template "[{file}:{line}]: {severity} ({id}): {message}" --suppress=missingIncludeSystem --inline-suppr --enable=$cppchecks $cppcheck_args $c_files 2>&1 | cppcheck -q --verbose --std=posix --std=c11 --language=c++ --template "[{file}:{line}]: {severity} ({id}): {message}" --suppress=missingIncludeSystem --inline-suppr --enable=$cppchecks --rule-file=.cppcheck.rule $cppcheck_args $c_files 2>&1 | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
krader1961
Author
Contributor
|
|||
end | end | ||
|
|
||
if type -q oclint | if type -q oclint | ||
|
3 comments
on commit dc58edd
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we have two places with cppcheck commands in fish script? (d77c20b?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good question. I hadn't noticed the cppcheck.sh script when I embarked on writing the more ambitious lint.fish script. I'd say remove it but since @ridiculousfish just updated it presumably he finds it useful.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd suggest if we don't remove it, we update that to use our preferences and call that from here. Could use argv
to give it some further options specific to the Make usage - it may be useful for people integrating it with other tools. I know nothing is expecting our template or stderr getting bubkis.
Also, I believe
--std=c11
is not necessary here (or we should also add--std=c++11
?)C++11 and C11 are the defaults. The only non-default
--std
we need to add isposix
.