Fix compile tests

Author: antonmedv

compiler/compiler_test.go

@@ -44,30 +44,33 @@ func TestCompile(t *testing.T) {
 			`65535`,
 			vm.Program{
 				Constants: []interface{}{
-					int(math.MaxUint16),
+					math.MaxUint16,
 				},
 				Bytecode: []vm.Opcode{
-					vm.OpPush, 0,
+					vm.OpPush,
 				},
+				Arguments: []int{0},
 			},
 		},
 		{
 			`.5`,
 			vm.Program{
 				Constants: []interface{}{
-					float64(.5),
+					.5,
 				},
 				Bytecode: []vm.Opcode{
-					vm.OpPush, 0,
+					vm.OpPush,
 				},
+				Arguments: []int{0},
 			},
 		},
 		{
 			`true`,
 			vm.Program{
 				Bytecode: []vm.Opcode{
-					vm.OpTrue, 0,
+					vm.OpTrue,
 				},
+				Arguments: []int{0},
 			},
 		},
 		{
@@ -77,8 +80,9 @@ func TestCompile(t *testing.T) {
 					"string",
 				},
 				Bytecode: []vm.Opcode{
-					vm.OpPush, 0,
+					vm.OpPush,
 				},
+				Arguments: []int{0},
 			},
 		},
 		{
@@ -88,10 +92,11 @@ func TestCompile(t *testing.T) {
 					"string",
 				},
 				Bytecode: []vm.Opcode{
-					vm.OpPush, 0,
-					vm.OpPush, 0,
-					vm.OpEqualString, 0,
+					vm.OpPush,
+					vm.OpPush,
+					vm.OpEqualString,
 				},
+				Arguments: []int{0, 0, 0},
 			},
 		},
 		{
@@ -101,33 +106,51 @@ func TestCompile(t *testing.T) {
 					int64(1000000),
 				},
 				Bytecode: []vm.Opcode{
-					vm.OpPush, 0,
-					vm.OpPush, 0,
-					vm.OpEqualInt, 0,
+					vm.OpPush,
+					vm.OpPush,
+					vm.OpEqualInt,
 				},
+				Arguments: []int{0, 0, 0},
 			},
 		},
 		{
 			`-1`,
 			vm.Program{
 				Constants: []interface{}{-1},
 				Bytecode: []vm.Opcode{
-					vm.OpPush, 0,
+					vm.OpPush,
 				},
+				Arguments: []int{0},
 			},
 		},
 		{
 			`true && true || true`,
 			vm.Program{
 				Bytecode: []vm.Opcode{
-					vm.OpTrue, 0,
-					vm.OpJumpIfFalse, 4,
-					vm.OpPop, 0,
-					vm.OpTrue, 0,
-					vm.OpJumpIfTrue, 4,
-					vm.OpPop, 0,
-					vm.OpTrue, 0,
+					vm.OpTrue,
+					vm.OpJumpIfFalse,
+					vm.OpPop,
+					vm.OpTrue,
+					vm.OpJumpIfTrue,
+					vm.OpPop,
+					vm.OpTrue,
 				},
+				Arguments: []int{0, 2, 0, 0, 2, 0, 0},
+			},
+		},
+		{
+			`true && (true || true)`,
+			vm.Program{
+				Bytecode: []vm.Opcode{
+					vm.OpTrue,
+					vm.OpJumpIfFalse,
+					vm.OpPop,
+					vm.OpTrue,
+					vm.OpJumpIfTrue,
+					vm.OpPop,
+					vm.OpTrue,
+				},
+				Arguments: []int{0, 5, 0, 0, 2, 0, 0},
 			},
 		},
 		{
@@ -140,8 +163,9 @@ func TestCompile(t *testing.T) {
 					},
 				},
 				Bytecode: []vm.Opcode{
-					vm.OpFetchEnvField, 0,
+					vm.OpFetchEnvField,
 				},
+				Arguments: []int{0},
 			},
 		},
 		{
@@ -158,10 +182,11 @@ func TestCompile(t *testing.T) {
 					},
 				},
 				Bytecode: []vm.Opcode{
-					vm.OpFetchEnvField, 0,
-					vm.OpJumpIfNil, 2,
-					vm.OpFetchField, 1,
+					vm.OpFetchEnvField,
+					vm.OpJumpIfNil,
+					vm.OpFetchField,
 				},
+				Arguments: []int{0, 1, 1},
 			},
 		},
 		{
@@ -178,10 +203,11 @@ func TestCompile(t *testing.T) {
 					},
 				},
 				Bytecode: []vm.Opcode{
-					vm.OpFetchEnvField, 0,
-					vm.OpJumpIfNil, 2,
-					vm.OpFetchField, 1,
+					vm.OpFetchEnvField,
+					vm.OpJumpIfNil,
+					vm.OpFetchField,
 				},
+				Arguments: []int{0, 1, 1},
 			},
 		},
 		{
@@ -199,11 +225,12 @@ func TestCompile(t *testing.T) {
 					},
 				},
 				Bytecode: []vm.Opcode{
-					vm.OpFetchEnvField, 0,
-					vm.OpPush, 1,
-					vm.OpFetch, 0,
-					vm.OpFetchField, 2,
+					vm.OpFetchEnvField,
+					vm.OpPush,
+					vm.OpFetch,
+					vm.OpFetchField,
 				},
+				Arguments: []int{0, 1, 0, 2},
 			},
 		},
 	}
@@ -223,9 +250,10 @@ func TestCompile_cast(t *testing.T) {
 			1,
 		},
 		Bytecode: []vm.Opcode{
-			vm.OpPush, 0,
-			vm.OpCast, 1,
+			vm.OpPush,
+			vm.OpCast,
 		},
+		Arguments: []int{0, 1},
 	}
 
 	tree, err := parser.Parse(input)

vm/program_test.go

@@ -11,7 +11,8 @@ func TestProgram_Disassemble(t *testing.T) {
 	for op := vm.OpPush; op < vm.OpEnd; op++ {
 		program := vm.Program{
 			Constants: []interface{}{true},
-			Bytecode:  []vm.Opcode{op, 0},
+			Bytecode:  []vm.Opcode{op},
+			Arguments: []int{0},
 		}
 		d := program.Disassemble()
 		if strings.Contains(d, "\t0x") {