From 0fa9a52090eb5d9ce88220c0134a8d2af6eb8d94 Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Sun, 23 Nov 2025 13:28:48 -0500
Subject: Accessing enum fields now gives an optional value instead of a
 boolean

---
 src/compile/enums.c    | 13 +++++++++----
 src/stdlib/datatypes.h |  5 +++++
 src/types.c            |  4 +++-
 3 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/compile/enums.c b/src/compile/enums.c
index ec7a1755..31af96ad 100644
--- a/src/compile/enums.c
+++ b/src/compile/enums.c
@@ -156,15 +156,20 @@ Text_t compile_enum_field_access(env_t *env, ast_t *ast) {
     for (tag_t *tag = e->tags; tag; tag = tag->next) {
         if (streq(f->field, tag->name)) {
             Text_t tag_name = namespace_name(e->env, e->env->namespace, Texts("tag$", tag->name));
-            if (fielded_t->tag == PointerType) {
+            if (tag->type != NULL && Match(tag->type, StructType)->fields) {
+                return Texts("({ ", compile_declaration(value_t, Text("_e")), " = ",
+                             compile_to_pointer_depth(env, f->fielded, 0, false), "; ", "_e.$tag == ", tag_name, " ? ",
+                             promote_to_optional(tag->type, Texts("_e.", tag->name)), " : ", compile_none(tag->type),
+                             "; })");
+            } else if (fielded_t->tag == PointerType) {
                 Text_t fielded = compile_to_pointer_depth(env, f->fielded, 1, false);
-                return Texts("((", fielded, ")->$tag == ", tag_name, ")");
+                return Texts("((", fielded, ")->$tag == ", tag_name, " ? OPTIONAL_EMPTY_STRUCT : NONE_EMPTY_STRUCT)");
             } else if (enum_has_fields(value_t)) {
                 Text_t fielded = compile(env, f->fielded);
-                return Texts("((", fielded, ").$tag == ", tag_name, ")");
+                return Texts("((", fielded, ").$tag == ", tag_name, " ? OPTIONAL_EMPTY_STRUCT : NONE_EMPTY_STRUCT)");
             } else {
                 Text_t fielded = compile(env, f->fielded);
-                return Texts("((", fielded, ") == ", tag_name, ")");
+                return Texts("((", fielded, ") == ", tag_name, " ? OPTIONAL_EMPTY_STRUCT : NONE_EMPTY_STRUCT)");
             }
         }
     }
diff --git a/src/stdlib/datatypes.h b/src/stdlib/datatypes.h
index caabdacd..d51db8ab 100644
--- a/src/stdlib/datatypes.h
+++ b/src/stdlib/datatypes.h
@@ -72,11 +72,16 @@ typedef struct table_s {
 typedef struct Empty$$struct {
 } Empty$$type;
 
+#define EMPTY_STRUCT ((Empty$$type){})
+
 typedef struct {
     bool has_value;
     Empty$$type value;
 } $OptionalEmpty$$type;
 
+#define NONE_EMPTY_STRUCT (($OptionalEmpty$$type){.has_value = false})
+#define OPTIONAL_EMPTY_STRUCT (($OptionalEmpty$$type){.has_value = true})
+
 typedef struct {
     void *fn, *userdata;
 } Closure_t;
diff --git a/src/types.c b/src/types.c
index 73c02807..51555560 100644
--- a/src/types.c
+++ b/src/types.c
@@ -633,7 +633,9 @@ type_t *get_field_type(type_t *t, const char *field_name) {
     case EnumType: {
         DeclareMatch(e, t, EnumType);
         for (tag_t *tag = e->tags; tag; tag = tag->next) {
-            if (streq(field_name, tag->name)) return Type(BoolType);
+            if (!streq(field_name, tag->name)) continue;
+            if (tag->type != NULL && Match(tag->type, StructType)->fields) return Type(OptionalType, tag->type);
+            else return Type(OptionalType, EMPTY_TYPE);
         }
         return NULL;
     }
-- 
cgit v1.2.3