Merge branch 'vlang:master' into encoding.iconv

vlang · Sep 30, 2024 · 462da8e · 462da8e
2 parents 06bd6f6 + aa3ab3f
commit 462da8e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
@@ -5953,9 +5953,10 @@ fn (mut g Gen) const_decl(node ast.ConstDecl) {
 			}
 			ast.StringLiteral {
 				val := g.expr_string(field.expr)
+				typ := if field.expr.language == .c { 'char*' } else { 'string' }
 				g.global_const_defs[util.no_dots(field.name)] = GlobalConstDef{
 					mod:   field.mod
-					def:   'string ${const_name}; // a string literal, inited later'
+					def:   '${typ} ${const_name}; // a string literal, inited later'
 					init:  '\t${const_name} = ${val};'
 					order: -1
 				}

diff --git a/vlib/v/tests/consts/const_c_string_test.v b/vlib/v/tests/consts/const_c_string_test.v
@@ -0,0 +1,7 @@
+const msg = c'test'
+
+fn test_main() {
+	unsafe {
+		assert msg.vstring() == 'test'
+	}
+}