From eea403d0abea5db849a7e383c76d53d5c181b5e6 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Fri, 27 Dec 2019 10:18:32 +0000 Subject: Fix #514 --- src/check_expr.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/check_expr.cpp') diff --git a/src/check_expr.cpp b/src/check_expr.cpp index 0bbf6031d..bfee3d56a 100644 --- a/src/check_expr.cpp +++ b/src/check_expr.cpp @@ -4295,10 +4295,13 @@ bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32 tuple->Tuple.variables[i] = alloc_entity_array_elem(nullptr, blank_token, type->Array.elem, cast(i32)i); } } - operand->type = tuple; operand->mode = Addressing_Value; + if (tuple->Tuple.variables.count == 1) { + operand->type = tuple->Tuple.variables[0]->type; + } + break; } @@ -8360,10 +8363,10 @@ void check_not_tuple(CheckerContext *c, Operand *o) { // NOTE(bill): Tuples are not first class thus never named if (o->type->kind == Type_Tuple) { isize count = o->type->Tuple.variables.count; - GB_ASSERT(count != 1); error(o->expr, "%td-valued tuple found where single value expected", count); o->mode = Addressing_Invalid; + GB_ASSERT(count != 1); } } } -- cgit v1.2.3