From 5af0acc4aff068f2afaa4366518ed6ac8c97e61a Mon Sep 17 00:00:00 2001 From: Ginger Bill Date: Tue, 18 Jul 2017 16:02:01 +0100 Subject: [PATCH] Disallow default struct values for `any`; `new_clone` --- core/_preload.odin | 5 +++++ src/check_expr.cpp | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/core/_preload.odin b/core/_preload.odin index 7de8fae27..753f668a6 100644 --- a/core/_preload.odin +++ b/core/_preload.odin @@ -474,6 +474,11 @@ new :: proc(T: type) -> ^T #inline { ptr^ = T{}; return ptr; } +new_clone :: proc(data: $T) -> ^T #inline { + ptr := cast(^T)alloc(size_of(T), align_of(T)); + ptr^ = data; + return ptr; +} free :: proc(ptr: rawptr) do free_ptr(ptr); free :: proc(str: string) do free_ptr((cast(^raw.String)&str).data); diff --git a/src/check_expr.cpp b/src/check_expr.cpp index e4f21704f..580ccecaa 100644 --- a/src/check_expr.cpp +++ b/src/check_expr.cpp @@ -887,7 +887,11 @@ void check_record_field_decl(Checker *c, AstNode *decl, Array *fields, } else if (is_operand_undef(a)) { e->Variable.default_is_undef = true; } else if (b.mode != Addressing_Constant) { - error(b.expr, "Default field parameter must be a constant"); + error(b.expr, "Default field value must be a constant"); + } else if (is_type_any(e->type)) { + gbString str = type_to_string(e->type); + error(b.expr, "A struct field of type `%s` cannot have a default value", str); + gb_string_free(str); } else { e->Variable.default_value = b.value; } @@ -900,8 +904,6 @@ void check_record_field_decl(Checker *c, AstNode *decl, Array *fields, if (is_blank_ident(name_token)) { array_add(fields, e); - } else if (name_token.string == "__tag") { - error(name, "`__tag` is a reserved identifier for fields"); } else { HashKey key = hash_string(name_token.string); Entity **found = map_get(entity_map, key);