TestGovet and TestGofmt now passing.

Author: nishant-rudderstack

SUPPORT_MATRIX.md

@@ -17,6 +17,7 @@ _examples/hi | no | yes
 _examples/iface | no | yes
 _examples/lot | yes | yes
 _examples/maps | yes | yes
+_examples/multireturn | no | yes
 _examples/named | yes | yes
 _examples/osfile | yes | yes
 _examples/pkgconflict | yes | yes
@@ -29,4 +30,5 @@ _examples/sliceptr | yes | yes
 _examples/slices | yes | yes
 _examples/structs | yes | yes
 _examples/unicode | no | yes
+_examples/variadic | no | yes
 _examples/vars | yes | yes

_examples/cpkg/run.go

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main

_examples/multireturn/multireturn.go

@@ -103,8 +103,9 @@ func TripleWithInterfaceWithoutErrorFunc() (IntInterFace, IntStrUct, *IntStrUct)
 
 //// Function returning function /////
 type FunctionType func(input int) int
+
 func FunctionReturningFunction() FunctionType {
-    return func(input int) int{
-        return input
-    }
+	return func(input int) int {
+		return input
+	}
 }

_examples/variadic/variadic.go

@@ -1,7 +1,7 @@
 package variadic
 
 /////////////// Non Variadic //////////////
