various cleanups, improvements to code generator

Author: dchenk

gen/decode.go

@@ -51,7 +51,6 @@ func (d *decodeGen) gStruct(s *Struct) {
 	} else {
 		d.structAsMap(s)
 	}
-	return
 }
 
 func (d *decodeGen) assignAndCheck(name, typ string) {
@@ -63,12 +62,10 @@ func (d *decodeGen) assignAndCheck(name, typ string) {
 }
 
 func (d *decodeGen) structAsTuple(s *Struct) {
-	nfields := len(s.Fields)
-
 	sz := randIdent()
 	d.p.declare(sz, u32)
 	d.assignAndCheck(sz, arrayHeader)
-	d.p.arrayCheck(strconv.Itoa(nfields), sz)
+	d.p.arrayCheck(strconv.Itoa(len(s.Fields)), sz)
 	for i := range s.Fields {
 		if !d.p.ok() {
 			return

gen/encode.go

@@ -32,7 +32,7 @@ func (e *encodeGen) writeAndCheck(typ string, argfmt string, arg interface{}) {
 
 func (e *encodeGen) fuseHook() {
 	if len(e.fuse) > 0 {
-		e.appendraw(e.fuse)
+		e.appendRaw(e.fuse)
 		e.fuse = e.fuse[:0]
 	}
 }
@@ -72,14 +72,13 @@ func (e *encodeGen) gStruct(s *Struct) {
 		return
 	}
 	if s.AsTuple {
-		e.tuple(s)
+		e.structAsTuple(s)
 	} else {
-		e.structmap(s)
+		e.structAsMap(s)
 	}
-	return
 }
 
-func (e *encodeGen) tuple(s *Struct) {
+func (e *encodeGen) structAsTuple(s *Struct) {
 	nfields := len(s.Fields)
 	data := msgp.AppendArrayHeader(nil, uint32(nfields))
 	e.p.printf("\n// array header, size %d", nfields)
@@ -95,18 +94,18 @@ func (e *encodeGen) tuple(s *Struct) {
 	}
 }
 
-func (e *encodeGen) appendraw(bts []byte) {
+func (e *encodeGen) appendRaw(bts []byte) {
 	e.p.print("\nerr = en.Append(")
 	for i, b := range bts {
-		if i != 0 {
+		if i > 0 {
 			e.p.print(", ")
 		}
 		e.p.printf("0x%x", b)
 	}
 	e.p.print(")\nif err != nil { return }")
 }
 
-func (e *encodeGen) structmap(s *Struct) {
+func (e *encodeGen) structAsMap(s *Struct) {
 	nfields := len(s.Fields)
 	data := msgp.AppendMapHeader(nil, uint32(nfields))
 	e.p.printf("\n// map header, size %d", nfields)

gen/marshal.go

@@ -80,7 +80,6 @@ func (m *marshalGen) gStruct(s *Struct) {
 	} else {
 		m.mapstruct(s)
 	}
-	return
 }
 
 func (m *marshalGen) tuple(s *Struct) {

gen/size.go

@@ -44,8 +44,7 @@ func builtinSize(typ string) string {
 	return "msgp." + typ + "Size"
 }
 
-// this lets us chain together addition
-// operations where possible
+// this lets us chain together addition operations where possible
 func (s *sizeGen) addConstant(sz string) {
 	if !s.p.ok() {
 		return
@@ -187,8 +186,8 @@ func (s *sizeGen) gBase(b *BaseElem) {
 		vname := randIdent()
 		s.p.declare(vname, b.BaseType())
 
-		// Ensure we don't get "unused variable" warnings from outer slice iterations.
-		s.p.blankAssign(b.Varname())
+		// Ensure we don't get "unused variable" errors from outer slice iterations.
+		s.p.print("\n_ = " + b.Varname())
 
 		s.p.printf("\ns += %s", baseSizeExpr(b.Value, vname, b.BaseName()))
 		s.state = expr

gen/spec.go

@@ -284,13 +284,6 @@ func (p *printer) declare(name, typ string) {
 	p.printf("\nvar %s %s", name, typ)
 }
 
-// blankAssign writes a newline and an assignment of varName to the blank identifier.
-// This pattern is used (for now) to ensure that we don't get "unused variable" errors
-// from the compiler.
-func (p *printer) blankAssign(varName string) {
-	p.print("\n_ = " + varName)
-}
-
 // resizeMap does:
 //  if m == nil && size > 0 {
 //      m = make(type, size)

gen/unmarshal.go

@@ -62,7 +62,6 @@ func (u *unmarshalGen) gStruct(s *Struct) {
 	} else {
 		u.structAsMap(s)
 	}
-	return
 }
 
 func (u *unmarshalGen) tuple(s *Struct) {