Rearrange opcodes

expr-lang · Feb 12, 2024 · 9c3bce6 · 9c3bce6
1 parent ffaec9e
commit 9c3bce6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/vm/opcodes.go b/vm/opcodes.go
@@ -70,15 +70,15 @@ const (
 	OpDecrementIndex
 	OpIncrementCount
 	OpGetIndex
-	OpSetIndex
 	OpGetCount
 	OpGetLen
 	OpGetGroupBy
 	OpGetAcc
+	OpSetAcc
+	OpSetIndex
 	OpPointer
 	OpThrow
 	OpGroupBy
-	OpSetAcc
 	OpBegin
 	OpEnd // This opcode must be at the end of this list.
 )
diff --git a/vm/program.go b/vm/program.go
@@ -327,9 +327,6 @@ func (program *Program) DisassembleWriter(w io.Writer) {
 		case OpGetIndex:
 			code("OpGetIndex")
 
-		case OpSetIndex:
-			code("OpSetIndex")
-
 		case OpGetCount:
 			code("OpGetCount")
 
@@ -354,6 +351,9 @@ func (program *Program) DisassembleWriter(w io.Writer) {
 		case OpSetAcc:
 			code("OpSetAcc")
 
+		case OpSetIndex:
+			code("OpSetIndex")
+
 		case OpBegin:
 			code("OpBegin")
 

diff --git a/vm/vm.go b/vm/vm.go
@@ -460,10 +460,6 @@ func (vm *VM) Run(program *Program, env any) (_ any, err error) {
 		case OpGetIndex:
 			vm.push(vm.scope().Index)
 
-		case OpSetIndex:
-			scope := vm.scope()
-			scope.Index = vm.pop().(int)
-
 		case OpGetCount:
 			scope := vm.scope()
 			vm.push(scope.Count)
@@ -481,6 +477,10 @@ func (vm *VM) Run(program *Program, env any) (_ any, err error) {
 		case OpSetAcc:
 			vm.scope().Acc = vm.pop()
 
+		case OpSetIndex:
+			scope := vm.scope()
+			scope.Index = vm.pop().(int)
+
 		case OpPointer:
 			scope := vm.scope()
 			vm.push(scope.Array.Index(scope.Index).Interface())