From 4ef40ff15177f4a735665a98877a98808a8319c0 Mon Sep 17 00:00:00 2001
From: David Richardson <david.richardson@enquora.com>
Date: Tue, 4 Aug 2026 18:40:57 -0600
Subject: [PATCH] refactor(foundation): expand placeholder redirection macro in
 CPArray

Remove the pre-processor dependency on FORWARD_TO_CONCRETE_CLASS by  inlining the class cluster instantiation routing logic across all designated initializers to support the new Go-based toolchain architecture.
---
 Foundation/CPArray/_CPArray.j | 64 ++++++++++++++++++++++++++---------
 1 file changed, 48 insertions(+), 16 deletions(-)

diff --git a/Foundation/CPArray/_CPArray.j b/Foundation/CPArray/_CPArray.j
index 0f0bb2ee4..39c18b4ab 100755
--- a/Foundation/CPArray/_CPArray.j
+++ b/Foundation/CPArray/_CPArray.j
@@ -43,14 +43,6 @@ var concat = Array.prototype.concat,
     join = Array.prototype.join,
     push = Array.prototype.push;
 
-#define FORWARD_TO_CONCRETE_CLASS()\
-    if (self === _CPSharedPlaceholderArray)\
-    {\
-        arguments[0] = [_CPJavaScriptArray alloc];\
-        return objj_msgSend.apply(this, arguments);\
-    }\
-    return [super init];
-
 /*!
     @class CPArray
     @brief A mutable array backed by a JavaScript Array.
@@ -133,7 +125,14 @@ var concat = Array.prototype.concat,
 */
 - (id)init
 {
-    FORWARD_TO_CONCRETE_CLASS();
+    // Expanded inline to remove the pre-processor dependency on FORWARD_TO_CONCRETE_CLASS()
+    // for the Go-based toolchain, routing placeholder instantiation requests directly to _CPJavaScriptArray.
+    if (self === _CPSharedPlaceholderArray)
+    {
+        arguments[0] = [_CPJavaScriptArray alloc];
+        return objj_msgSend.apply(this, arguments);
+    }
+    return [super init];
 }
 
 // Creating an Array
@@ -144,7 +143,14 @@ var concat = Array.prototype.concat,
 */
 - (id)initWithArray:(CPArray)anArray
 {
-    FORWARD_TO_CONCRETE_CLASS();
+    // Expanded inline to remove the pre-processor dependency on FORWARD_TO_CONCRETE_CLASS()
+    // for the Go-based toolchain, routing placeholder instantiation requests directly to _CPJavaScriptArray.
+    if (self === _CPSharedPlaceholderArray)
+    {
+        arguments[0] = [_CPJavaScriptArray alloc];
+        return objj_msgSend.apply(this, arguments);
+    }
+    return [super init];
 }
 
 /*!
@@ -157,7 +163,14 @@ var concat = Array.prototype.concat,
 */
 - (id)initWithArray:(CPArray)anArray copyItems:(BOOL)shouldCopyItems
 {
-    FORWARD_TO_CONCRETE_CLASS();
+    // Expanded inline to remove the pre-processor dependency on FORWARD_TO_CONCRETE_CLASS()
+    // for the Go-based toolchain, routing placeholder instantiation requests directly to _CPJavaScriptArray.
+    if (self === _CPSharedPlaceholderArray)
+    {
+        arguments[0] = [_CPJavaScriptArray alloc];
+        return objj_msgSend.apply(this, arguments);
+    }
+    return [super init];
 }
 
 /*!
@@ -165,7 +178,14 @@ var concat = Array.prototype.concat,
 */
 - (id)initWithObjects:(id)anObject, ...
 {
-    FORWARD_TO_CONCRETE_CLASS();
+    // Expanded inline to remove the pre-processor dependency on FORWARD_TO_CONCRETE_CLASS()
+    // for the Go-based toolchain, routing placeholder instantiation requests directly to _CPJavaScriptArray.
+    if (self === _CPSharedPlaceholderArray)
+    {
+        arguments[0] = [_CPJavaScriptArray alloc];
+        return objj_msgSend.apply(this, arguments);
+    }
+    return [super init];
 }
 
 /*!
@@ -176,13 +196,27 @@ var concat = Array.prototype.concat,
 */
 - (id)initWithObjects:(CPArray)objects count:(CPUInteger)aCount
 {
-    FORWARD_TO_CONCRETE_CLASS();
+    // Expanded inline to remove the pre-processor dependency on FORWARD_TO_CONCRETE_CLASS()
+    // for the Go-based toolchain, routing placeholder instantiation requests directly to _CPJavaScriptArray.
+    if (self === _CPSharedPlaceholderArray)
+    {
+        arguments[0] = [_CPJavaScriptArray alloc];
+        return objj_msgSend.apply(this, arguments);
+    }
+    return [super init];
 }
 
 // FIXME: This should be defined in CPMutableArray, not here.
 - (id)initWithCapacity:(CPUInteger)aCapacity
 {
-    FORWARD_TO_CONCRETE_CLASS();
+    // Expanded inline to remove the pre-processor dependency on FORWARD_TO_CONCRETE_CLASS()
+    // for the Go-based toolchain, routing placeholder instantiation requests directly to _CPJavaScriptArray.
+    if (self === _CPSharedPlaceholderArray)
+    {
+        arguments[0] = [_CPJavaScriptArray alloc];
+        return objj_msgSend.apply(this, arguments);
+    }
+    return [super init];
 }
 
 // Querying an array
@@ -1057,5 +1091,3 @@ var _CPSharedPlaceholderArray   = nil;
 }
 
 @end
-
-//@import "_CPJavaScriptArray.j"