Implement ∘ and fix a bug in simplifyarray

1 files changed, 9 insertions, 1 deletions

diff --git a/array.c b/array.c
index 37cd159..2e0e71e 100644
--- a/array.c
+++ b/array.c
@@ -192,8 +192,16 @@ simplifyarray(Array *a)
 		b->stranded = a->stranded;
 		for(i = 0; i < a->rank; i++)
 			b->shape[i] = a->shape[i];
-		for(i = 0; i < a->size; i++)
+		for(i = 0; i < a->size; i++){
 			memcpy(b->rawdata + i * datasizes[type], a->arraydata[i]->rawdata, datasizes[type]);
+			if(b->type == AtypeArray)
+				incref(b->arraydata[i]);
+		}
+		if(b->type == AtypeArray){
+			Array *tmp = b;
+			b = simplifyarray(b);
+			freearray(tmp);
+		}
 		return b;
 	}else if(canfloat){
 		Array *b = allocarray(AtypeFloat, a->rank, a->size);