From 150fc635c53ef552024088ac65f82522b3626808 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Tue, 3 Mar 2009 08:39:12 -0800 Subject: Automated g4 rollback of changelist 25024, plus significant hand editing. Back to T{x} for composite literals. R=r OCL=25612 CL=25632 --- src/lib/json/struct.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/json/struct.go') diff --git a/src/lib/json/struct.go b/src/lib/json/struct.go index 7d48dff4b..82e0a80a7 100644 --- a/src/lib/json/struct.go +++ b/src/lib/json/struct.go @@ -163,7 +163,7 @@ func (b *_StructBuilder) Elem(i int) Builder { av.SetLen(i+1); } if i < av.Len() { - return &_StructBuilder( av.Elem(i) ) + return &_StructBuilder{ av.Elem(i) } } } return nobuilder @@ -195,7 +195,7 @@ func (b *_StructBuilder) Key(k string) Builder { for i := 0; i < t.Len(); i++ { name, typ, tag, off := t.Field(i); if k == name { - return &_StructBuilder( sv.Field(i) ) + return &_StructBuilder{ sv.Field(i) } } } } @@ -205,7 +205,7 @@ func (b *_StructBuilder) Key(k string) Builder { func Unmarshal(s string, val interface{}) (ok bool, errtok string) { var errindx int; var val1 interface{}; - b := &_StructBuilder( reflect.NewValue(val) ); + b := &_StructBuilder{ reflect.NewValue(val) }; ok, errindx, errtok = Parse(s, b); if !ok { return false, errtok -- cgit v1.2.3