From 7494c89a4e1baa08a2720817b06676b34eebb284 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Wed, 1 Oct 2025 14:01:51 -0400 Subject: Fixes for indexing into lists with optional item types --- src/typecheck.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/typecheck.c') diff --git a/src/typecheck.c b/src/typecheck.c index 3c820fa9..eff894be 100644 --- a/src/typecheck.c +++ b/src/typecheck.c @@ -934,8 +934,10 @@ type_t *get_type(env_t *env, ast_t *ast) { if (value_t->tag == ListType) { if (!indexing->index) return indexed_t; type_t *index_t = get_type(env, indexing->index); - if (index_t->tag == IntType || index_t->tag == BigIntType || index_t->tag == ByteType) - return Type(OptionalType, Match(value_t, ListType)->item_type); + if (index_t->tag == IntType || index_t->tag == BigIntType || index_t->tag == ByteType) { + type_t *item_type = Match(value_t, ListType)->item_type; + return item_type->tag == OptionalType ? item_type : Type(OptionalType, item_type); + } code_err(indexing->index, "I only know how to index lists using integers, not ", type_to_text(index_t)); } else if (value_t->tag == TableType) { DeclareMatch(table_type, value_t, TableType); -- cgit v1.2.3