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

3rd set of files.

R=rsc
CC=golang-dev
http://codereview.appspot.com/180048

1 files changed, 63 insertions, 63 deletions

diff --git a/src/pkg/http/triv.go b/src/pkg/http/triv.go
index 529a6ebff..dea2c23b0 100644
--- a/src/pkg/http/triv.go
+++ b/src/pkg/http/triv.go
@@ -5,16 +5,16 @@
 package main
 
 import (
-	"bytes";
-	"bufio";
-	"expvar";
-	"flag";
-	"fmt";
-	"io";
-	"log";
-	"net";
-	"os";
-	"strconv";
+	"bytes"
+	"bufio"
+	"expvar"
+	"flag"
+	"fmt"
+	"io"
+	"log"
+	"net"
+	"os"
+	"strconv"
 )
 
 
@@ -22,35 +22,35 @@ import (
 var helloRequests = expvar.NewInt("hello-requests")
 
 func HelloServer(c *http.Conn, req *http.Request) {
-	helloRequests.Add(1);
-	io.WriteString(c, "hello, world!\n");
+	helloRequests.Add(1)
+	io.WriteString(c, "hello, world!\n")
 }
 
 // Simple counter server. POSTing to it will set the value.
 type Counter struct {
-	n int;
+	n int
 }
 
 // This makes Counter satisfy the expvar.Var interface, so we can export
 // it directly.
-func (ctr *Counter) String() string	{ return fmt.Sprintf("%d", ctr.n) }
+func (ctr *Counter) String() string { return fmt.Sprintf("%d", ctr.n) }
 
 func (ctr *Counter) ServeHTTP(c *http.Conn, req *http.Request) {
 	switch req.Method {
 	case "GET":
 		ctr.n++
 	case "POST":
-		buf := new(bytes.Buffer);
-		io.Copy(buf, req.Body);
-		body := buf.String();
+		buf := new(bytes.Buffer)
+		io.Copy(buf, req.Body)
+		body := buf.String()
 		if n, err := strconv.Atoi(body); err != nil {
 			fmt.Fprintf(c, "bad POST: %v\nbody: [%v]\n", err, body)
 		} else {
-			ctr.n = n;
-			fmt.Fprint(c, "counter reset\n");
+			ctr.n = n
+			fmt.Fprint(c, "counter reset\n")
 		}
 	}
-	fmt.Fprintf(c, "counter = %d\n", ctr.n);
+	fmt.Fprintf(c, "counter = %d\n", ctr.n)
 }
 
 // simple file server
@@ -58,33 +58,33 @@ var webroot = flag.String("root", "/home/rsc", "web root directory")
 var pathVar = expvar.NewMap("file-requests")
 
 func FileServer(c *http.Conn, req *http.Request) {
-	c.SetHeader("content-type", "text/plain; charset=utf-8");
-	pathVar.Add(req.URL.Path, 1);
-	path := *webroot + req.URL.Path;	// TODO: insecure: use os.CleanName
-	f, err := os.Open(path, os.O_RDONLY, 0);
+	c.SetHeader("content-type", "text/plain; charset=utf-8")
+	pathVar.Add(req.URL.Path, 1)
+	path := *webroot + req.URL.Path // TODO: insecure: use os.CleanName
+	f, err := os.Open(path, os.O_RDONLY, 0)
 	if err != nil {
-		c.WriteHeader(http.StatusNotFound);
-		fmt.Fprintf(c, "open %s: %v\n", path, err);
-		return;
+		c.WriteHeader(http.StatusNotFound)
+		fmt.Fprintf(c, "open %s: %v\n", path, err)
+		return
 	}
-	n, err1 := io.Copy(c, f);
-	fmt.Fprintf(c, "[%d bytes]\n", n);
-	f.Close();
+	n, err1 := io.Copy(c, f)
+	fmt.Fprintf(c, "[%d bytes]\n", n)
+	f.Close()
 }
 
 // simple flag server
 var booleanflag = flag.Bool("boolean", true, "another flag for testing")
 
 func FlagServer(c *http.Conn, req *http.Request) {
-	c.SetHeader("content-type", "text/plain; charset=utf-8");
-	fmt.Fprint(c, "Flags:\n");
+	c.SetHeader("content-type", "text/plain; charset=utf-8")
+	fmt.Fprint(c, "Flags:\n")
 	flag.VisitAll(func(f *flag.Flag) {
 		if f.Value.String() != f.DefValue {
 			fmt.Fprintf(c, "%s = %s [default = %s]\n", f.Name, f.Value.String(), f.DefValue)
 		} else {
 			fmt.Fprintf(c, "%s = %s\n", f.Name, f.Value.String())
 		}
-	});
+	})
 }
 
 // simple argument server
