checker: refactor string to enum error check, handle `EnumName(s…

…tring_variable)` too (#20210)
vlang · Dec 18, 2023 · 97d01a9 · 97d01a9
1 parent a8e0ced
commit 97d01a9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v
@@ -3318,8 +3318,8 @@ fn (mut c Checker) cast_expr(mut node ast.CastExpr) ast.Type {
 				}
 			}
 		}
-		if mut node.expr is ast.StringLiteral {
-			c.add_error_detail('use ${c.table.type_to_str(node.typ)}.from_string(\'${node.expr.val}\') instead')
+		if node.expr_type == ast.string_type_idx {
+			c.add_error_detail('use ${c.table.type_to_str(node.typ)}.from_string(${node.expr}) instead')
 			c.error('cannot cast `string` to `enum`', node.pos)
 		}
 	}

diff --git a/vlib/v/checker/tests/string_to_enum_cast_err.out b/vlib/v/checker/tests/string_to_enum_cast_err.out
@@ -3,5 +3,13 @@ vlib/v/checker/tests/string_to_enum_cast_err.vv:8:7: error: cannot cast `string`
     7 | fn main() {
     8 |     _ := Test('one')
       |          ~~~~~~~~~~~
-    9 | }
+    9 |     
+   10 |     my_str := 'one'
 Details: use main.Test.from_string('one') instead
+vlib/v/checker/tests/string_to_enum_cast_err.vv:11:7: error: cannot cast `string` to `enum`
+    9 |     
+   10 |     my_str := 'one'
+   11 |     _ := Test(my_str)
+      |          ~~~~~~~~~~~~
+   12 | }
+Details: use main.Test.from_string(my_str) instead
diff --git a/vlib/v/checker/tests/string_to_enum_cast_err.vv b/vlib/v/checker/tests/string_to_enum_cast_err.vv
@@ -6,4 +6,7 @@ enum Test {
 
 fn main() {
 	_ := Test('one')
+
+	my_str := 'one'
+	_ := Test(my_str)
 }