Skip to content

Commit d65a5cc

Browse files
griesemergriesemer
committed
1) Change default gofmt default settings for
 parsing and printing to new syntax. Use -oldparser to parse the old syntax, use -oldprinter to print the old syntax. 2) Change default gofmt formatting settings to use tabs for indentation only and to use spaces for alignment. This will make the code alignment insensitive to an editor's tabwidth. Use -spaces=false to use tabs for alignment. 3) Manually changed src/exp/parser/parser_test.go so that it doesn't try to parse the parser's source files using the old syntax (they have new syntax now). 4) gofmt -w src misc test/bench 4th set of files. R=rsc CC=golang-dev https://golang.org/cl/180049
1 parent a3d1045 commit d65a5cc

File tree

119 files changed

+14330
-14330
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+14330
-14330
lines changed

‎src/pkg/once/once.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ package once
99
import "sync"
1010

1111
type job struct {
12-
done bool;
13-
sync.Mutex; // should probably be sync.Notification or some such
12+
done bool
13+
sync.Mutex // should probably be sync.Notification or some such
1414
}
1515

1616
var jobs = make(map[func()]*job)
@@ -37,23 +37,23 @@ var joblock sync.Mutex
3737
// because the func() expression in the first creates a new
3838
// func each time f runs, and each of those funcs is run once.
3939
func Do(f func()) {
40-
joblock.Lock();
41-
j, present := jobs[f];
40+
joblock.Lock()
41+
j, present := jobs[f]
4242
if !present {
4343
// run it
44-
j = new(job);
45-
j.Lock();
46-
jobs[f] = j;
47-
joblock.Unlock();
48-
f();
49-
j.done = true;
50-
j.Unlock();
44+
j = new(job)
45+
j.Lock()
46+
jobs[f] = j
47+
joblock.Unlock()
48+
f()
49+
j.done = true
50+
j.Unlock()
5151
} else {
5252
// wait for it
53-
joblock.Unlock();
53+
joblock.Unlock()
5454
if j.done != true {
55-
j.Lock();
56-
j.Unlock();
55+
j.Lock()
56+
j.Unlock()
5757
}
5858
}
5959
}

‎src/pkg/once/once_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@
55
package once_test
66

77
import (
8-
"once";
9-
"testing";
8+
"once"
9+
"testing"
1010
)
1111

1212
var ncall int
1313

14-
func call() { ncall++ }
14+
func call() { ncall++ }
1515

