forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix static warnings and add tests for function_attribute_check

This commit is contained in:
brianush1 2022-12-28 19:05:51 -05:00 committed by Jan Jurzitza
parent ba4617efac
commit d0c670a415
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/dscanner/analysis/function_attributes.d
View File

@ -115,6 +115,7 @@ final class FunctionAttributeCheck : BaseAnalyzer
override void visit(const Declaration dec) override void visit(const Declaration dec)
{ {
bool isStatic = false;
if (dec.attributes.length == 0) if (dec.attributes.length == 0)
goto end; goto end;
foreach (attr; dec.attributes) foreach (attr; dec.attributes)
@ -126,6 +127,10 @@ final class FunctionAttributeCheck : BaseAnalyzer
addErrorMessage(attr.attribute.line, attr.attribute.column, KEY, ABSTRACT_MESSAGE); addErrorMessage(attr.attribute.line, attr.attribute.column, KEY, ABSTRACT_MESSAGE);
continue; continue;
} }
if (attr.attribute == tok!"static")
{
isStatic = true;
}
if (dec.functionDeclaration !is null && (attr.attribute == tok!"const" if (dec.functionDeclaration !is null && (attr.attribute == tok!"const"
|| attr.attribute == tok!"inout" || attr.attribute == tok!"immutable")) || attr.attribute == tok!"inout" || attr.attribute == tok!"immutable"))
{ {
@ -139,7 +144,15 @@ final class FunctionAttributeCheck : BaseAnalyzer
} }
} }
end: end:
dec.accept(this); if (isStatic) {
const t = inAggregate;
inAggregate = false;
dec.accept(this);
inAggregate = t;
}
else {
dec.accept(this);
}
} }
private: private:
@ -157,25 +170,30 @@ unittest
sac.function_attribute_check = Check.enabled; sac.function_attribute_check = Check.enabled;
assertAnalyzerWarnings(q{ assertAnalyzerWarnings(q{
int foo() @property { return 0; } int foo() @property { return 0; }
const int confusingConst() { return 0; } // [warn]: 'const' is not an attribute of the return type. Place it after the parameter list to clarify.
class ClassName { class ClassName {
const int confusingConst() { return 0; } // [warn]: 'const' is not an attribute of the return type. Place it after the parameter list to clarify.
int bar() @property { return 0; } // [warn]: Zero-parameter '@property' function should be marked 'const', 'inout', or 'immutable'. int bar() @property { return 0; } // [warn]: Zero-parameter '@property' function should be marked 'const', 'inout', or 'immutable'.
static int barStatic() @property { return 0; }
int barConst() const @property { return 0; } int barConst() const @property { return 0; }
} }
struct StructName { struct StructName {
int bar() @property { return 0; } // [warn]: Zero-parameter '@property' function should be marked 'const', 'inout', or 'immutable'. int bar() @property { return 0; } // [warn]: Zero-parameter '@property' function should be marked 'const', 'inout', or 'immutable'.
static int barStatic() @property { return 0; }
int barConst() const @property { return 0; } int barConst() const @property { return 0; }
} }
union UnionName { union UnionName {
int bar() @property { return 0; } // [warn]: Zero-parameter '@property' function should be marked 'const', 'inout', or 'immutable'. int bar() @property { return 0; } // [warn]: Zero-parameter '@property' function should be marked 'const', 'inout', or 'immutable'.
static int barStatic() @property { return 0; }
int barConst() const @property { return 0; } int barConst() const @property { return 0; }
} }
interface InterfaceName { interface InterfaceName {
int bar() @property; // [warn]: Zero-parameter '@property' function should be marked 'const', 'inout', or 'immutable'. int bar() @property; // [warn]: Zero-parameter '@property' function should be marked 'const', 'inout', or 'immutable'.
static int barStatic() @property { return 0; }
int barConst() const @property; int barConst() const @property;
abstract int method(); // [warn]: 'abstract' attribute is redundant in interface declarations abstract int method(); // [warn]: 'abstract' attribute is redundant in interface declarations