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

	       1st set of files.

R=rsc
CC=agl, golang-dev, iant, ken2, r
http://codereview.appspot.com/180047

1 files changed, 65 insertions, 65 deletions

diff --git a/src/cmd/gofmt/rewrite.go b/src/cmd/gofmt/rewrite.go
index ccbfe1d7f..fe35bfb08 100644
--- a/src/cmd/gofmt/rewrite.go
+++ b/src/cmd/gofmt/rewrite.go
@@ -5,15 +5,15 @@
 package main
 
 import (
-	"fmt";
-	"go/ast";
-	"go/parser";
-	"go/token";
-	"os";
-	"reflect";
-	"strings";
-	"unicode";
-	"utf8";
+	"fmt"
+	"go/ast"
+	"go/parser"
+	"go/token"
+	"os"
+	"reflect"
+	"strings"
+	"unicode"
+	"utf8"
 )
 
 
@@ -21,14 +21,14 @@ func initRewrite() {
 	if *rewriteRule == "" {
 		return
 	}
-	f := strings.Split(*rewriteRule, "->", 0);
+	f := strings.Split(*rewriteRule, "->", 0)
 	if len(f) != 2 {
-		fmt.Fprintf(os.Stderr, "rewrite rule must be of the form 'pattern -> replacement'\n");
-		os.Exit(2);
+		fmt.Fprintf(os.Stderr, "rewrite rule must be of the form 'pattern -> replacement'\n")
+		os.Exit(2)
 	}
-	pattern := parseExpr(f[0], "pattern");
-	replace := parseExpr(f[1], "replacement");
-	rewrite = func(p *ast.File) *ast.File { return rewriteFile(pattern, replace, p) };
+	pattern := parseExpr(f[0], "pattern")
+	replace := parseExpr(f[1], "replacement")
+	rewrite = func(p *ast.File) *ast.File { return rewriteFile(pattern, replace, p) }
 }
 
 
@@ -37,41 +37,41 @@ func initRewrite() {
 // but there are problems with preserving formatting and also
 // with what a wildcard for a statement looks like.
 func parseExpr(s string, what string) ast.Expr {
-	stmts, err := parser.ParseStmtList("input", s);
+	stmts, err := parser.ParseStmtList("input", s)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "parsing %s %s: %s\n", what, s, err);
-		os.Exit(2);
+		fmt.Fprintf(os.Stderr, "parsing %s %s: %s\n", what, s, err)
+		os.Exit(2)
 	}
 	if len(stmts) != 1 {
-		fmt.Fprintf(os.Stderr, "%s must be single expression\n", what);
-		os.Exit(2);
+		fmt.Fprintf(os.Stderr, "%s must be single expression\n", what)
+		os.Exit(2)
 	}
-	x, ok := stmts[0].(*ast.ExprStmt);
+	x, ok := stmts[0].(*ast.ExprStmt)
 	if !ok {
-		fmt.Fprintf(os.Stderr, "%s must be single expression\n", what);
-		os.Exit(2);
+		fmt.Fprintf(os.Stderr, "%s must be single expression\n", what)
+		os.Exit(2)
 	}
-	return x.X;
+	return x.X
 }
 
 
 // rewriteFile applys the rewrite rule pattern -> replace to an entire file.
 func rewriteFile(pattern, replace ast.Expr, p *ast.File) *ast.File {
-	m := make(map[string]reflect.Value);
-	pat := reflect.NewValue(pattern);
-	repl := reflect.NewValue(replace);
-	var f func(val reflect.Value) reflect.Value;	// f is recursive
+	m := make(map[string]reflect.Value)
+	pat := reflect.NewValue(pattern)
+	repl := reflect.NewValue(replace)
+	var f func(val reflect.Value) reflect.Value // f is recursive
 	f = func(val reflect.Value) reflect.Value {
 		for k := range m {
 			m[k] = nil, false
 		}
-		val = apply(f, val);
+		val = apply(f, val)
 		if match(m, pat, val) {
 			val = subst(m, repl, reflect.NewValue(val.Interface().(ast.Node).Pos()))
 		}
-		return val;
-	};
-	return apply(f, reflect.NewValue(p)).Interface().(*ast.File);
+		return val
+	}
+	return apply(f, reflect.NewValue(p)).Interface().(*ast.File)
 }
 
 
@@ -80,8 +80,8 @@ var identType = reflect.Typeof((*ast.Ident)(nil))
 
 
 func isWildcard(s string) bool {
-	rune, size := utf8.DecodeRuneInString(s);
-	return size == len(s) && unicode.IsLower(rune);
+	rune, size := utf8.DecodeRuneInString(s)
+	return size == len(s) && unicode.IsLower(rune)
 }
 
 
