From 25912673a992870f5d443af25d91258780c77912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20D=C3=A4schle?= Date: Wed, 4 Nov 2020 09:21:30 +0100 Subject: [PATCH] cgen: fix generic json bug (#6731) --- vlib/json/json_test.v | 12 ++++++++++++ vlib/v/gen/json.v | 9 +++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/vlib/json/json_test.v b/vlib/json/json_test.v index 6603b792bd..27caccd17c 100644 --- a/vlib/json/json_test.v +++ b/vlib/json/json_test.v @@ -29,6 +29,18 @@ fn test_simple() { assert y.title == .worker } +fn bar(payload string) ?Bar { // ?T doesn't work currently + result := json.decode(T, payload)? + return result +} +struct Bar { + x string +} +fn test_generic() { + result := bar('{"x":"test"}') or { Bar{} } + assert result.x == 'test' +} + struct User2 { age int nums []int diff --git a/vlib/v/gen/json.v b/vlib/v/gen/json.v index d88c9fe6bd..9161242544 100644 --- a/vlib/v/gen/json.v +++ b/vlib/v/gen/json.v @@ -19,10 +19,11 @@ import strings // } // Codegen json_decode/encode funcs fn (mut g Gen) gen_json_for_type(typ table.Type) { + utyp := g.unwrap_generic(typ) mut dec := strings.new_builder(100) mut enc := strings.new_builder(100) - sym := g.table.get_type_symbol(typ) - styp := g.typ(typ) + sym := g.table.get_type_symbol(utyp) + styp := g.typ(utyp) if is_js_prim(sym.name) || sym.kind == .enum_ { return } @@ -39,7 +40,7 @@ fn (mut g Gen) gen_json_for_type(typ table.Type) { // Code gen decoder dec_fn_name := js_dec_name(styp) // Make sure that this optional type actually exists - g.register_optional(typ) + g.register_optional(utyp) dec_fn_dec := 'Option_$styp ${dec_fn_name}(cJSON* root)' dec.writeln(' //Option_$styp ${dec_fn_name}(cJSON* root, $styp* res) { @@ -66,7 +67,7 @@ $enc_fn_dec { \tcJSON *o;') if sym.kind == .array { // Handle arrays - value_type := g.table.value_type(typ) + value_type := g.table.value_type(utyp) // If we have `[]Profile`, have to register a Profile en(de)coder first g.gen_json_for_type(value_type) dec.writeln(g.decode_array(value_type))