Cleanup

Author: antonmedv

checker/checker_test.go

@@ -680,7 +680,7 @@ func TestCheck_TypeWeights(t *testing.T) {
 		"Uint16":  uint16(3),
 		"Uint32":  uint32(4),
 		"Uint64":  uint64(5),
-		"Int":     int(6),
+		"Int":     6,
 		"Int8":    int8(7),
 		"Int16":   int16(8),
 		"Int32":   int32(9),

compiler/compiler.go

@@ -13,6 +13,10 @@ import (
 	"github.com/antonmedv/expr/vm/runtime"
 )
 
+const (
+	placeholder = 12345
+)
+
 func Compile(tree *parser.Tree, config *conf.Config) (program *Program, err error) {
 	defer func() {
 		if r := recover(); r != nil {
@@ -49,8 +53,6 @@ func Compile(tree *parser.Tree, config *conf.Config) (program *Program, err erro
 	return
 }
 
-const placeholder = MaxOpcode
-
 type compiler struct {
 	locations []file.Location
 	constants []interface{}
@@ -72,7 +74,7 @@ func (c *compiler) emitLocation(loc file.Location, op Opcode, arg int) int {
 }
 
 func (c *compiler) emit(op Opcode, args ...int) int {
-	var arg int = 0
+	arg := 0
 	if len(args) > 1 {
 		panic("too many arguments")
 	}
@@ -215,7 +217,7 @@ func (c *compiler) IntegerNode(node *ast.IntegerNode) {
 	case reflect.Float64:
 		c.emitPush(float64(node.Value))
 	case reflect.Int:
-		c.emitPush(int(node.Value))
+		c.emitPush(node.Value)
 	case reflect.Int8:
 		c.emitPush(int8(node.Value))
 	case reflect.Int16:

expr_test.go

@@ -546,11 +546,11 @@ func TestExpr(t *testing.T) {
 	}{
 		{
 			`1`,
-			int(1),
+			1,
 		},
 		{
 			`-.5`,
-			float64(-.5),
+			-.5,
 		},
 		{
 			`true && false || false`,
@@ -578,15 +578,15 @@ func TestExpr(t *testing.T) {
 		},
 		{
 			`Uint64 + 0`,
-			int(0),
+			0,
 		},
 		{
 			`Uint64 + Int64`,
-			int(0),
+			0,
 		},
 		{
 			`Int32 + Int64`,
-			int(0),
+			0,
 		},
 		{
 			`Float64 + 0`,
@@ -1442,7 +1442,7 @@ func (e *mockEnv) GetInt() int {
 }
 
 func (*mockEnv) Add(a, b int) int {
-	return int(a + b)
+	return a + b
 }
 
 func (*mockEnv) Duration(s string) time.Duration {

vm/opcodes.go

@@ -1,13 +1,10 @@
 package vm
 
-import "math"
-
-type Opcode uint32
-
-const MaxOpcode = math.MaxUint32
+type Opcode byte
 
 const (
 	OpPush Opcode = iota
+	OpPushInt
 	OpPop
 	OpRot
 	OpFetch

vm/program.go

@@ -29,17 +29,17 @@ func (program *Program) Disassemble() string {
 			out += fmt.Sprintf("%v\t%v\n", pp, label)
 		}
 		jump := func(label string) {
-			out += fmt.Sprintf("%v\t%v\t%v\t(%v)\n", pp, label, arg, ip+int(arg))
+			out += fmt.Sprintf("%v\t%v\t%v\t(%v)\n", pp, label, arg, ip+arg)
 		}
-		back := func(label string) {
-			out += fmt.Sprintf("%v\t%v\t%v\t(%v)\n", pp, label, arg, ip-int(arg))
+		jumpBack := func(label string) {
+			out += fmt.Sprintf("%v\t%v\t%v\t(%v)\n", pp, label, arg, ip-arg)
 		}
 		argument := func(label string) {
 			out += fmt.Sprintf("%v\t%v\t%v\n", pp, label, arg)
 		}
 		constant := func(label string) {
 			var c interface{}
-			if int(arg) < len(program.Constants) {
+			if arg < len(program.Constants) {
 				c = program.Constants[arg]
 			} else {
 				c = "out of range"
@@ -57,6 +57,9 @@ func (program *Program) Disassemble() string {
 		case OpPush:
 			constant("OpPush")
 
+		case OpPushInt:
+			argument("OpPushInt")
+
 		case OpPop:
 			code("OpPop")
 
@@ -115,7 +118,7 @@ func (program *Program) Disassemble() string {
 			jump("OpJumpIfNil")
 
 		case OpJumpBackward:
-			back("OpJumpBackward")
+			jumpBack("OpJumpBackward")
 
 		case OpIn:
 			code("OpIn")

vm/vm.go

@@ -144,27 +144,25 @@ func (vm *VM) Run(program *Program, env interface{}) (out interface{}, err error
 			vm.push(a.(string) == b.(string))
 
 		case OpJump:
-			offset := arg
-			vm.ip += int(offset)
+			vm.ip += arg
 
 		case OpJumpIfTrue:
-			offset := arg
 			if vm.current().(bool) {
-				vm.ip += int(offset)
+				vm.ip += arg
 			}
 
 		case OpJumpIfFalse:
 			if !vm.current().(bool) {
-				vm.ip += int(arg)
+				vm.ip += arg
 			}
 
 		case OpJumpIfNil:
 			if runtime.IsNil(vm.current()) {
-				vm.ip += int(arg)
+				vm.ip += arg
 			}
 
 		case OpJumpBackward:
-			vm.ip -= int(arg)
+			vm.ip -= arg
 
 		case OpIn:
 			b := vm.pop()

vm/vm_test.go

@@ -84,7 +84,7 @@ func TestRun_Helpers(t *testing.T) {
 		uint16(1),
 		uint32(1),
 		uint64(1),
-		int(1),
+		1,
 		int8(1),
 		int16(1),
 		int32(1),