summaryrefslogtreecommitdiff
path: root/eval.c
diff options
context:
space:
mode:
authorLeo Tenenbaum <pommicket@gmail.com>2019-10-20 18:11:38 -0400
committerLeo Tenenbaum <pommicket@gmail.com>2019-10-20 18:11:38 -0400
commitdee2f7e0de8f3521ec77bd60fd48094f7ed3c729 (patch)
treecc3de57105b3472968084ffec12701499a4c8d84 /eval.c
parent89f00af3cf25d594f10aebaa7048a17bdd520c4b (diff)
started fixing compile time new
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c14
1 files changed, 10 insertions, 4 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;