map init

array_map.v

@@ -60,4 +60,10 @@ fn (mut app App) array_init(c CompositeLit) {
 }
 
 fn (mut app App) map_init(node CompositeLit) {
+	app.genln('{')
+	for elt in node.elts {
+		kv := elt as KeyValueExpr
+		app.key_value_expr(kv)
+	}
+	app.genln('}')
 }

ast.v

@@ -204,7 +204,8 @@ struct UnaryExpr {
 }
 
 struct KeyValueExpr {
-	key           Ident  @[json: 'Key']
+	// key           Ident  @[json: 'Key']
+	key           Expr   @[json: 'Key']
 	value         Expr   @[json: 'Value']
 	node_type_str string @[json: '_type']
 }

expr.v

@@ -1,3 +1,5 @@
+module main
+
 // Copyright (c) 2024 Alexander Medvednikov. All rights reserved.
 // Use of this source code is governed by a GPL license that can be found in the LICENSE file.
 
@@ -10,7 +12,7 @@ fn (mut app App) expr(expr Expr) {
 			app.binary_expr(expr)
 		}
 		Ident {
-			app.gen(expr.name.camel_to_snake()) // to_lower()) // TODO ?
+			app.gen(go2v_ident(expr.name))
 		}
 		CallExpr {
 			app.call_expr(expr)
@@ -99,9 +101,14 @@ fn (mut app App) paren_expr(p ParenExpr) {
 	app.gen(')')
 }
 
-fn (mut app App) key_value_expr(k KeyValueExpr) {
-	app.gen('\t${k.key.name}: ')
-	app.expr(k.value)
+fn (mut app App) key_value_expr(expr KeyValueExpr) {
+	if expr.key is Ident {
+		app.gen('\t${expr.key.name}: ')
+	} else {
+		app.expr(expr.key)
+		app.gen(': ')
+	}
+	app.expr(expr.value)
 	app.genln('')
 }
 

stmt.v

@@ -164,10 +164,3 @@ fn (mut app App) return_stmt(node ReturnStmt) {
 		}
 	}
 }
-
-fn go2v_type(typ string) string {
-	if typ == 'byte' {
-		return 'u8'
-	}
-	return typ
-}

struct.v

@@ -23,7 +23,9 @@ fn (mut app App) struct_decl(spec Spec) {
 	}
 	for field in spec.typ.fields.list {
 		type_name := app.type_or_ident(field.typ)
-		app.genln('\t${field.names.map(it.name).join(', ')} ${type_name}')
+		for n in field.names {
+			app.genln('\t${go2v_ident(n.name)} ${go2v_type(type_name)}')
+		}
 	}
 	app.genln('}\n')
 }

tests/map/map.vv

@@ -1,7 +1,7 @@
 module main
 
 struct Vertex {
-mut:
+pub mut:
 	lat  f64
 	long f64
 }

util.v

@@ -0,0 +1,18 @@
+module main
+
+fn go2v_type(typ string) string {
+	match typ {
+		'byte' {
+			return 'u8'
+		}
+		'float64' {
+			return 'f64'
+		}
+		else {}
+	}
+	return typ
+}
+
+fn go2v_ident(ident string) string {
+	return ident.camel_to_snake() // to_lower()) // TODO ?
+}