convert composite literals from { } to ( ).

only non-trivial changes are in
	convlit1.go
	golden.out

R=gri
OCL=25019
CL=25024

3 files changed, 11 insertions, 11 deletions

diff --git a/src/lib/json/generic.go b/src/lib/json/generic.go
index 08ae8dc29..89c692134 100644
--- a/src/lib/json/generic.go
+++ b/src/lib/json/generic.go
@@ -45,7 +45,7 @@ func JsonToString(j Json) string {
 }
 
 type _Null struct { }
-var Null Json = &_Null{}
+var Null Json = &_Null()
 func (*_Null) Kind() int { return NullKind }
 func (*_Null) String() string { return "null" }
 func (*_Null) Number() float64 { return 0 }
@@ -240,7 +240,7 @@ func (b *_JsonBuilder) Get() Json {
 }
 
 func (b *_JsonBuilder) Float64(f float64) {
-	b.Put(&_Number{f, _Null{}})
+	b.Put(&_Number(f, _Null()))
 }
 
 func (b *_JsonBuilder) Int64(i int64) {
@@ -252,7 +252,7 @@ func (b *_JsonBuilder) Uint64(i uint64) {
 }
 
 func (b *_JsonBuilder) Bool(tf bool) {
-	b.Put(&_Bool{tf, _Null{}})
+	b.Put(&_Bool(tf, _Null()))
 }
 
 func (b *_JsonBuilder) Null() {
@@ -260,16 +260,16 @@ func (b *_JsonBuilder) Null() {
 }
 
 func (b *_JsonBuilder) String(s string) {
-	b.Put(&_String{s, _Null{}})
+	b.Put(&_String(s, _Null()))
 }
 
 
 func (b *_JsonBuilder) Array() {
-	b.Put(&_Array{array.New(0), _Null{}})
+	b.Put(&_Array(array.New(0), _Null()))
 }
 
 func (b *_JsonBuilder) Map() {
-	b.Put(&_Map{make(map[string]Json), _Null{}})
+	b.Put(&_Map(make(map[string]Json), _Null()))
 }
 
 func (b *_JsonBuilder) Elem(i int) Builder {
diff --git a/src/lib/json/generic_test.go b/src/lib/json/generic_test.go
index ab3e24fb8..6e409b3e4 100644
--- a/src/lib/json/generic_test.go
+++ b/src/lib/json/generic_test.go
@@ -9,7 +9,7 @@ import (
 	"testing";
 )
 
-var jsontests = []string {
+var jsontests = []string (
 	`null`,
 	`true`,
 	`false`,
@@ -22,7 +22,7 @@ var jsontests = []string {
 	`[1,2,"abc",null,true,false]`,
 	`{}`,
 	`{"a":1}`,
-}
+)
 
 func TestJson(t *testing.T) {
 	for i := 0; i < len(jsontests); i++ {
diff --git a/src/lib/json/struct.go b/src/lib/json/struct.go
index 82e0a80a7..7d48dff4b 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