Improved code style

src/asm/MemoryLabel.go

@@ -6,8 +6,8 @@ import (
 
 // MemoryLabel operates with a memory address and a number.
 type MemoryLabel struct {
-	Address Memory
 	Label   string
+	Address Memory
 }
 
 // String returns a human readable version.

src/expression/Expression_test.go

@@ -1,7 +1,7 @@
 package expression_test
 
 import (
-	"fmt"
+	"errors"
 	"testing"
 
 	"git.akyoto.dev/cli/q/src/expression"
@@ -110,14 +110,11 @@ func TestParse(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
-
 		t.Run(test.Name, func(t *testing.T) {
 			src := []byte(test.Expression)
 			tokens := token.Tokenize(src)
 			expr := expression.Parse(tokens)
 			defer expr.Reset()
-
 			assert.NotNil(t, expr)
 			assert.Equal(t, expr.String(src), test.Result)
 		})
@@ -150,7 +147,7 @@ func TestEachLeaf(t *testing.T) {
 	assert.DeepEqual(t, leaves, []string{"1", "2", "3", "4", "5", "6", "7", "8"})
 
 	err = expr.EachLeaf(func(leaf *expression.Expression) error {
-		return fmt.Errorf("error")
+		return errors.New("error")
 	})
 
 	assert.NotNil(t, err)

src/expression/bench_test.go

@@ -11,7 +11,7 @@ func BenchmarkExpression(b *testing.B) {
 	src := []byte("(1+2-3*4)+(5*6-7+8)")
 	tokens := token.Tokenize(src)
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		expression.Parse(tokens)
 	}
 }

src/macho/MachO.go

@@ -117,8 +117,8 @@ func Write(writer io.Writer, code []byte, data []byte) {
 	binary.Write(writer, binary.LittleEndian, &m.DataHeader)
 	binary.Write(writer, binary.LittleEndian, &m.UnixThread)
 
-	writer.Write(bytes.Repeat([]byte{0x00}, int(codePadding)))
+	writer.Write(bytes.Repeat([]byte{0x00}, codePadding))
 	writer.Write(code)
-	writer.Write(bytes.Repeat([]byte{0x00}, int(dataPadding)))
+	writer.Write(bytes.Repeat([]byte{0x00}, dataPadding))
 	writer.Write(data)
 }

src/pe/Constants.go

@@ -31,7 +31,7 @@ const (
 	IMAGE_FILE_EXECUTABLE_IMAGE        = 0x0002
 	IMAGE_FILE_LINE_NUMS_STRIPPED      = 0x0004
 	IMAGE_FILE_LOCAL_SYMS_STRIPPED     = 0x0008
-	IMAGE_FILE_AGGRESIVE_WS_TRIM       = 0x0010
+	IMAGE_FILE_AGGRESSIVE_WS_TRIM      = 0x0010
 	IMAGE_FILE_LARGE_ADDRESS_AWARE     = 0x0020
 	IMAGE_FILE_BYTES_REVERSED_LO       = 0x0080
 	IMAGE_FILE_32BIT_MACHINE           = 0x0100

src/pe/EXE.go

@@ -189,11 +189,11 @@ func Write(writer io.Writer, code []byte, data []byte, dlls dll.List) {
 	binary.Write(writer, binary.LittleEndian, &pe.OptionalHeader64)
 	binary.Write(writer, binary.LittleEndian, &pe.Sections)
 
-	writer.Write(bytes.Repeat([]byte{0x00}, int(codePadding)))
+	writer.Write(bytes.Repeat([]byte{0x00}, codePadding))
 	writer.Write(code)
-	writer.Write(bytes.Repeat([]byte{0x00}, int(dataPadding)))
+	writer.Write(bytes.Repeat([]byte{0x00}, dataPadding))
 	writer.Write(data)
-	writer.Write(bytes.Repeat([]byte{0x00}, int(importsPadding)))
+	writer.Write(bytes.Repeat([]byte{0x00}, importsPadding))
 	binary.Write(writer, binary.LittleEndian, &imports)
 	binary.Write(writer, binary.LittleEndian, &dllData)
 	binary.Write(writer, binary.LittleEndian, &dllImports)

src/token/Count.go

@@ -5,7 +5,7 @@ func Count(tokens []Token, buffer []byte, kind Kind, name string) uint8 {
 	count := uint8(0)
 
 	for _, t := range tokens {
-		if t.Kind == Identifier && t.Text(buffer) == name {
+		if t.Kind == kind && t.Text(buffer) == name {
 			count++
 		}
 	}

src/token/List_test.go

@@ -1,7 +1,7 @@
 package token_test
 
 import (
-	"fmt"
+	"errors"
 	"testing"
 
 	"git.akyoto.dev/cli/q/src/token"
@@ -32,7 +32,7 @@ func TestSplit(t *testing.T) {
 	assert.DeepEqual(t, parameters, []string{"1+2", "3*4", "5*6", "7+8"})
 
 	err = tokens.Split(func(parameter token.List) error {
-		return fmt.Errorf("error")
+		return errors.New("error")
 	})
 
 	assert.NotNil(t, err)

src/token/bench_test.go

@@ -19,7 +19,7 @@ func bench(n int) func(b *testing.B) {
 	return func(b *testing.B) {
 		input := bytes.Repeat(line, n)
 
-		for i := 0; i < b.N; i++ {
+		for range b.N {
 			token.Tokenize(input)
 		}
 	}

src/x64/memoryAccessDynamic.go

@@ -18,9 +18,7 @@ func memoryAccessDynamic(code []byte, opCode8 byte, opCode32 byte, destination c
 	}
 
 	if offset == RSP {
-		tmp := offset
+		offset, destination = destination, offset
-		offset = destination
-		destination = tmp
 	}
 
 	if numBytes == 8 {

tests/examples_test.go

@@ -48,7 +48,7 @@ func BenchmarkExamples(b *testing.B) {
 		b.Run(test.Name, func(b *testing.B) {
 			compiler := build.New(filepath.Join("..", "examples", test.Name))
 
-			for i := 0; i < b.N; i++ {
+			for range b.N {
 				_, err := compiler.Run()
 				assert.Nil(b, err)
 			}

tests/programs_test.go

@@ -82,7 +82,7 @@ func BenchmarkPrograms(b *testing.B) {
 		b.Run(test.Name, func(b *testing.B) {
 			compiler := build.New(filepath.Join("programs", test.Name+".q"))
 
-			for i := 0; i < b.N; i++ {
+			for range b.N {
 				_, err := compiler.Run()
 				assert.Nil(b, err)
 			}