From 2115e962feced8134f9fb1111fffe11c89c4d0c4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 17 Nov 2024 13:17:36 +0900
Subject: [PATCH] [qfcc] Support typed compound initializers

Explicitly typed compound initializers are what C uses and allows them
to initialized `auto` vars and even pass through `...`. Not tested yet
other than ensuring existing tests didn't break.
---
 tools/qfcc/include/expr.h         |  1 +
 tools/qfcc/source/expr.c          |  3 ++-
 tools/qfcc/source/expr_compound.c |  3 +++
 tools/qfcc/source/qc-parse.y      | 25 +++++++++++++++++++++++--
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 3ebad0627..e0ff2be38 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -100,6 +100,7 @@ typedef struct element_s {
 typedef struct element_chain_s {
 	element_t  *head;
 	element_t **tail;
+	const type_t *type;			///< inferred if null
 } element_chain_t;
 
 typedef struct ex_listitem_s {
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 79678d17c..0662ea312 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -150,8 +150,9 @@ get_type (const expr_t *e)
 		case ex_select:
 			internal_error (e, "unexpected expression type");
 		case ex_label:
-		case ex_compound:
 			return nullptr;
+		case ex_compound:
+			return e->compound.type;
 		case ex_bool:
 			if (options.code.progsversion == PROG_ID_VERSION)
 				return &type_float;
diff --git a/tools/qfcc/source/expr_compound.c b/tools/qfcc/source/expr_compound.c
index a53afe0da..513b16240 100644
--- a/tools/qfcc/source/expr_compound.c
+++ b/tools/qfcc/source/expr_compound.c
@@ -365,6 +365,9 @@ assign_elements (expr_t *local_expr, const expr_t *init,
 expr_t *
 initialized_temp_expr (const type_t *type, const expr_t *expr)
 {
+	if (expr->type == ex_compound && expr->compound.type) {
+		type = expr->compound.type;
+	}
 	expr_t     *block = new_block_expr (0);
 
 	//type = unalias_type (type);
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 596f24857..ab9649064 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -211,6 +211,7 @@ int yylex (YYSTYPE *yylval, YYLTYPE *yylloc);
 %type	<mut_expr>	opt_init_semi opt_expr comma_expr
 %type   <expr>		expr
 %type	<expr>		compound_init
+%type	<spec>		opt_cast
 %type   <mut_expr>	element_list expr_list
 %type	<designator> designator designator_spec
 %type	<element>	element
@@ -1698,8 +1699,28 @@ var_initializer
 	;
 
 compound_init
-	: '{' element_list optional_comma '}'		{ $$ = $2; }
-	| '{' '}'									{ $$ = 0; }
+	: opt_cast '{' element_list optional_comma '}'
+		{
+			auto type = resolve_type_spec ($1);
+			$3->compound.type = type;
+			$$ = $3;
+		}
+	| opt_cast '{' '}'
+		{
+			auto type = resolve_type_spec ($1);
+			if (type) {
+				auto elements = new_compound_init ();
+				elements->compound.type = type;
+				$$ = elements;
+			} else {
+				$$ = nullptr;
+			}
+		}
+	;
+
+opt_cast
+	: '(' typename ')'					{ $$ = $2; }
+	| /*empty*/							{ $$ = (specifier_t) {}; }
 	;
 
 method_optional_state_expr