Merge pull request #122 from Shopify/golang-update

Golang update

.gitignore

@@ -1 +1,2 @@
 lua-tests/
+.DS_[sS]tore

bit32.go

@@ -63,7 +63,7 @@ func fieldArguments(l *State, fieldIndex int) (uint, uint) {
 var bitLibrary = []RegistryFunction{
 	{"arshift", func(l *State) int {
 		r, i := CheckUnsigned(l, 1), CheckInteger(l, 2)
-		if i < 0 || 0 == (r&(1<<(bitCount-1))) {
+		if i < 0 || (r&(1<<(bitCount-1)) == 0) {
 			return shift(l, r, -i)
 		}
 

dev.yml

@@ -1,7 +1,7 @@
 name: go-lua
 
 up:
-  - go: 1.7.3
+  - go: 1.17.5
   - custom:
       name: Initializing submodules
       met?: test -f lua-tests/.git
@@ -15,9 +15,9 @@ up:
           echo "brew install lua"
           exit 1
         fi
-      meet: 'true'
+      meet: "true"
 
 commands:
   test:
-    run: go test ./...
-    desc: 'run unit tests'
+    run: go test -v -tags=!skip ./...
+    desc: "run unit tests"

go.mod

@@ -0,0 +1,3 @@
+module github.com/Shopify/go-lua
+
+go 1.17

go_test.go

@@ -1,3 +1,6 @@
+// Skip these test since they have different results based on the CPU architecture.
+//go:build skip
+
 package lua
 
 // Test assumptions about how Go works
@@ -62,12 +65,6 @@ func TestPow(t *testing.T) {
 	}
 }
 
-func TestZero(t *testing.T) {
-	if 0.0 != -0.0 {
-		t.Error("0.0 == -0.0")
-	}
-}
-
 func TestParseFloat(t *testing.T) {
 	if f, err := strconv.ParseFloat("inf", 64); err != nil {
 		t.Error("ParseFloat('inf', 64) == ", f, err)

parser.go

@@ -164,7 +164,6 @@ func (p *parser) suffixedExpression() exprDesc {
 			return e
 		}
 	}
-	panic("unreachable")
 }
 
 func (p *parser) simpleExpression() (e exprDesc) {
@@ -682,7 +681,7 @@ func protectedParser(l *State, r io.Reader, name, chunkMode string) error {
 		} else if c == Signature[0] {
 			l.checkMode(chunkMode, "binary")
 			b.UnreadByte()
-			closure, err = l.undump(b, name) // TODO handle err
+			closure, _ = l.undump(b, name) // TODO handle err
 		} else {
 			l.checkMode(chunkMode, "text")
 			b.UnreadByte()

scanner.go

@@ -501,7 +501,6 @@ func (s *scanner) scan() token {
 			return token{t: c}
 		}
 	}
-	panic("unreachable")
 }
 
 func (s *scanner) next() {

stack.go

@@ -313,7 +313,6 @@ func (l *State) preCall(function int, resultCount int) bool {
 			l.stack[function] = tm
 		}
 	}
-	panic("unreachable")
 }
 
 func (l *State) callHook(ci *callInfo) {

string.go

@@ -3,6 +3,7 @@ package lua
 import (
 	"bytes"
 	"fmt"
+	"math"
 	"strings"
 	"unicode"
 )
@@ -91,18 +92,19 @@ func formatHelper(l *State, fs string, argCount int) string {
 				fallthrough
 			case 'd':
 				n := CheckNumber(l, arg)
+				ArgumentCheck(l, math.Floor(n) == n && -math.Pow(2, 63) <= n && n < math.Pow(2, 63), arg, "number has no integer representation")
 				ni := int(n)
-				diff := n - float64(ni)
-				ArgumentCheck(l, -1 < diff && diff < 1, arg, "not a number in proper range")
 				fmt.Fprintf(&b, f, ni)
 			case 'u': // The fmt package doesn't support %u.
 				f = f[:len(f)-1] + "d"
-				fallthrough
+				n := CheckNumber(l, arg)
+				ArgumentCheck(l, math.Floor(n) == n && 0.0 <= n && n < math.Pow(2, 64), arg, "not a non-negative number in proper range")
+				ni := uint(n)
+				fmt.Fprintf(&b, f, ni)
 			case 'o', 'x', 'X':
 				n := CheckNumber(l, arg)
+				ArgumentCheck(l, 0.0 <= n && n < math.Pow(2, 64), arg, "not a non-negative number in proper range")
 				ni := uint(n)
-				diff := n - float64(ni)
-				ArgumentCheck(l, -1 < diff && diff < 1, arg, "not a non-negative number in proper range")
 				fmt.Fprintf(&b, f, ni)
 			case 'e', 'E', 'f', 'g', 'G':
 				fmt.Fprintf(&b, f, CheckNumber(l, arg))

undump_test.go

@@ -16,7 +16,7 @@ func TestAllHeaderNoFun(t *testing.T) {
 
 func TestWrongEndian(t *testing.T) {
 	h := header
-	if 0 == h.Endianness {
+	if h.Endianness == 0 {
 		h.Endianness = 1
 	} else {
 		h.Endianness = 0

vm.go

@@ -259,7 +259,7 @@ type engine struct {
 }
 
 func (e *engine) k(field int) value {
-	if 0 != field&bitRK { // OPT: Inline isConstant(field).
+	if field&bitRK != 0 { // OPT: Inline isConstant(field).
 		return e.constants[field & ^bitRK] // OPT: Inline constantIndex(field).
 	}
 	return e.frame[field]

vm_test.go

@@ -8,8 +8,11 @@ import (
 	"testing"
 )
 
-func testString(t *testing.T, s string)  { testStringHelper(t, s, false) }
-func traceString(t *testing.T, s string) { testStringHelper(t, s, true) }
+func testString(t *testing.T, s string) { testStringHelper(t, s, false) }
+
+// Commented out to avoid a warning relating to the method not being used. Left here since it's useful for debugging.
+//func traceString(t *testing.T, s string) { testStringHelper(t, s, true) }
+
 func testNoPanicString(t *testing.T, s string) {
 	defer func() {
 		if rc := recover(); rc != nil {