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

final attrib check, prevent using an array to store the protection

This commit is contained in:
Basile Burg 2019-02-28 12:09:21 +01:00
parent 7850f30ec9
commit 4499e559f0
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/dscanner/analysis/final_attribute.d
View File

@ -48,7 +48,7 @@ private:
interface_ interface_
} }
bool[] _private; bool _private;
bool _finalAggregate; bool _finalAggregate;
bool _alwaysStatic; bool _alwaysStatic;
bool _blockStatic; bool _blockStatic;
@ -66,54 +66,55 @@ public:
alias visit = BaseAnalyzer.visit; alias visit = BaseAnalyzer.visit;
enum pushPopPrivate = q{
const bool wasPrivate = _private;
_private = false;
scope (exit) _private = wasPrivate;
};
/// ///
this(string fileName, bool skipTests = false) this(string fileName, bool skipTests = false)
{ {
super(fileName, null, skipTests); super(fileName, null, skipTests);
_private.length = 1;
} }
override void visit(const(StructDeclaration) sd) override void visit(const(StructDeclaration) sd)
{ {
mixin (pushPopPrivate);
const Parent saved = _parent; const Parent saved = _parent;
_parent = Parent.struct_; _parent = Parent.struct_;
_private.length += 1;
_alwaysStatic = false; _alwaysStatic = false;
sd.accept(this); sd.accept(this);
_private.length -= 1;
_parent = saved; _parent = saved;
} }
override void visit(const(InterfaceDeclaration) id) override void visit(const(InterfaceDeclaration) id)
{ {
mixin (pushPopPrivate);
const Parent saved = _parent; const Parent saved = _parent;
_parent = Parent.interface_; _parent = Parent.interface_;
_private.length += 1;
_alwaysStatic = false; _alwaysStatic = false;
id.accept(this); id.accept(this);
_private.length -= 1;
_parent = saved; _parent = saved;
} }
override void visit(const(UnionDeclaration) ud) override void visit(const(UnionDeclaration) ud)
{ {
mixin (pushPopPrivate);
const Parent saved = _parent; const Parent saved = _parent;
_parent = Parent.union_; _parent = Parent.union_;
_private.length += 1;
_alwaysStatic = false; _alwaysStatic = false;
ud.accept(this); ud.accept(this);
_private.length -= 1;
_parent = saved; _parent = saved;
} }
override void visit(const(ClassDeclaration) cd) override void visit(const(ClassDeclaration) cd)
{ {
mixin (pushPopPrivate);
const Parent saved = _parent; const Parent saved = _parent;
_parent = Parent.class_; _parent = Parent.class_;
_private.length += 1;
_alwaysStatic = false; _alwaysStatic = false;
cd.accept(this); cd.accept(this);
_private.length -= 1;
_parent = saved; _parent = saved;
} }
@ -170,7 +171,7 @@ public:
if (d.attributeDeclaration && d.attributeDeclaration.attribute) if (d.attributeDeclaration && d.attributeDeclaration.attribute)
{ {
const tp = d.attributeDeclaration.attribute.attribute.type; const tp = d.attributeDeclaration.attribute.attribute.type;
_private[$-1] = isProtection(tp) & (tp == tok!"private"); _private = isProtection(tp) & (tp == tok!"private");
} }
const bool isFinal = d.attributes const bool isFinal = d.attributes
@ -190,7 +191,7 @@ public:
if (isPrivateOnce) if (isPrivateOnce)
isPrivate = true; isPrivate = true;
else if (_private[$-1] && !changeProtectionOnce) else if (_private && !changeProtectionOnce)
isPrivate = true; isPrivate = true;
// check final aggregate type // check final aggregate type