From d2f69dccb3643834a79da79be4ece189a7178c9e Mon Sep 17 00:00:00 2001
From: Mel <einebeere@gmail.com>
Date: Sun, 29 May 2022 21:42:32 +0000
Subject: Types, Methods and basic Core Lib

---
 pkg/lang/vm/vm.go | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'pkg/lang/vm/vm.go')

diff --git a/pkg/lang/vm/vm.go b/pkg/lang/vm/vm.go
index 2ac689b..d4a1366 100644
--- a/pkg/lang/vm/vm.go
+++ b/pkg/lang/vm/vm.go
@@ -14,12 +14,18 @@ type VM struct {
 }
 
 func New(code *code.Code) *VM {
-	return &VM{
+	vm := &VM{
 		code:   code,
 		pc:     0,
 		stack:  stack.New(),
 		memory: mem.New(),
 	}
+
+	if err := vm.setup(); err != nil {
+		panic(err)
+	}
+
+	return vm
 }
 
 func (vm *VM) GetResult() (string, error) {
@@ -116,9 +122,10 @@ func (vm *VM) step(op code.Op) (stepDecision, error) {
 
 		err = vm.execGetLocal(int(offset))
 	case code.OpGetMember:
-		panic("not implemented")
-	case code.OpGetMethod:
-		panic("not implemented")
+		name, advance := vm.code.GetString(vm.pc)
+		vm.pc += advance
+
+		err = vm.execGetMember(name)
 
 	case code.OpGetEnv:
 		envIndex, advance := vm.code.GetUint(vm.pc)
-- 
cgit 1.4.1