implement Enum::Variant match patterns in parser and both codegens

Parser now handles `SomeEnum::Variant` in match arm patterns, emitting
a Variant pattern node with enum_name and variant fields. Previously
these fell through to Binding, producing broken codegen.

JS codegen: emit str_eq check against the variant name string (El enums
are plain strings at runtime). C codegen: same, via EL_STR + str_eq.

Rebuild elc to pick up the parser change.
This commit is contained in:
Will Anderson
2026-05-04 10:35:35 -05:00
parent a54b2bebf9
commit 0f1da43a97
4 changed files with 26 additions and 4 deletions
BIN
View File
Binary file not shown.
+10 -2
View File
@@ -566,8 +566,16 @@ fn js_cg_match(expr: Map<String, Any>) -> String {
if str_eq(v, "true") { let bv = "true" }
let parts = native_list_append(parts, "if (" + subj_var + " === " + bv + ") return (" + body_c + "); ")
} else {
// unknown pattern wildcard
let parts = native_list_append(parts, "return (" + body_c + "); ")
if str_eq(pkind, "Variant") {
// Enum::Variant patterns El enums compile to plain
// strings (the variant name) or ints. Match the subject
// against the variant name string.
let variant: String = pat["variant"]
let parts = native_list_append(parts, "if (str_eq(" + subj_var + ", " + js_str_lit(variant) + ")) return (" + body_c + "); ")
} else {
// unknown pattern wildcard
let parts = native_list_append(parts, "return (" + body_c + "); ")
}
}
}
}
+9 -2
View File
@@ -848,8 +848,15 @@ fn cg_match(expr: Map<String, Any>) -> String {
}
let parts = native_list_append(parts, "if (" + subj_var + " == " + bv + ") { " + result_var + " = (" + body_c + "); goto " + done_label + "; } ")
} else {
// unknown pattern -> wildcard
let parts = native_list_append(parts, "{ " + result_var + " = (" + body_c + "); goto " + done_label + "; } ")
if str_eq(pkind, "Variant") {
// Enum::Variant pattern match against the variant name
// string (El enums compile to plain strings).
let variant: String = pat["variant"]
let parts = native_list_append(parts, "if (str_eq(" + subj_var + ", EL_STR(" + c_str_lit(variant) + "))) { " + result_var + " = (" + body_c + "); goto " + done_label + "; } ")
} else {
// unknown pattern -> wildcard
let parts = native_list_append(parts, "{ " + result_var + " = (" + body_c + "); goto " + done_label + "; } ")
}
}
}
}
+7
View File
@@ -408,6 +408,13 @@ fn parse_pattern(tokens: [Map<String, Any>], pos: Int) -> Map<String, Any> {
if v == "_" {
return make_result({ "pattern": "Wildcard" }, pos + 1)
}
// Check for Enum::Variant pattern (Color::Red, Status::Ok, etc.)
// Lexed as: Ident ColonColon Ident
let next_k = tok_kind(tokens, pos + 1)
if next_k == "ColonColon" {
let variant_name = tok_value(tokens, pos + 2)
return make_result({ "pattern": "Variant", "enum_name": v, "variant": variant_name }, pos + 3)
}
return make_result({ "pattern": "Binding", "name": v }, pos + 1)
}
if k == "Int" {