.

7d9d91d5 · Kirill Smelkov · 91c8c66b · 7d9d91d5 · 7d9d91d5
Commit 7d9d91d5 authored Dec 28, 2016 by Kirill Smelkov
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 137 additions and 130 deletions

t/neo/marshal.go t/neo/marshal.go +129 -129

t/neo/protogen.go t/neo/protogen.go +8 -1

No files found.
--- a/t/neo/marshal.go
+++ b/t/neo/marshal.go
--- a/t/neo/protogen.go
+++ b/t/neo/protogen.go
@@ -261,7 +261,14 @@ func (d *decoder) emitobjtype(assignto string, obj types.Object, typ types.Type)
 			break
 		}
-		d.emit("%s = %s", assignto, d.decodedBasic(obj, u))
+		decoded := d.decodedBasic(obj, u)
+		if typ != u {
+			// typ is a named type over some basic, like
+			// type ClusterState int32
+			// -> need to cast
+			decoded = fmt.Sprintf("%v(%v)", typ, decoded)
+		}
+		d.emit("%s = %s", assignto, decoded)
 	case *types.Array:
 		// TODO optimize for [...]byte