From dee2f7e0de8f3521ec77bd60fd48094f7ed3c729 Mon Sep 17 00:00:00 2001
From: Leo Tenenbaum <pommicket@gmail.com>
Date: Sun, 20 Oct 2019 18:11:38 -0400
Subject: started fixing compile time new

---
 eval.c   | 14 ++++++++++----
 test.toc | 19 +++++++++++++++++--
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/eval.c b/eval.c
index 9f8209c..1a473ec 100644
--- a/eval.c
+++ b/eval.c
@@ -44,7 +44,7 @@ static size_t compiler_sizeof(Type *t) {
 	case TYPE_PTR:
 		return sizeof t->ptr;
 	case TYPE_ARR:
-		return sizeof t->arr;
+		return compiler_sizeof(t->arr.of) * t->arr.n;
 	case TYPE_TUPLE:
 		return sizeof t->tuple;
 	case TYPE_SLICE:
@@ -787,10 +787,16 @@ static bool eval_expr(Evaluator *ev, Expression *e, Value *v) {
 	} break;
 	case EXPR_NEW:
 		/* it's not strictly necessary to do the if here */
-		if (e->new.type.kind == TYPE_ARR)
-			v->arr = err_calloc(1, compiler_sizeof(&e->new.type));
-		else
+		if (e->new.n) {
+			Value n;
+			if (!eval_expr(ev, e->new.n, &n))
+				return false;
+			U64 n64 = val_to_u64(&n, e->new.n->type.builtin);
+			v->slice.data = err_calloc(n64, compiler_sizeof(&e->new.type));
+			v->slice.n = n64;
+		} else {
 			v->ptr = err_calloc(1, compiler_sizeof(&e->new.type));
+		}
 		break;
 	case EXPR_CALL: {
 		Value fnv;
diff --git a/test.toc b/test.toc
index 3346b9e..d182a0f 100644
--- a/test.toc
+++ b/test.toc
@@ -5,7 +5,22 @@ puti @= fn(x: int) {
 	 // #C("printf(\"%ld\\n\", (long)x)");
 };
 
+foo @= fn() int {
+	X := new([100]int);
+	i := 0;
+	while i < 100 {
+		  (*X)[i] = i;
+		  i = i + 1;
+	}
+	total := 0;
+	i = 0;
+	while i < 100 {
+		  total = total + (*X)[i];
+		  i = i + 1;
+	}
+	total
+};
+
 main @= fn() {
-	 Ar := new([5]int);
-	 A:=new(int, 100);
+	 Ar : [foo()]int;
 };
-- 
cgit v1.2.3