1616
func TestDo(t *testing.T) {
17-
ncall = 0;
18-
once.Do(call);
17+
ncall = 0
18+
once.Do(call)
1919
if ncall != 1 {
2020
t.Fatalf("once.Do(call) didn't call(): ncall=%d", ncall)
2121
}
22-
once.Do(call);
22+
once.Do(call)
2323
if ncall != 1 {
2424
t.Fatalf("second once.Do(call) did call(): ncall=%d", ncall)
2525
}
26-
once.Do(call);
26+
once.Do(call)
2727
if ncall != 1 {
2828
t.Fatalf("third once.Do(call) did call(): ncall=%d", ncall)
2929
}

‎src/pkg/os/dir_darwin.go‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
package os
66

77
import (
8-
"syscall";
9-
"unsafe";
8+
"syscall"
9+
"unsafe"
1010
)
1111

1212
const (
13-
blockSize = 4096; // TODO(r): use statfs
13+
blockSize = 4096 // TODO(r): use statfs
1414
)
1515

1616
// Readdirnames reads the contents of the directory associated with file and
@@ -21,59 +21,59 @@ const (
2121
func (file *File) Readdirnames(count int) (names []string, err Error) {
2222
// If this file has no dirinfo, create one.
2323
if file.dirinfo == nil {
24-
file.dirinfo = new(dirInfo);
24+
file.dirinfo = new(dirInfo)
2525
// The buffer must be at least a block long.
2626
// TODO(r): use fstatfs to find fs block size.
27-
file.dirinfo.buf = make([]byte, blockSize);
27+
file.dirinfo.buf = make([]byte, blockSize)
2828
}
29-
d := file.dirinfo;
30-
size := count;
29+
d := file.dirinfo
30+
size := count
3131
if size < 0 {
3232
size = 100
3333
}
34-
names = make([]string, 0, size); // Empty with room to grow.
34+
names = make([]string, 0, size) // Empty with room to grow.
3535
for count != 0 {
3636
// Refill the buffer if necessary
3737
if d.bufp >= d.nbuf {
38-
var errno int;
39-
d.bufp = 0;
38+
var errno int
39+
d.bufp = 0
4040
// Final argument is (basep *uintptr) and the syscall doesn't take nil.
41-
d.nbuf, errno = syscall.Getdirentries(file.fd, d.buf, new(uintptr));
41+
d.nbuf, errno = syscall.Getdirentries(file.fd, d.buf, new(uintptr))
4242
if errno != 0 {
43-
d.nbuf = 0;
44-
return names, NewSyscallError("getdirentries", errno);
43+
d.nbuf = 0
44+
return names, NewSyscallError("getdirentries", errno)
4545
}
4646
if d.nbuf <= 0 {
47-
break // EOF
47+
break // EOF
4848
}
4949
}
5050
// Drain the buffer
5151
for count != 0 && d.bufp < d.nbuf {
52-
dirent := (*syscall.Dirent)(unsafe.Pointer(&d.buf[d.bufp]));
52+
dirent := (*syscall.Dirent)(unsafe.Pointer(&d.buf[d.bufp]))
5353
if dirent.Reclen == 0 {
54-
d.bufp = d.nbuf;
55-
break;
54+
d.bufp = d.nbuf
55+
break
5656
}
57-
d.bufp += int(dirent.Reclen);
58-
if dirent.Ino == 0 { // File absent in directory.
57+
d.bufp += int(dirent.Reclen)
58+
if dirent.Ino == 0 { // File absent in directory.
5959
continue
6060
}
61-
bytes := (*[len(dirent.Name)]byte)(unsafe.Pointer(&dirent.Name[0]));
62-
var name = string(bytes[0:dirent.Namlen]);
63-
if name == "." || name == ".." { // Useless names
61+
bytes := (*[len(dirent.Name)]byte)(unsafe.Pointer(&dirent.Name[0]))
62+
var name = string(bytes[0:dirent.Namlen])
63+
if name == "." || name == ".." { // Useless names
6464
continue
6565
}
66-
count--;
66+
count--
6767
if len(names) == cap(names) {
68-
nnames := make([]string, len(names), 2*len(names));
68+
nnames := make([]string, len(names), 2*len(names))
6969
for i := 0; i < len(names); i++ {
7070
nnames[i] = names[i]
7171
}
72-
names = nnames;
72+
names = nnames
7373
}
74-
names = names[0 : len(names)+1];
75-
names[len(names)-1] = name;
74+
names = names[0 : len(names)+1]
75+
names[len(names)-1] = name
7676
}
7777
}
78-
return names, nil;
78+
return names, nil
7979
}

‎src/pkg/os/dir_freebsd.go‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,70 +5,70 @@
55
package os
66

77
import (
8-
"syscall";
9-
"unsafe";
8+
"syscall"
9+
"unsafe"
1010
)
1111

1212
const (
13-
blockSize = 4096; // TODO(r): use statfs
13+
blockSize = 4096 // TODO(r): use statfs
1414
)
1515

1616
func (file *File) Readdirnames(count int) (names []string, err Error) {
1717
// If this file has no dirinfo, create one.
1818
if file.dirinfo == nil {
19-
file.dirinfo = new(dirInfo);
19+
file.dirinfo = new(dirInfo)
2020
// The buffer must be at least a block long.
2121
// TODO(r): use fstatfs to find fs block size.
22-
file.dirinfo.buf = make([]byte, blockSize);
22+
file.dirinfo.buf = make([]byte, blockSize)
2323
}
24-
d := file.dirinfo;
25-
size := count;
24+
d := file.dirinfo
25+
size := count
2626
if size < 0 {
2727
size = 100
2828
}
29-
names = make([]string, 0, size); // Empty with room to grow.
29+
names = make([]string, 0, size) // Empty with room to grow.
3030
for count != 0 {
3131
// Refill the buffer if necessary
3232
if d.bufp >= d.nbuf {
33-
var errno int;
34-
d.bufp = 0;
33+
var errno int
34+
d.bufp = 0
3535
// Final argument is (basep *uintptr) and the syscall doesn't take nil.
36-
d.nbuf, errno = syscall.Getdirentries(file.fd, d.buf, new(uintptr));
36+
d.nbuf, errno = syscall.Getdirentries(file.fd, d.buf, new(uintptr))
3737
if errno != 0 {
38-
d.nbuf = 0;
39-
return names, NewSyscallError("getdirentries", errno);
38+
d.nbuf = 0
39+
return names, NewSyscallError("getdirentries", errno)
4040
}
4141
if d.nbuf <= 0 {
42-
break // EOF
42+
break // EOF
4343
}
4444
}
4545
// Drain the buffer
4646
for count != 0 && d.bufp < d.nbuf {
47-
dirent := (*syscall.Dirent)(unsafe.Pointer(&d.buf[d.bufp]));
47+
dirent := (*syscall.Dirent)(unsafe.Pointer(&d.buf[d.bufp]))
4848
if dirent.Reclen == 0 {
49-
d.bufp = d.nbuf;
50-
break;
49+
d.bufp = d.nbuf
50+
break
5151
}
52-
d.bufp += int(dirent.Reclen);
53-
if dirent.Fileno == 0 { // File absent in directory.
52+
d.bufp += int(dirent.Reclen)
53+
if dirent.Fileno == 0 { // File absent in directory.
5454
continue
5555
}
56-
bytes := (*[len(dirent.Name)]byte)(unsafe.Pointer(&dirent.Name[0]));
57-
var name = string(bytes[0:dirent.Namlen]);
58-
if name == "." || name == ".." { // Useless names
56+
bytes := (*[len(dirent.Name)]byte)(unsafe.Pointer(&dirent.Name[0]))
57+
var name = string(bytes[0:dirent.Namlen])
58+
if name == "." || name == ".." { // Useless names
5959
continue
6060
}
61-
count--;
61+
count--
6262
if len(names) == cap(names) {
63-
nnames := make([]string, len(names), 2*len(names));
63+
nnames := make([]string, len(names), 2*len(names))
6464
for i := 0; i < len(names); i++ {
6565
nnames[i] = names[i]
6666
}
67-
names = nnames;
67+
names = nnames
6868
}
69-
names = names[0 : len(names)+1];
70-
names[len(names)-1] = name;
69+
names = names[0 : len(names)+1]
70+
names[len(names)-1] = name
7171
}
7272
}
73-
return names, nil;
73+
return names, nil
7474
}

‎src/pkg/os/dir_linux.go‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
package os
66

77
import (
8-
"syscall";
9-
"unsafe";
8+
"syscall"
9+
"unsafe"
1010
)
1111

1212
const (
13-
blockSize = 4096; // TODO(r): use statfs
13+
blockSize = 4096 // TODO(r): use statfs
1414
)
1515

1616
func clen(n []byte) int {
@@ -19,59 +19,59 @@ func clen(n []byte) int {
1919
return i
2020
}
2121
}
22-
return len(n);
22+
return len(n)
2323
}
2424

2525
func (file *File) Readdirnames(count int) (names []string, err Error) {
2626
// If this file has no dirinfo, create one.
2727
if file.dirinfo == nil {
28-
file.dirinfo = new(dirInfo);
28+
file.dirinfo = new(dirInfo)
2929
// The buffer must be at least a block long.
3030
// TODO(r): use fstatfs to find fs block size.
31-
file.dirinfo.buf = make([]byte, blockSize);
31+
file.dirinfo.buf = make([]byte, blockSize)
3232
}
33-
d := file.dirinfo;
34-
size := count;
33+
d := file.dirinfo
34+
size := count
3535
if size < 0 {
3636
size = 100
3737
}
38-
names = make([]string, 0, size); // Empty with room to grow.
38+
names = make([]string, 0, size) // Empty with room to grow.
3939
for count != 0 {
4040
// Refill the buffer if necessary
4141
if d.bufp >= d.nbuf {
42-
var errno int;
43-
d.nbuf, errno = syscall.Getdents(file.fd, d.buf);
42+
var errno int
43+
d.nbuf, errno = syscall.Getdents(file.fd, d.buf)
4444
if errno != 0 {
4545
return names, NewSyscallError("getdents", errno)
4646
}
4747
if d.nbuf <= 0 {
48-
break // EOF
48+
break // EOF
4949
}
50-
d.bufp = 0;
50+
d.bufp = 0
5151
}
5252
// Drain the buffer
5353
for count != 0 && d.bufp < d.nbuf {
54-
dirent := (*syscall.Dirent)(unsafe.Pointer(&d.buf[d.bufp]));
55-
d.bufp += int(dirent.Reclen);
56-
if dirent.Ino == 0 { // File absent in directory.
54+
dirent := (*syscall.Dirent)(unsafe.Pointer(&d.buf[d.bufp]))
55+
d.bufp += int(dirent.Reclen)
56+
if dirent.Ino == 0 { // File absent in directory.
5757
continue
5858
}
59-
bytes := (*[len(dirent.Name)]byte)(unsafe.Pointer(&dirent.Name[0]));
60-
var name = string(bytes[0:clen(bytes)]);
61-
if name == "." || name == ".." { // Useless names
59+
bytes := (*[len(dirent.Name)]byte)(unsafe.Pointer(&dirent.Name[0]))
60+
var name = string(bytes[0:clen(bytes)])
61+
if name == "." || name == ".." { // Useless names
6262
continue
6363
}
64-
count--;
64+
count--
6565
if len(names) == cap(names) {
66-
nnames := make([]string, len(names), 2*len(names));
66+
nnames := make([]string, len(names), 2*len(names))
6767
for i := 0; i < len(names); i++ {
6868
nnames[i] = names[i]
6969
}
70-
names = nnames;
70+
names = nnames
7171
}
72-
names = names[0 : len(names)+1];
73-
names[len(names)-1] = name;
72+
names = names[0 : len(names)+1]
73+
names[len(names)-1] = name
7474
}
7575
}
76-
return names, nil;
76+
return names, nil
7777
}

0 commit comments

Comments
 (0)