From 74c67be36604e4af1f8be75e98023bbcb6dffd40 Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Sun, 17 Jan 2021 01:05:02 -0500
Subject: [PATCH] move slot size to a macro.

---
 Ample/NewSlotViewController.m | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Ample/NewSlotViewController.m b/Ample/NewSlotViewController.m
index 5cecd76..b72dc0b 100644
--- a/Ample/NewSlotViewController.m
+++ b/Ample/NewSlotViewController.m
@@ -9,6 +9,9 @@
 #import "NewSlotViewController.h"
 #import "Menu.h"
 
+/* number of slot types.  bitmask used so should be < sizeof(unsigned *8) */
+#define MAX_SLOTS 16
+static_assert(MAX_SLOTS <= sizeof(unsigned) * 8, "too many slot types");
 
 @implementation SlotTableCellView
 
@@ -160,9 +163,9 @@
     unsigned _slots_valid;
     unsigned _slots_default;
 
-    NSDictionary *_slot_object[16];
-    NSDictionary *_slot_media[16];
-    NSString *_slot_value[16]; // when explicitely set.
+    NSDictionary *_slot_object[MAX_SLOTS];
+    NSDictionary *_slot_media[MAX_SLOTS];
+    NSString *_slot_value[MAX_SLOTS]; // when explicitely set.
     NSDictionary *_machine_media;
     
     NSDictionary *_machine_data;
@@ -186,7 +189,7 @@
     _machine_media = nil;
     _machine_data = nil;
     
-    for (unsigned i = 0; i < 16; ++i) {
+    for (unsigned i = 0; i < MAX_SLOTS; ++i) {
         _slot_media[i] = nil;
         _slot_object[i] = nil;
         _slot_value[i] = nil;
@@ -310,7 +313,7 @@
 #endif
 #if 1
     unsigned mask = 1;
-    for (unsigned i = 0; i < 16; ++i, mask <<= 1) {
+    for (unsigned i = 0; i < MAX_SLOTS; ++i, mask <<= 1) {
         
         if (_slots_valid & mask) {
             NSDictionary *tmp = _slot_media[i];
@@ -386,7 +389,7 @@ static NSString *SlotFlagForIndex(unsigned index){
     
 #if 0
     unsigned mask = 1;
-    for (unsigned i = 0 ; i < 16; ++i, mask <<= 1) {
+    for (unsigned i = 0 ; i < MAX_SLOTS; ++i, mask <<= 1) {
         
         if (!(_slots_valid & mask)) continue;
         NSDictionary *d = _slot_object[i];
@@ -439,7 +442,7 @@ static NSString *SlotFlagForIndex(unsigned index){
 -(IBAction)resetSlots:(id)sender {
     
     _slots_explicit = 0;
-    for (unsigned i = 0; i < 16; ++i) {
+    for (unsigned i = 0; i < MAX_SLOTS; ++i) {
         _slot_media[i] = nil;
         _slot_object[i] = nil;
         _slot_value[i] = nil;