- replaced gofmt expression formatting algorithm with

  rsc's algorithm
- applied gofmt -w misc src
- partial CL (remaining files in other CLs)

R=rsc, r
http://go/go-review/1024040

2 files changed, 15 insertions, 15 deletions

diff --git a/src/cmd/cgo/gcc.go b/src/cmd/cgo/gcc.go
index f5c33e82c..6e9ba13b7 100644
--- a/src/cmd/cgo/gcc.go
+++ b/src/cmd/cgo/gcc.go
@@ -198,7 +198,7 @@ func (p *Prog) gccDebug(stdin []byte) (*dwarf.Data, string) {
 		machine,
 		"-Wall",	// many warnings
 		"-Werror",	// warnings are errors
-		"-o"+tmp,	// write object to tmp
+		"-o" + tmp,	// write object to tmp
 		"-gdwarf-2",	// generate DWARF v2 debugging symbols
 		"-c",	// do not link
 		"-xc",	// input language is C
@@ -515,7 +515,7 @@ func (c *typeConv) Type(dtype dwarf.Type) *Type {
 				s = ss
 			}
 			s = strings.Join(strings.Split(s, " ", 0), "");	// strip spaces
-			name := c.Ident("_C_"+s);
+			name := c.Ident("_C_" + s);
 			c.typedef[name.Value] = t.Go;
 			t.Go = name;
 		}
@@ -609,11 +609,11 @@ func (c *typeConv) pad(fld []*ast.Field, size int64) []*ast.Field {
 // Struct conversion
 func (c *typeConv) Struct(dt *dwarf.StructType) (expr *ast.StructType, csyntax string, align int64) {
 	csyntax = "struct { ";
-	fld := make([]*ast.Field, 0, 2*len(dt.Field) + 1);	// enough for padding around every field
+	fld := make([]*ast.Field, 0, 2*len(dt.Field)+1);	// enough for padding around every field
 	off := int64(0);
 	for _, f := range dt.Field {
 		if f.ByteOffset > off {
-			fld = c.pad(fld, f.ByteOffset - off);
+			fld = c.pad(fld, f.ByteOffset-off);
 			off = f.ByteOffset;
 		}
 		t := c.Type(f.Type);
@@ -627,7 +627,7 @@ func (c *typeConv) Struct(dt *dwarf.StructType) (expr *ast.StructType, csyntax s
 		}
 	}
 	if off < dt.ByteSize {
-		fld = c.pad(fld, dt.ByteSize - off);
+		fld = c.pad(fld, dt.ByteSize-off);
 		off = dt.ByteSize;
 	}
 	if off != dt.ByteSize {
diff --git a/src/cmd/cgo/out.go b/src/cmd/cgo/out.go
index 2a62233b7..297ffe40a 100644
--- a/src/cmd/cgo/out.go
+++ b/src/cmd/cgo/out.go
@@ -13,7 +13,7 @@ import (
 )
 
 func creat(name string) *os.File {
-	f, err := os.Open(name, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0666);
+	f, err := os.Open(name, os.O_WRONLY|os.O_CREAT|os.O_TRUNC, 0666);
 	if err != nil {
 		fatal("%s", err)
 	}
@@ -72,7 +72,7 @@ func (p *Prog) writeOutput(srcfile string) {
 	for name, def := range p.Funcdef {
 		// Go func declaration.
 		d := &ast.FuncDecl{
-			Name: &ast.Ident{Value: "_C_"+name},
+			Name: &ast.Ident{Value: "_C_" + name},
 			Type: def.Go,
 		};
 		printer.Fprint(fgo2, d);
@@ -92,8 +92,8 @@ func (p *Prog) writeOutput(srcfile string) {
 		off := int64(0);
 		npad := 0;
 		for i, t := range def.Params {
-			if off % t.Align != 0 {
-				pad := t.Align - off % t.Align;
+			if off%t.Align != 0 {
+				pad := t.Align - off%t.Align;
 				structType += fmt.Sprintf("\t\tchar __pad%d[%d];\n", npad, pad);
 				off += pad;
 				npad++;
@@ -101,15 +101,15 @@ func (p *Prog) writeOutput(srcfile string) {
 			structType += fmt.Sprintf("\t\t%s p%d;\n", t.C, i);
 			off += t.Size;
 		}
-		if off % p.PtrSize != 0 {
-			pad := p.PtrSize - off % p.PtrSize;
+		if off%p.PtrSize != 0 {
+			pad := p.PtrSize - off%p.PtrSize;
 			structType += fmt.Sprintf("\t\tchar __pad%d[%d];\n", npad, pad);
 			off += pad;
 			npad++;
 		}
 		if t := def.Result; t != nil {
-			if off % t.Align != 0 {
-				pad := t.Align - off % t.Align;
+			if off%t.Align != 0 {
+				pad := t.Align - off%t.Align;
 				structType += fmt.Sprintf("\t\tchar __pad%d[%d];\n", npad, pad);
 				off += pad;
 				npad++;
@@ -117,8 +117,8 @@ func (p *Prog) writeOutput(srcfile string) {
 			structType += fmt.Sprintf("\t\t%s r;\n", t.C);
 			off += t.Size;
 		}
-		if off % p.PtrSize != 0 {
-			pad := p.PtrSize - off % p.PtrSize;
+		if off%p.PtrSize != 0 {
+			pad := p.PtrSize - off%p.PtrSize;
 			structType += fmt.Sprintf("\t\tchar __pad%d[%d];\n", npad, pad);
 			off += pad;
 			npad++;