Harden VM Mem

1 files changed, 5 insertions, 26 deletions

diff --git a/pkg/lang/vm/vm.go b/pkg/lang/vm/vm.go
index c933af4..9c17a3f 100644
--- a/pkg/lang/vm/vm.go
+++ b/pkg/lang/vm/vm.go
@@ -3,7 +3,6 @@ package vm
 import (
 	"jinx/pkg/lang/vm/code"
 	"jinx/pkg/lang/vm/mem"
-	"jinx/pkg/lang/vm/value"
 )
 
 type VM struct {
@@ -28,8 +27,11 @@ func (vm *VM) GetResult() (string, error) {
 		return "", err
 	}
 
-	str := res.Data().String(&vm.memory)
-	return str, nil
+	if str, err := res.Data().String(&vm.memory); err == nil {
+		return str, nil
+	} else {
+		return "", err
+	}
 }
 
 func (vm *VM) Run() error {
@@ -169,26 +171,3 @@ func (vm *VM) step(op code.Op) (stepDecision, error) {
 
 	return stepDecisionContinue, err
 }
-
-func (vm *VM) popAndDrop() (value.Value, error) {
-	v, err := vm.stack.Pop()
-	if err != nil {
-		return value.Value{}, err
-	}
-	v.Drop(&vm.memory)
-	return v, nil
-}
-
-func (vm *VM) popCallAndDrop() (int, error) {
-	envPtr := vm.stack.CurrentCallEnv()
-	vm.memory.Release(envPtr)
-
-	for !vm.stack.ReachedBaseOfCall() {
-		_, err := vm.popAndDrop()
-		if err != nil {
-			return 0, err
-		}
-	}
-
-	return vm.stack.PopCall()
-}