@@ -98,13 +98,13 @@ func ArgServer(c *http.Conn, req *http.Request) {
 type Chan chan int
 
 func ChanCreate() Chan {
-	c := make(Chan);
+	c := make(Chan)
 	go func(c Chan) {
 		for x := 0; ; x++ {
 			c <- x
 		}
-	}(c);
-	return c;
+	}(c)
+	return c
 }
 
 func (ch Chan) ServeHTTP(c *http.Conn, req *http.Request) {
@@ -113,46 +113,46 @@ func (ch Chan) ServeHTTP(c *http.Conn, req *http.Request) {
 
 // exec a program, redirecting output
 func DateServer(c *http.Conn, req *http.Request) {
-	c.SetHeader("content-type", "text/plain; charset=utf-8");
-	r, w, err := os.Pipe();
+	c.SetHeader("content-type", "text/plain; charset=utf-8")
+	r, w, err := os.Pipe()
 	if err != nil {
-		fmt.Fprintf(c, "pipe: %s\n", err);
-		return;
+		fmt.Fprintf(c, "pipe: %s\n", err)
+		return
 	}
-	pid, err := os.ForkExec("/bin/date", []string{"date"}, os.Environ(), "", []*os.File{nil, w, w});
-	defer r.Close();
-	w.Close();
+	pid, err := os.ForkExec("/bin/date", []string{"date"}, os.Environ(), "", []*os.File{nil, w, w})
+	defer r.Close()
+	w.Close()
 	if err != nil {
-		fmt.Fprintf(c, "fork/exec: %s\n", err);
-		return;
+		fmt.Fprintf(c, "fork/exec: %s\n", err)
+		return
 	}
-	io.Copy(c, r);
-	wait, err := os.Wait(pid, 0);
+	io.Copy(c, r)
+	wait, err := os.Wait(pid, 0)
 	if err != nil {
-		fmt.Fprintf(c, "wait: %s\n", err);
-		return;
+		fmt.Fprintf(c, "wait: %s\n", err)
+		return
 	}
 	if !wait.Exited() || wait.ExitStatus() != 0 {
-		fmt.Fprintf(c, "date: %v\n", wait);
-		return;
+		fmt.Fprintf(c, "date: %v\n", wait)
+		return
 	}
 }
 
 func main() {
-	flag.Parse();
+	flag.Parse()
 
 	// The counter is published as a variable directly.
-	ctr := new(Counter);
-	http.Handle("/counter", ctr);
-	expvar.Publish("counter", ctr);
-
-	http.Handle("/go/", http.HandlerFunc(FileServer));
-	http.Handle("/flags", http.HandlerFunc(FlagServer));
-	http.Handle("/args", http.HandlerFunc(ArgServer));
-	http.Handle("/go/hello", http.HandlerFunc(HelloServer));
-	http.Handle("/chan", ChanCreate());
-	http.Handle("/date", http.HandlerFunc(DateServer));
-	err := http.ListenAndServe(":12345", nil);
+	ctr := new(Counter)
+	http.Handle("/counter", ctr)
+	expvar.Publish("counter", ctr)
+
+	http.Handle("/go/", http.HandlerFunc(FileServer))
+	http.Handle("/flags", http.HandlerFunc(FlagServer))
+	http.Handle("/args", http.HandlerFunc(ArgServer))
+	http.Handle("/go/hello", http.HandlerFunc(HelloServer))
+	http.Handle("/chan", ChanCreate())
+	http.Handle("/date", http.HandlerFunc(DateServer))
+	err := http.ListenAndServe(":12345", nil)
 	if err != nil {
 		log.Crash("ListenAndServe: ", err)
 	}