-func NonVariFunc(arg1 int, arg2 []int, arg3 int) int{
+func NonVariFunc(arg1 int, arg2 []int, arg3 int) int {
 	total := arg1
 	for _, num := range arg2 {
 		total += num
@@ -12,7 +12,7 @@ func NonVariFunc(arg1 int, arg2 []int, arg3 int) int{
 }
 
 /////////////// Variadic Over Int //////////////
-func VariFunc(vargs ...int) int{
+func VariFunc(vargs ...int) int {
 	total := 0
 	for _, num := range vargs {
 		total += num
@@ -26,15 +26,15 @@ type IntStrUct struct {
 }
 
 func NewIntStrUct(n int) IntStrUct {
-	return IntStrUct {
-		p:n,
+	return IntStrUct{
+		p: n,
 	}
-} 
+}
 
-func VariStructFunc(vargs ...IntStrUct) int{
+func VariStructFunc(vargs ...IntStrUct) int {
 	total := 0
 	for _, inst := range vargs {
-		total += inst.p 
+		total += inst.p
 	}
 	return total
 }
@@ -48,7 +48,7 @@ func (is *IntStrUct) Number() int {
 	return is.p
 }
 
-func VariInterFaceFunc(vargs ...IntInterFace) int{
+func VariInterFaceFunc(vargs ...IntInterFace) int {
 	total := 0
 	for _, inst := range vargs {
 		total += inst.Number()

bind/bind.go

@@ -38,7 +38,7 @@ type BindCfg struct {
 	// If set, python exceptions are not thrown.
 	NoPyExceptions bool
 
-	// Path to Go module, which is to be used to translate Go errors to Python exceptions. 
+	// Path to Go module, which is to be used to translate Go errors to Python exceptions.
 	ModPathGoErr2PyEx string
 
 	// If set, when a Go function returns a (value, err), python returns (value, ) tuple.

bind/gen.go

@@ -453,7 +453,7 @@ var NoWarn = false
 // NoMake turns off generation of Makefiles
 var NoMake = false
 
-// NoPyExceptions turns off generation of Python Exceptions 
+// NoPyExceptions turns off generation of Python Exceptions
 var NoPyExceptions = false
 
 // GenPyBind generates a .go file, build.py file to enable pybindgen to create python bindings,

bind/gen_func.go

@@ -6,9 +6,9 @@ package bind
 
 import (
 	"fmt"
+	"go/types"
 	"log"
 	"strconv"
-	"go/types"
 	"strings"
 )
 
@@ -111,7 +111,7 @@ func (g *pyGen) genFuncSig(sym *symbol, fsym *Func) bool {
 			}
 		}
 
-		if i!=nargs-1 || !fsym.isVariadic {
+		if i != nargs-1 || !fsym.isVariadic {
 			wpArgs = append(wpArgs, anm)
 		}
 	}
@@ -245,13 +245,13 @@ func isIfaceHandle(gdoc string) (bool, string) {
 }
 
 func isPointer(pyfmt string) bool {
-	if (pyfmt == "s") {
+	if pyfmt == "s" {
 		return true
 	}
 	return false
 }
 
-func (g *pyGen)generateReturn(buildPyTuple bool, npyres int, results []*Var, retvals *[]string) {
+func (g *pyGen) generateReturn(buildPyTuple bool, npyres int, results []*Var, retvals *[]string) {
 	g.gofile.Printf("\n")
 	valueCalls := make([]string, npyres, npyres)
 	for i := 0; i < npyres; i++ {
@@ -263,7 +263,7 @@ func (g *pyGen)generateReturn(buildPyTuple bool, npyres int, results []*Var, ret
 				result.Name(),
 			))
 		}
-		formatStr := sret.pyfmt 
+		formatStr := sret.pyfmt
 		if sret.pyfmt == "" {
 			formatStr = "?"
 		}
@@ -278,10 +278,10 @@ func (g *pyGen)generateReturn(buildPyTuple bool, npyres int, results []*Var, ret
 		}
 
 		if result.sym.go2py != "" {
-			retval = result.sym.go2py + "(" + retval + ")" +  result.sym.go2pyParenEx
+			retval = result.sym.go2py + "(" + retval + ")" + result.sym.go2pyParenEx
 		}
 
-		if (buildPyTuple) {
+		if buildPyTuple {
 			buildValueFunc := "C.Py_BuildValue1"
 			typeCast := "unsafe.Pointer"
 			if !isPointer(formatStr) {
@@ -301,7 +301,7 @@ func (g *pyGen)generateReturn(buildPyTuple bool, npyres int, results []*Var, ret
 
 	if npyres == 0 {
 		g.gofile.Printf("return\n")
-	} else if (buildPyTuple) {
+	} else if buildPyTuple {
 		g.gofile.Printf("retTuple := C.PyTuple_New(%d);\n", npyres)
 		for i := 0; i < npyres; i++ {
 			g.gofile.Printf("C.PyTuple_SetItem(retTuple, %d, %s);\n", i, valueCalls[i])
@@ -389,7 +389,7 @@ if __err != nil {
 		default:
 			na = anm
 		}
-		if i == len(args) - 1 && fsym.isVariadic {
+		if i == len(args)-1 && fsym.isVariadic {
 			na = na + "..."
 		}
 		callArgs = append(callArgs, na)
@@ -471,20 +471,20 @@ if __err != nil {
 	if isMethod {
 		if sym.isStruct() {
 			goFuncCall = fmt.Sprintf("gopyh.Embed(vifc, reflect.TypeOf(%s{})).(%s).%s(%s)",
-					nonPtrName(symNm),
-					symNm,
-					fsym.GoName(),
-					strings.Join(callArgs, ", "))
+				nonPtrName(symNm),
+				symNm,
+				fsym.GoName(),
+				strings.Join(callArgs, ", "))
 		} else {
 			goFuncCall = fmt.Sprintf("vifc.(%s).%s(%s)",
-					symNm,
-					fsym.GoName(),
-					strings.Join(callArgs, ", "))
+				symNm,
+				fsym.GoName(),
+				strings.Join(callArgs, ", "))
 		}
 	} else {
 		goFuncCall = fmt.Sprintf("%s(%s)",
-					fsym.GoFmt(),
-					strings.Join(callArgs, ", "))
+			fsym.GoFmt(),
+			strings.Join(callArgs, ", "))
 	}
 
 	if nres > 0 {
@@ -501,7 +501,7 @@ if __err != nil {
 
 		// ReMap handle returns from pyFuncCall.
 		for i := 0; i < npyres; i++ {
-			if res[i].sym.hasHandle() && !res[i].sym.isPtrOrIface(){
+			if res[i].sym.hasHandle() && !res[i].sym.isPtrOrIface() {
 				retvals[i] = "&" + retvals[i]
 			}
 		}
@@ -532,7 +532,7 @@ if __err != nil {
 			}
 		}
 
-		g.generateReturn(buildPyTuple(fsym), npyres, res, &retvals);
+		g.generateReturn(buildPyTuple(fsym), npyres, res, &retvals)
 	} else {
 		g.gofile.Printf("if boolPyToGo(goRun) {\n")
 		g.gofile.Indent()

bind/package.go

@@ -245,11 +245,11 @@ func (p *Package) getDoc(parent string, o types.Object) string {
 		res := sig.Results()
 		results := parseFn(res)
 
-		if (len(results) > 0) {
-			lastResult := res.At(len(results)-1)
+		if len(results) > 0 {
+			lastResult := res.At(len(results) - 1)
 			if isErrorType(lastResult.Type()) {
 				if !NoPyExceptions {
-				        results = results[0:len(results)-1]
+					results = results[0 : len(results)-1]
 				}
 			}
 		}

bind/symbols.go

@@ -147,7 +147,7 @@ func isPyCompatField(f *types.Var) (*symbol, error) {
 func getPyReturnType(sig *types.Signature) (ret []types.Type, err error) {
 	results := sig.Results()
 
-	if (results.Len() == 0) {
+	if results.Len() == 0 {
 		return make([]types.Type, 0, 0), nil
 	} else {
 		outCount := results.Len()