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
http://codereview.appspot.com/180049

1 files changed, 90 insertions, 90 deletions

diff --git a/src/pkg/syscall/syscall_nacl.go b/src/pkg/syscall/syscall_nacl.go
index a3f6740c9..6a5d9c2d6 100644
--- a/src/pkg/syscall/syscall_nacl.go
+++ b/src/pkg/syscall/syscall_nacl.go
@@ -54,8 +54,8 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, errno int) {
 	if int64(int32(offset)) != offset {
 		return 0, ERANGE
 	}
-	o, _, e := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence));
-	return int64(o), int(e);
+	o, _, e := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	return int64(o), int(e)
 }
 
 // Sleep by waiting on a condition variable that will never be signaled.
@@ -63,34 +63,34 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, errno int) {
 var tcv, tmu int
 
 func init() {
-	tmu, _ = MutexCreate();
-	tcv, _ = CondCreate();
+	tmu, _ = MutexCreate()
+	tcv, _ = CondCreate()
 }
 
 func Sleep(ns int64) (errno int) {
-	ts := NsecToTimespec(ns);
-	var tv Timeval;
+	ts := NsecToTimespec(ns)
+	var tv Timeval
 	if errno = Gettimeofday(&tv); errno != 0 {
 		return
 	}
-	ts.Sec += tv.Sec;
-	ts.Nsec += tv.Usec * 1000;
+	ts.Sec += tv.Sec
+	ts.Nsec += tv.Usec * 1000
 	switch {
 	case ts.Nsec >= 1e9:
-		ts.Nsec -= 1e9;
-		ts.Sec++;
+		ts.Nsec -= 1e9
+		ts.Sec++
 	case ts.Nsec <= -1e9:
-		ts.Nsec += 1e9;
-		ts.Sec--;
+		ts.Nsec += 1e9
+		ts.Sec--
 	}
 	if errno = MutexLock(tmu); errno != 0 {
 		return
 	}
-	errno = CondTimedWaitAbs(tcv, tmu, &ts);
+	errno = CondTimedWaitAbs(tcv, tmu, &ts)
 	if e := MutexUnlock(tmu); e != 0 && errno == 0 {
 		errno = e
 	}
-	return;
+	return
 }
 
 // Implemented in NaCl but not here; maybe later:
@@ -111,10 +111,10 @@ func Sleep(ns int64) (errno int) {
 // Not implemented in NaCl but needed to compile other packages.
 
 const (
-	SIGTRAP = 5;
+	SIGTRAP = 5
 )
 
-func Pipe(p []int) (errno int)	{ return ENACL }
+func Pipe(p []int) (errno int) { return ENACL }
 
 func fcntl(fd, cmd, arg int) (val int, errno int) {
 	return 0, ENACL
@@ -128,25 +128,25 @@ func Pwrite(fd int, p []byte, offset int64) (n int, errno int) {
 	return 0, ENACL
 }
 
-func Mkdir(path string, mode int) (errno int)	{ return ENACL }
+func Mkdir(path string, mode int) (errno int) { return ENACL }
 
 func Lstat(path string, stat *Stat_t) (errno int) {
 	return ENACL
 }
 
-func Chdir(path string) (errno int)	{ return ENACL }
+func Chdir(path string) (errno int) { return ENACL }
 
-func Fchdir(fd int) (errno int)	{ return ENACL }
+func Fchdir(fd int) (errno int) { return ENACL }
 
-func Unlink(path string) (errno int)	{ return ENACL }
+func Unlink(path string) (errno int) { return ENACL }
 
-func Rmdir(path string) (errno int)	{ return ENACL }
+func Rmdir(path string) (errno int) { return ENACL }
 
 func Link(oldpath, newpath string) (errno int) {
 	return ENACL
 }
 
-func Symlink(path, link string) (errno int)	{ return ENACL }
+func Symlink(path, link string) (errno int) { return ENACL }
 
 func Readlink(path string, buf []byte) (n int, errno int) {
 	return 0, ENACL
@@ -156,7 +156,7 @@ func Rename(oldpath, newpath string) (errno int) {
 	return ENACL
 }
 
-func Fchmod(fd int, mode int) (errno int)	{ return ENACL }
+func Fchmod(fd int, mode int) (errno int) { return ENACL }
 
 func Chown(path string, uid int, gid int) (errno int) {
 	return ENACL
@@ -184,65 +184,65 @@ func Ftruncate(fd int, length int64) (errno int) {
 
 const ImplementsGetwd = true
 
-func Getwd() (wd string, errno int)	{ return "", ENACL }
+func Getwd() (wd string, errno int) { return "", ENACL }
 
-func Getuid() (uid int)	{ return -1 }
+func Getuid() (uid int) { return -1 }
 
-func Geteuid() (euid int)	{ return -1 }
+func Geteuid() (euid int) { return -1 }
 
-func Getgid() (gid int)	{ return -1 }
+func Getgid() (gid int) { return -1 }
 
-func Getegid() (egid int)	{ return -1 }
+func Getegid() (egid int) { return -1 }
 
-func Getppid() (ppid int)	{ return -1 }
+func Getppid() (ppid int) { return -1 }
 
-func Getgroups() (gids []int, errno int)	{ return nil, ENACL }
+func Getgroups() (gids []int, errno int) { return nil, ENACL }
 
 type Sockaddr interface {
-	sockaddr();
+	sockaddr()
 }
 
 type SockaddrInet4 struct {
-	Port	int;
-	Addr	[4]byte;
+	Port int
+	Addr [4]byte
 }
 
-func (*SockaddrInet4) sockaddr()	{}
+func (*SockaddrInet4) sockaddr() {}
 
 type SockaddrInet6 struct {
-	Port	int;
-	Addr	[16]byte;
+	Port int
+	Addr [16]byte
 }
 
-func (*SockaddrInet6) sockaddr()	{}
+func (*SockaddrInet6) sockaddr() {}
 
 type SockaddrUnix struct {
-	Name string;
+	Name string
 }
 
-func (*SockaddrUnix) sockaddr()	{}
+func (*SockaddrUnix) sockaddr() {}
 
 const (
-	AF_INET	= 1 + iota;
-	AF_INET6;
-	AF_UNIX;
-	IPPROTO_TCP;
-	SOCK_DGRAM;
-	SOCK_STREAM;
-	SOL_SOCKET;
-	SOMAXCONN;
-	SO_DONTROUTE;
-	SO_KEEPALIVE;
-	SO_LINGER;
-	SO_RCVBUF;
-	SO_REUSEADDR;
-	SO_SNDBUF;
-	TCP_NODELAY;
-	WNOHANG;
-	WSTOPPED;
-	PTRACE_TRACEME;
-	SO_BROADCAST	= 0;
-	SHUT_RDWR	= 0;
+	AF_INET = 1 + iota
+	AF_INET6
+	AF_UNIX
+	IPPROTO_TCP
+	SOCK_DGRAM
+	SOCK_STREAM
+	SOL_SOCKET
+	SOMAXCONN
+	SO_DONTROUTE
+	SO_KEEPALIVE
+	SO_LINGER
+	SO_RCVBUF
+	SO_REUSEADDR
+	SO_SNDBUF
+	TCP_NODELAY
+	WNOHANG
+	WSTOPPED
+	PTRACE_TRACEME
+	SO_BROADCAST = 0
+	SHUT_RDWR    = 0
 )
 
 func Accept(fd int) (nfd int, sa Sockaddr, errno int) {
@@ -257,9 +257,9 @@ func Getpeername(fd int) (sa Sockaddr, errno int) {
 	return nil, ENACL
 }
 
-func Bind(fd int, sa Sockaddr) (errno int)	{ return ENACL }
+func Bind(fd int, sa Sockaddr) (errno int) { return ENACL }
 
-func Connect(fd int, sa Sockaddr) (errno int)	{ return ENACL }
+func Connect(fd int, sa Sockaddr) (errno int) { return ENACL }
 
 func Socket(domain, typ, proto int) (fd, errno int) {
 	return 0, ENACL
@@ -269,7 +269,7 @@ func SetsockoptInt(fd, level, opt int, value int) (errno int) {
 	return ENACL
 }
 
-func Shutdown(fd, how int) (errno int)	{ return ENACL }
+func Shutdown(fd, how int) (errno int) { return ENACL }
 
 func Recvfrom(fd int, p []byte, flags int) (n int, from Sockaddr, errno int) {
 	return 0, nil, ENACL
@@ -284,33 +284,33 @@ func SetsockoptTimeval(fd, level, opt int, tv *Timeval) (errno int) {
 }
 
 type Linger struct {
-	Onoff	int32;
-	Linger	int32;
+	Onoff  int32
+	Linger int32
 }
 
 func SetsockoptLinger(fd, level, opt int, l *Linger) (errno int) {
 	return ENACL
 }
 
-func Listen(s int, n int) (errno int)	{ return ENACL }
+func Listen(s int, n int) (errno int) { return ENACL }
 
 type Rusage struct {
-	Utime		Timeval;
-	Stime		Timeval;
-	Maxrss		int32;
-	Ixrss		int32;
-	Idrss		int32;
-	Isrss		int32;
-	Minflt		int32;
-	Majflt		int32;
-	Nswap		int32;
-	Inblock		int32;
-	Oublock		int32;
-	Msgsnd		int32;
-	Msgrcv		int32;
-	Nsignals	int32;
-	Nvcsw		int32;
-	Nivcsw		int32;
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
 }
 
 func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, errno int) {
@@ -319,20 +319,20 @@ func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int,
 
 type WaitStatus uint32
 
-func (WaitStatus) Exited() bool	{ return false }
+func (WaitStatus) Exited() bool { return false }
 
-func (WaitStatus) ExitStatus() int	{ return -1 }
+func (WaitStatus) ExitStatus() int { return -1 }
 
-func (WaitStatus) Signal() int	{ return -1 }
+func (WaitStatus) Signal() int { return -1 }
 
-func (WaitStatus) CoreDump() bool	{ return false }
+func (WaitStatus) CoreDump() bool { return false }
 
-func (WaitStatus) Stopped() bool	{ return false }
+func (WaitStatus) Stopped() bool { return false }
 
-func (WaitStatus) Continued() bool	{ return false }
+func (WaitStatus) Continued() bool { return false }
 
-func (WaitStatus) StopSignal() int	{ return -1 }
+func (WaitStatus) StopSignal() int { return -1 }
 
-func (WaitStatus) Signaled() bool	{ return false }
+func (WaitStatus) Signaled() bool { return false }
 
-func (WaitStatus) TrapCause() int	{ return -1 }
+func (WaitStatus) TrapCause() int { return -1 }