From e9826d2e7e2e175988d80e58a54b376ba06b4993 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Fri, 6 Dec 2024 16:03:46 -0500
Subject: [PATCH] Use launch-time declarations.

---
 Analyser/Static/Commodore/Target.hpp | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/Analyser/Static/Commodore/Target.hpp b/Analyser/Static/Commodore/Target.hpp
index 78d4fdbfe..d55598989 100644
--- a/Analyser/Static/Commodore/Target.hpp
+++ b/Analyser/Static/Commodore/Target.hpp
@@ -54,18 +54,19 @@ struct Target: public Analyser::Static::Target, public Reflection::StructImpl<Ta
 	bool has_c1540 = false;
 	std::string loading_command;
 
-	Target() : Analyser::Static::Target(Machine::Vic20) {
-		if(needs_declare()) {
-			DeclareField(enabled_ram.bank0);
-			DeclareField(enabled_ram.bank1);
-			DeclareField(enabled_ram.bank2);
-			DeclareField(enabled_ram.bank3);
-			DeclareField(enabled_ram.bank5);
-			DeclareField(region);
-			DeclareField(has_c1540);
-			AnnounceEnum(Region);
-		}
-	}
+	Target() : Analyser::Static::Target(Machine::Vic20) {}
+
+private:
+	BEGIN_DECLARATIONS
+		DeclareField(enabled_ram.bank0);
+		DeclareField(enabled_ram.bank1);
+		DeclareField(enabled_ram.bank2);
+		DeclareField(enabled_ram.bank3);
+		DeclareField(enabled_ram.bank5);
+		DeclareField(region);
+		DeclareField(has_c1540);
+		AnnounceEnum(Region);
+	END_DECLARATIONS
 };
 
 }