diff options
| author | Russ Cox <rsc@golang.org> | 2008-12-19 03:05:37 -0800 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2008-12-19 03:05:37 -0800 |
| commit | 08ca30bbfad04d3ca1bf7ae75c291b91ecb00aef (patch) | |
| tree | 183e8cd345f5f895d2cbc36dd8f8be93640303c3 /test/ken | |
| parent | d47d888ba663014e6aa8ca043e694f4b2a5898b8 (diff) | |
| download | go-08ca30bbfad04d3ca1bf7ae75c291b91ecb00aef.tar.xz | |
change *map to map; *chan to chan; new(T) to new(*T)
fix bugs left over from *[] to [] conversion.
TBR=r
OCL=21576
CL=21581
Diffstat (limited to 'test/ken')
| -rw-r--r-- | test/ken/array.go | 2 | ||||
| -rw-r--r-- | test/ken/chan.go | 6 | ||||
| -rw-r--r-- | test/ken/embed.go | 8 | ||||
| -rw-r--r-- | test/ken/interfun.go | 2 | ||||
| -rw-r--r-- | test/ken/intervar.go | 6 | ||||
| -rw-r--r-- | test/ken/ptrfun.go | 2 | ||||
| -rw-r--r-- | test/ken/range.go | 2 | ||||
| -rw-r--r-- | test/ken/rob1.go | 6 | ||||
| -rw-r--r-- | test/ken/rob2.go | 6 | ||||
| -rw-r--r-- | test/ken/robfunc.go | 2 | ||||
| -rw-r--r-- | test/ken/simparray.go | 2 | ||||
| -rw-r--r-- | test/ken/simpbool.go | 2 | ||||
| -rw-r--r-- | test/ken/string.go | 2 |
13 files changed, 24 insertions, 24 deletions
diff --git a/test/ken/array.go b/test/ken/array.go index 167830e575..2027a31fff 100644 --- a/test/ken/array.go +++ b/test/ken/array.go @@ -95,7 +95,7 @@ testpfpf() func testpdpf1() { - a := new([40]int); + a := new(*[40]int); setpd(a); res(sumpd(a), 0, 40); diff --git a/test/ken/chan.go b/test/ken/chan.go index 64758537eb..da08477e65 100644 --- a/test/ken/chan.go +++ b/test/ken/chan.go @@ -22,7 +22,7 @@ nrand(n int) int type Chan struct { - sc,rc *chan int; // send and recv chan + sc,rc chan int; // send and recv chan sv,rv int; // send and recv seq } @@ -38,7 +38,7 @@ var func init() { - nc = new(Chan); + nc = new(*Chan); } func @@ -47,7 +47,7 @@ mkchan(c,n int) []*Chan ca := new([]*Chan, n); for i:=0; i<n; i++ { cval = cval+100; - ch := new(Chan); + ch := new(*Chan); ch.sc = new(chan int, c); ch.rc = ch.sc; ch.sv = cval; diff --git a/test/ken/embed.go b/test/ken/embed.go index f0c9f4ec2b..42e83e44fd 100644 --- a/test/ken/embed.go +++ b/test/ken/embed.go @@ -166,10 +166,10 @@ main() var s *S; // allocate - s = new(S); - s.Subp = new(Subp); - s.Sub.SubSubp = new(SubSubp); - s.Subp.SubpSubp = new(SubpSubp); + s = new(*S); + s.Subp = new(*Subp); + s.Sub.SubSubp = new(*SubSubp); + s.Subp.SubpSubp = new(*SubpSubp); // explicit assignment s.a = 1; diff --git a/test/ken/interfun.go b/test/ken/interfun.go index 97db893168..4ab2b8b9fe 100644 --- a/test/ken/interfun.go +++ b/test/ken/interfun.go @@ -40,7 +40,7 @@ main() var i2 I2; var g *S; - s := new(S); + s := new(*S); s.a = 5; s.b = 6; diff --git a/test/ken/intervar.go b/test/ken/intervar.go index 1c3d650006..711568b4cb 100644 --- a/test/ken/intervar.go +++ b/test/ken/intervar.go @@ -58,9 +58,9 @@ puts(s string) func main() { - p := new(Print); - b := new(Bio); - f := new(File); + p := new(*Print); + b := new(*Bio); + f := new(*File); p.whoami = 1; p.put = b; diff --git a/test/ken/ptrfun.go b/test/ken/ptrfun.go index e7db3a94d3..949cb823e5 100644 --- a/test/ken/ptrfun.go +++ b/test/ken/ptrfun.go @@ -27,7 +27,7 @@ main() var v int; var c *C; - c = new(C); + c = new(*C); c.a = 6; c.x = &g; diff --git a/test/ken/range.go b/test/ken/range.go index 2831806bf2..5bb6d55dc2 100644 --- a/test/ken/range.go +++ b/test/ken/range.go @@ -10,7 +10,7 @@ const size = 16; var a [size]byte; var p []byte; -var m *map[int]byte; +var m map[int]byte; func f(k int) byte diff --git a/test/ken/rob1.go b/test/ken/rob1.go index a75878b1f5..35397b36ff 100644 --- a/test/ken/rob1.go +++ b/test/ken/rob1.go @@ -31,7 +31,7 @@ Init() func (list *List) Insert(i Item) { - item := new(ListItem); + item := new(*ListItem); item.item = i; item.next = list.head; list.head = item; @@ -69,10 +69,10 @@ Print() func main() { - list := new(List); + list := new(*List); list.Init(); for i := 0; i < 10; i = i + 1 { - integer := new(Integer); + integer := new(*Integer); integer.Init(i); list.Insert(integer); } diff --git a/test/ken/rob2.go b/test/ken/rob2.go index 7d2eecbf7d..9cb2ff3dda 100644 --- a/test/ken/rob2.go +++ b/test/ken/rob2.go @@ -213,7 +213,7 @@ func ParseList() *Slist { var slist, retval *Slist; - slist = new(Slist); + slist = new(*Slist); slist.list.car = nil; slist.list.cdr = nil; slist.isatom = false; @@ -225,7 +225,7 @@ func ParseList() *Slist if token == ')' || token == EOF { // empty cdr break; } - slist.list.cdr = new(Slist); + slist.list.cdr = new(*Slist); slist = slist.list.cdr; } return retval; @@ -236,7 +236,7 @@ func atom(i int) *Slist // BUG: uses tokenbuf; should take argument var h, length int; var slist, tail *Slist; - slist = new(Slist); + slist = new(*Slist); if token == '0' { slist.atom.integer = i; slist.isstring = false; diff --git a/test/ken/robfunc.go b/test/ken/robfunc.go index 12b4b6d7b6..947016fac1 100644 --- a/test/ken/robfunc.go +++ b/test/ken/robfunc.go @@ -86,7 +86,7 @@ func main() { r9, s9 = f9(1); assertequal(r9, 9, "r9"); assertequal(int(s9), 9, "s9"); - var t *T = new(T); + var t *T = new(*T); t.x = 1; t.y = 2; r10 := t.m10(1, 3.0); diff --git a/test/ken/simparray.go b/test/ken/simparray.go index 90331e5e3d..f68ff145bb 100644 --- a/test/ken/simparray.go +++ b/test/ken/simparray.go @@ -35,7 +35,7 @@ main() if s2 != 35 { panic(s2); } - b := new([100]int); + b := new(*[100]int); for i:=0; i<100; i=i+1 { b[i] = i; } diff --git a/test/ken/simpbool.go b/test/ken/simpbool.go index aad111dd55..28ddafe158 100644 --- a/test/ken/simpbool.go +++ b/test/ken/simpbool.go @@ -30,7 +30,7 @@ main() if !!!a { panic(6); } var x *s; - x = new(s); + x = new(*s); x.a = true; x.b = false; diff --git a/test/ken/string.go b/test/ken/string.go index 3a15beeffa..7e3aa902b0 100644 --- a/test/ken/string.go +++ b/test/ken/string.go @@ -92,7 +92,7 @@ main() } /* create string with byte array pointer */ - z2 := new([3]byte); + z2 := new(*[3]byte); z2[0] = 'a'; z2[1] = 'b'; z2[2] = 'c'; |
