From 4499e559f021bf719818f4a7157e06549af59e1b Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Thu, 28 Feb 2019 12:09:21 +0100
Subject: [PATCH] final attrib check, prevent using an array to store the
 protection

---
 src/dscanner/analysis/final_attribute.d | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/dscanner/analysis/final_attribute.d b/src/dscanner/analysis/final_attribute.d
index 7616aa7..e899b27 100644
--- a/src/dscanner/analysis/final_attribute.d
+++ b/src/dscanner/analysis/final_attribute.d
@@ -48,7 +48,7 @@ private:
 		interface_
 	}
 
-	bool[] _private;
+	bool _private;
 	bool _finalAggregate;
 	bool _alwaysStatic;
 	bool _blockStatic;
@@ -66,54 +66,55 @@ public:
 
 	alias visit = BaseAnalyzer.visit;
 
+	enum pushPopPrivate = q{
+		const bool wasPrivate = _private;
+		_private = false;
+		scope (exit) _private = wasPrivate;
+	};
+
 	///
 	this(string fileName, bool skipTests = false)
 	{
 		super(fileName, null, skipTests);
-		_private.length = 1;
 	}
 
 	override void visit(const(StructDeclaration) sd)
 	{
+		mixin (pushPopPrivate);
 		const Parent saved = _parent;
 		_parent = Parent.struct_;
-		_private.length += 1;
 		_alwaysStatic = false;
 		sd.accept(this);
-		_private.length -= 1;
 		_parent = saved;
 	}
 
 	override void visit(const(InterfaceDeclaration) id)
 	{
+		mixin (pushPopPrivate);
 		const Parent saved = _parent;
 		_parent = Parent.interface_;
-		_private.length += 1;
 		_alwaysStatic = false;
 		id.accept(this);
-		_private.length -= 1;
 		_parent = saved;
 	}
 
 	override void visit(const(UnionDeclaration) ud)
 	{
+		mixin (pushPopPrivate);
 		const Parent saved = _parent;
 		_parent = Parent.union_;
-		_private.length += 1;
 		_alwaysStatic = false;
 		ud.accept(this);
-		_private.length -= 1;
 		_parent = saved;
 	}
 
 	override void visit(const(ClassDeclaration) cd)
 	{
+		mixin (pushPopPrivate);
 		const Parent saved = _parent;
 		_parent = Parent.class_;
-		_private.length += 1;
 		_alwaysStatic = false;
 		cd.accept(this);
-		_private.length -= 1;
 		_parent = saved;
 	}
 
@@ -170,7 +171,7 @@ public:
 		if (d.attributeDeclaration && d.attributeDeclaration.attribute)
 		{
 			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
@@ -190,7 +191,7 @@ public:
 
 		if (isPrivateOnce)
 			isPrivate = true;
-		else if (_private[$-1] && !changeProtectionOnce)
+		else if (_private && !changeProtectionOnce)
 			isPrivate = true;
 
 		// check final aggregate type