parser: fix enum value parsing inside array initialization (fix #23937) (#23941)

felipensp · web-flow · commit 725e25991d74 · 2025-03-15T17:27:43.000+02:00
diff --git a/vlib/v/parser/containers.v b/vlib/v/parser/containers.v
@@ -56,7 +56,11 @@ fn (mut p Parser) array_init(is_option bool, alias_array_type ast.Type) ast.Arra
 		} else {
 			// [1,2,3] or [const]u8
 			old_inside_array_lit := p.inside_array_lit
+			old_last_enum_name := p.last_enum_name
+			old_last_enum_mod := p.last_enum_mod
 			p.inside_array_lit = true
+			p.last_enum_name = ''
+			p.last_enum_mod = ''
 			pre_cmnts = p.eat_comments()
 			for i := 0; p.tok.kind !in [.rsbr, .eof]; i++ {
 				exprs << p.expr(0)
@@ -67,6 +71,8 @@ fn (mut p Parser) array_init(is_option bool, alias_array_type ast.Type) ast.Arra
 				ecmnts.last() << p.eat_comments()
 			}
 			p.inside_array_lit = old_inside_array_lit
+			p.last_enum_name = old_last_enum_name
+			p.last_enum_mod = old_last_enum_mod
 			line_nr := p.tok.line_nr
 			last_pos = p.tok.pos()
 			p.check(.rsbr)
diff --git a/vlib/v/parser/expr.v b/vlib/v/parser/expr.v
@@ -59,11 +59,6 @@ fn (mut p Parser) check_expr(precedence int) !ast.Expr {
 	if p.inside_if_cond {
 		p.if_cond_comments << p.eat_comments()
 	}
-	inside_array_lit := p.inside_array_lit
-	p.inside_array_lit = false
-	defer {
-		p.inside_array_lit = inside_array_lit
-	}
 	// Prefix
 	match p.tok.kind {
 		.key_mut, .key_shared, .key_atomic, .key_static, .key_volatile {
@@ -539,7 +534,7 @@ fn (mut p Parser) check_expr(precedence int) !ast.Expr {
 		}
 	}
 
-	if inside_array_lit {
+	if p.inside_array_lit {
 		if p.tok.kind in [.minus, .mul, .amp, .arrow] && p.tok.pos + 1 == p.peek_tok.pos
 			&& p.prev_tok.pos + p.prev_tok.len + 1 != p.peek_tok.pos {
 			return node
@@ -568,7 +563,8 @@ fn (mut p Parser) expr_with_left(left ast.Expr, precedence int, is_stmt_ident bo
 	for precedence < p.tok.kind.precedence() {
 		if p.tok.kind == .dot {
 			// no spaces or line break before dot in map_init
-			if p.inside_map_init && p.tok.pos - p.prev_tok.pos > p.prev_tok.len {
+			if (p.inside_map_init || p.inside_array_lit)
+				&& p.tok.pos - p.prev_tok.pos > p.prev_tok.len {
 				return node
 			}
 			node = p.dot_expr(node)
diff --git a/vlib/v/parser/parser.v b/vlib/v/parser/parser.v
@@ -83,6 +83,8 @@ mut:
 	is_translated            bool              // `@[translated] module abc` - mark a file as translated, to relax some compiler checks for translated code.
 	attrs                    []ast.Attr        // attributes before next decl stmt
 	expr_mod                 string            // for constructing full type names in parse_type()
+	last_enum_name           string            // saves the last enum name on an array initialization
+	last_enum_mod            string            // saves the last enum mod name on an array initialization
 	imports                  map[string]string // alias => mod_name
 	ast_imports              []ast.Import      // mod_names
 	used_imports             []string          // alias
@@ -3067,6 +3069,8 @@ fn (mut p Parser) enum_val_expr(mod string) ast.EnumVal {
 	p.check(.dot)
 	val := p.check_name()
 	p.expr_mod = ''
+	p.last_enum_name = enum_name
+	p.last_enum_mod = mod
 	return ast.EnumVal{
 		enum_name: enum_name
 		val:       val
@@ -3293,12 +3297,24 @@ fn (mut p Parser) index_expr(left ast.Expr, is_gated bool) ast.IndexExpr {
 }
 
 fn (mut p Parser) dot_expr(left ast.Expr) ast.Expr {
+	prev_line := p.prev_tok.pos().line_nr
 	p.next()
 	if p.tok.kind == .dollar {
 		return p.comptime_selector(left)
 	}
 	is_generic_call := p.is_generic_call()
 	name_pos := p.tok.pos()
+	// array initialization with enum shortcut [Enum.foo .bar]
+	if !is_generic_call && p.tok.kind == .name && p.inside_array_lit && p.last_enum_name != ''
+		&& prev_line != name_pos.line_nr {
+		p.name_error = true
+		return ast.EnumVal{
+			enum_name: p.last_enum_name
+			val:       p.check_name()
+			pos:       p.tok.pos()
+			mod:       p.last_enum_mod
+		}
+	}
 	mut field_name := ''
 	// check if the name is on the same line as the dot
 	if p.prev_tok.pos().line_nr == name_pos.line_nr || p.tok.kind != .name {
diff --git a/vlib/v/tests/enums/enum_on_array_init_test.v b/vlib/v/tests/enums/enum_on_array_init_test.v
@@ -0,0 +1,26 @@
+enum Animal {
+	cat
+	cow
+	dog
+	eagle
+	horse
+	rabbit
+	snake
+}
+
+fn test_main() {
+	map_1 := {
+		Animal.cat: 'gato'
+		.dog:       'perro'
+		.rabbit:    'conejo'
+	}
+	assert map_1.str() == "{cat: 'gato', dog: 'perro', rabbit: 'conejo'}"
+	map_2 := {
+		'gato':   Animal.cat
+		'perro':  .dog
+		'conejo': .rabbit
+	}
+	assert map_2.str() == "{'gato': cat, 'perro': dog, 'conejo': rabbit}"
+	array := [Animal.cat, .dog, .rabbit]
+	assert array.str() == '[cat, dog, rabbit]'
+}
