Fix warnings/errors from staticcheck (#3)

* Fix errors from staticcheck

* Run goimports

Author: wtfleming

jlib/boolean.go

@@ -29,7 +29,7 @@ func Boolean(v reflect.Value) bool {
 
 	if jtypes.IsArray(v) {
 		for i := 0; i < v.Len(); i++ {
-			if Boolean(v.Index(i)) == true {
+			if Boolean(v.Index(i)) {
 				return true
 			}
 		}

jlib/jlib.go

@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"math/rand"
 	"reflect"
-	"regexp"
 	"time"
 
 	"github.com/blues/jsonata-go/jtypes"
@@ -20,7 +19,6 @@ func init() {
 	rand.Seed(time.Now().UnixNano())
 }
 
-var typeRegex = reflect.TypeOf((*regexp.Regexp)(nil))
 var typeBool = reflect.TypeOf((*bool)(nil)).Elem()
 var typeCallable = reflect.TypeOf((*jtypes.Callable)(nil)).Elem()
 var typeString = reflect.TypeOf((*string)(nil)).Elem()

jlib/jxpath/formatnumber.go

@@ -358,7 +358,7 @@ func validateSubpictureParts(parts subpictureParts, format *DecimalFormat) error
 	pos := strings.IndexFunc(parts.Integer, isDecimalDigit)
 	if pos != -1 {
 		pos += utf8.RuneLen(format.ZeroDigit)
-		if strings.IndexRune(parts.Integer[pos:], format.OptionalDigit) != -1 {
+		if strings.ContainsRune(parts.Integer[pos:], format.OptionalDigit) {
 			return fmt.Errorf("an integer part cannot contain a decimal digit followed by an optional digit")
 		}
 	}
@@ -670,7 +670,7 @@ func splitStringAtRune(s string, r rune) (string, string) {
 		return s, ""
 	}
 
-	if s2 := s[pos+utf8.RuneLen(r):]; strings.IndexRune(s2, r) == -1 {
+	if s2 := s[pos+utf8.RuneLen(r):]; !strings.ContainsRune(s2, r) {
 		return s[:pos], s2
 	}
 

jparse/jparse.go

@@ -146,21 +146,21 @@ const (
 )
 
 func lookupNud(tt tokenType) nud {
-	if tt < 0 || tt >= nudCount {
+	if tt >= nudCount {
 		return nil
 	}
 	return nuds[tt]
 }
 
 func lookupLed(tt tokenType) led {
-	if tt < 0 || tt >= ledCount {
+	if tt >= ledCount {
 		return nil
 	}
 	return leds[tt]
 }
 
 func lookupBp(tt tokenType) int {
-	if tt < 0 || tt >= ledCount {
+	if tt >= ledCount {
 		return 0
 	}
 	return bps[tt]

jparse/node.go

@@ -235,7 +235,7 @@ func (n *PathNode) optimize() (Node, error) {
 }
 
 func (n PathNode) String() string {
-	s := fmt.Sprintf("%s", joinNodes(n.Steps, "."))
+	s := joinNodes(n.Steps, ".")
 	if n.KeepArrays {
 		s += "[]"
 	}

jsonata-server/bench.go

@@ -8,8 +8,9 @@ import (
 	"log"
 	"net/http"
 
-	jsonata "github.com/blues/jsonata-go"
 	"encoding/json"
+
+	jsonata "github.com/blues/jsonata-go"
 )
 
 var (

jsonata-test/main.go

@@ -139,7 +139,7 @@ func runTest(tc testCase, dataDir string, path string) (bool, error) {
 
 	var failed bool
 	expr, unQuoted := replaceQuotesInPaths(tc.Expr)
-	got, err := eval(expr, tc.Bindings, data)
+	got, _ := eval(expr, tc.Bindings, data)
 
 	if !equalResults(got, tc.Result) {
 		failed = true
@@ -161,16 +161,18 @@ func runTest(tc testCase, dataDir string, path string) (bool, error) {
 		fmt.Fprintf(os.Stderr, "Actual Result:   %v [%T]\n", got, got)
 	}
 
-	var exp error
-	if tc.Undefined {
-		exp = jsonata.ErrUndefined
-	} else {
-		exp = convertError(tc.Error)
-	}
-
-	if !reflect.DeepEqual(err, exp) {
-		// TODO: Compare actual/expected errors
-	}
+	// TODO this block is commented out to make staticcheck happy,
+	// but we should check that the error is the same as the js one
+	// var exp error
+	// if tc.Undefined {
+	// 	exp = jsonata.ErrUndefined
+	// } else {
+	// 	exp = convertError(tc.Error)
+	// }
+
+	// if !reflect.DeepEqual(err, exp) {
+	// TODO: Compare actual/expected errors
+	// }
 
 	return failed, nil
 }