- replaced gofmt expression formatting algorithm with

  rsc's algorithm
- applied gofmt -w misc src
- partial CL (last chunk)

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

2 files changed, 5 insertions, 5 deletions

diff --git a/src/pkg/json/parse.go b/src/pkg/json/parse.go
index 74208824b..ac44afca1 100644
--- a/src/pkg/json/parse.go
+++ b/src/pkg/json/parse.go
@@ -31,11 +31,11 @@ func _UnHex(p string, r, l int) (v int, ok bool) {
 		v *= 16;
 		switch {
 		case '0' <= p[i] && p[i] <= '9':
-			v += int(p[i]-'0')
+			v += int(p[i] - '0')
 		case 'a' <= p[i] && p[i] <= 'f':
-			v += int(p[i]-'a'+10)
+			v += int(p[i] - 'a' + 10)
 		case 'A' <= p[i] && p[i] <= 'F':
-			v += int(p[i]-'A'+10)
+			v += int(p[i] - 'A' + 10)
 		default:
 			return 0, false
 		}
@@ -208,7 +208,7 @@ func skipstring(p string, i int) int {
 	if i >= len(p) {
 		return i
 	}
-	return i+1;
+	return i + 1;
 }
 
 func (t *_Lexer) Next() {
diff --git a/src/pkg/json/struct.go b/src/pkg/json/struct.go
index 11aaccee9..3fcf00e89 100644
--- a/src/pkg/json/struct.go
+++ b/src/pkg/json/struct.go
@@ -167,7 +167,7 @@ func (b *structBuilder) Elem(i int) Builder {
 			v.Set(nv);
 		}
 		if v.Len() <= i && i < v.Cap() {
-			v.SetLen(i+1)
+			v.SetLen(i + 1)
 		}
 		if i < v.Len() {
 			return &structBuilder{val: v.Elem(i)}