From c01186c7299928ce0ccd1355f085d5ddbca93c56 Mon Sep 17 00:00:00 2001 From: yuyi Date: Thu, 3 Oct 2024 00:49:25 +0800 Subject: [PATCH] cgen: fix enum with comptime const value (fix #22386) (#22388) --- vlib/v/gen/c/cgen.v | 2 ++ vlib/v/tests/enums/enum_with_comptime_const_test.v | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 vlib/v/tests/enums/enum_with_comptime_const_test.v diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v index 38bd0e007..f4126c95b 100644 --- a/vlib/v/gen/c/cgen.v +++ b/vlib/v/gen/c/cgen.v @@ -4406,6 +4406,8 @@ fn (mut g Gen) enum_decl(node ast.EnumDecl) { const_def := g.global_const_defs[util.no_dots(field.expr.name)] if const_def.def.starts_with('#define') { g.enum_typedefs.write_string(const_def.def.all_after_last(' ')) + } else if const_def.def.contains('const') { + g.enum_typedefs.write_string(const_def.def.all_after_last('=').all_before_last(';')) } else { g.enum_typedefs.write_string(expr_str) } diff --git a/vlib/v/tests/enums/enum_with_comptime_const_test.v b/vlib/v/tests/enums/enum_with_comptime_const_test.v new file mode 100644 index 000000000..1f76e4d19 --- /dev/null +++ b/vlib/v/tests/enums/enum_with_comptime_const_test.v @@ -0,0 +1,10 @@ +const enum_value = $if linux { 1 } $else { 2 } + +pub enum Test { + a = enum_value +} + +fn test_enum_with_comptime_const() { + println(Test.a) + assert true +} -- 2.39.5