From 4160cca33fd5ca122ec005357665a179b9c4a3c4 Mon Sep 17 00:00:00 2001
From: Damilare Darmie Akinlaja <darmie@akinlaja.com>
Date: Sat, 18 Jun 2022 19:36:12 +0100
Subject: [PATCH 1/2] Update ArrayList.hx

This update makes `ArrayList.toArray()` work in a macro heavy project.
---
 src/ds/ArrayList.hx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ds/ArrayList.hx b/src/ds/ArrayList.hx
index 32e3d42..e54371d 100644
--- a/src/ds/ArrayList.hx
+++ b/src/ds/ArrayList.hx
@@ -1233,7 +1233,7 @@ class ArrayList<T> implements List<T>
 	**/
 	public function toArray():Array<T>
 	{
-		return mData.toArray(0, size, []);
+		return ds.tools.NativeArrayTools.toArray(mData, 0, size, []);
 	}
 	
 	/**
@@ -1320,4 +1320,4 @@ class ArrayListIterator<T> implements ds.Itr<T>
 		mObject.removeAt(--mI);
 		mS--;
 	}
-}
\ No newline at end of file
+}

From 35dbf098e6c86996058388ba4d565c36365f6463 Mon Sep 17 00:00:00 2001
From: darmie <dreakinlaja@gmail.com>
Date: Sat, 18 Jun 2022 21:21:31 +0100
Subject: [PATCH 2/2] fix cpp bug

---
 src/ds/tools/NativeArrayTools.hx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/ds/tools/NativeArrayTools.hx b/src/ds/tools/NativeArrayTools.hx
index 9fca90c..66dff74 100644
--- a/src/ds/tools/NativeArrayTools.hx
+++ b/src/ds/tools/NativeArrayTools.hx
@@ -52,8 +52,7 @@ class NativeArrayTools
 		#elseif java
 		return untyped Array.alloc(len);
 		#elseif cpp
-		cpp.NativeArray.create(len);
-		return a;
+		return cpp.NativeArray.create(len);
 		#elseif python
 		return python.Syntax.code("[{0}]*{1}", null, len);
 		#elseif eval