diff options
author | Russ Cox <rsc@golang.org> | 2009-01-06 15:19:02 -0800 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2009-01-06 15:19:02 -0800 |
commit | e684aa575c07e0c3b15d959ff4b06d9d8787597a (patch) | |
tree | f3f98baba1fdd5e0138a4875884aa85111308b3f /src/lib/json/generic.go | |
parent | 2e8a2665111620da74f35212abc1414c1bab4bad (diff) | |
download | golang-e684aa575c07e0c3b15d959ff4b06d9d8787597a.tar.gz |
new new & make
R=r
OCL=22166
CL=22166
Diffstat (limited to 'src/lib/json/generic.go')
-rw-r--r-- | src/lib/json/generic.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/json/generic.go b/src/lib/json/generic.go index 4f4268459..b62f8d96d 100644 --- a/src/lib/json/generic.go +++ b/src/lib/json/generic.go @@ -269,11 +269,11 @@ func (b *JsonBuilder) Array() { } func (b *JsonBuilder) Map() { - b.Put(&Map{new(map[string]Json), Null{}}) + b.Put(&Map{make(map[string]Json), Null{}}) } func (b *JsonBuilder) Elem(i int) Builder { - bb := new(*JsonBuilder); + bb := new(JsonBuilder); bb.a = b.Get().(*Array).a; bb.i = i; for i >= bb.a.Len() { @@ -283,7 +283,7 @@ func (b *JsonBuilder) Elem(i int) Builder { } func (b *JsonBuilder) Key(k string) Builder { - bb := new(*JsonBuilder); + bb := new(JsonBuilder); bb.m = b.Get().(*Map).m; bb.k = k; bb.m[k] = null; @@ -293,7 +293,7 @@ func (b *JsonBuilder) Key(k string) Builder { export func StringToJson(s string) (json Json, ok bool, errtok string) { var errindx int; var j Json; - b := new(*JsonBuilder); + b := new(JsonBuilder); b.ptr = &j; ok, errindx, errtok = Parse(s, b); if !ok { |