@@ -94,19 +94,19 @@ func apply(f func(reflect.Value) reflect.Value, val reflect.Value) reflect.Value
 	switch v := reflect.Indirect(val).(type) {
 	case *reflect.SliceValue:
 		for i := 0; i < v.Len(); i++ {
-			e := v.Elem(i);
-			e.SetValue(f(e));
+			e := v.Elem(i)
+			e.SetValue(f(e))
 		}
 	case *reflect.StructValue:
 		for i := 0; i < v.NumField(); i++ {
-			e := v.Field(i);
-			e.SetValue(f(e));
+			e := v.Field(i)
+			e.SetValue(f(e))
 		}
 	case *reflect.InterfaceValue:
-		e := v.Elem();
-		v.SetValue(f(e));
+		e := v.Elem()
+		v.SetValue(f(e))
 	}
-	return val;
+	return val
 }
 
 
@@ -118,13 +118,13 @@ func match(m map[string]reflect.Value, pattern, val reflect.Value) bool {
 	// times in the pattern, it must match the same expression
 	// each time.
 	if m != nil && pattern.Type() == identType {
-		name := pattern.Interface().(*ast.Ident).Value;
+		name := pattern.Interface().(*ast.Ident).Value
 		if isWildcard(name) {
 			if old, ok := m[name]; ok {
 				return match(nil, old, val)
 			}
-			m[name] = val;
-			return true;
+			m[name] = val
+			return true
 		}
 	}
 
@@ -141,35 +141,35 @@ func match(m map[string]reflect.Value, pattern, val reflect.Value) bool {
 		return true
 	}
 
-	p := reflect.Indirect(pattern);
-	v := reflect.Indirect(val);
+	p := reflect.Indirect(pattern)
+	v := reflect.Indirect(val)
 
 	switch p := p.(type) {
 	case *reflect.SliceValue:
-		v := v.(*reflect.SliceValue);
+		v := v.(*reflect.SliceValue)
 		for i := 0; i < p.Len(); i++ {
 			if !match(m, p.Elem(i), v.Elem(i)) {
 				return false
 			}
 		}
-		return true;
+		return true
 
 	case *reflect.StructValue:
-		v := v.(*reflect.StructValue);
+		v := v.(*reflect.StructValue)
 		for i := 0; i < p.NumField(); i++ {
 			if !match(m, p.Field(i), v.Field(i)) {
 				return false
 			}
 		}
-		return true;
+		return true
 
 	case *reflect.InterfaceValue:
-		v := v.(*reflect.InterfaceValue);
-		return match(m, p.Elem(), v.Elem());
+		v := v.(*reflect.InterfaceValue)
+		return match(m, p.Elem(), v.Elem())
 	}
 
 	// Handle token integers, etc.
-	return p.Interface() == v.Interface();
+	return p.Interface() == v.Interface()
 }
 
 
@@ -184,7 +184,7 @@ func subst(m map[string]reflect.Value, pattern reflect.Value, pos reflect.Value)
 
 	// Wildcard gets replaced with map value.
 	if m != nil && pattern.Type() == identType {
-		name := pattern.Interface().(*ast.Ident).Value;
+		name := pattern.Interface().(*ast.Ident).Value
 		if isWildcard(name) {
 			if old, ok := m[name]; ok {
 				return subst(nil, old, nil)
@@ -199,29 +199,29 @@ func subst(m map[string]reflect.Value, pattern reflect.Value, pos reflect.Value)
 	// Otherwise copy.
 	switch p := pattern.(type) {
 	case *reflect.SliceValue:
-		v := reflect.MakeSlice(p.Type().(*reflect.SliceType), p.Len(), p.Len());
+		v := reflect.MakeSlice(p.Type().(*reflect.SliceType), p.Len(), p.Len())
 		for i := 0; i < p.Len(); i++ {
 			v.Elem(i).SetValue(subst(m, p.Elem(i), pos))
 		}
-		return v;
+		return v
 
 	case *reflect.StructValue:
-		v := reflect.MakeZero(p.Type()).(*reflect.StructValue);
+		v := reflect.MakeZero(p.Type()).(*reflect.StructValue)
 		for i := 0; i < p.NumField(); i++ {
 			v.Field(i).SetValue(subst(m, p.Field(i), pos))
 		}
-		return v;
+		return v
 
 	case *reflect.PtrValue:
-		v := reflect.MakeZero(p.Type()).(*reflect.PtrValue);
-		v.PointTo(subst(m, p.Elem(), pos));
-		return v;
+		v := reflect.MakeZero(p.Type()).(*reflect.PtrValue)
+		v.PointTo(subst(m, p.Elem(), pos))
+		return v
 
 	case *reflect.InterfaceValue:
-		v := reflect.MakeZero(p.Type()).(*reflect.InterfaceValue);
-		v.SetValue(subst(m, p.Elem(), pos));
-		return v;
+		v := reflect.MakeZero(p.Type()).(*reflect.InterfaceValue)
+		v.SetValue(subst(m, p.Elem(), pos))
+		return v
 	}
 
-	return pattern;
+	return pattern
 }