Implement VM modules and globals

1 files changed, 7 insertions, 6 deletions

diff --git a/pkg/lang/vm/value/data.go b/pkg/lang/vm/value/data.go
index 18e1b3d..6c3d762 100644
--- a/pkg/lang/vm/value/data.go
+++ b/pkg/lang/vm/value/data.go
@@ -2,6 +2,7 @@ package value
 
 import (
 	"fmt"
+	"jinx/pkg/lang/vm/code"
 	"jinx/pkg/lang/vm/mem"
 	"strconv"
 	"strings"
@@ -127,7 +128,7 @@ func (n NullData) String(_ mem.Mem) (string, error) {
 }
 
 type FunctionData struct {
-	pc     int
+	pos    code.Pos
 	args   uint
 	env    mem.Ptr
 	native NativeFunc
@@ -135,8 +136,8 @@ type FunctionData struct {
 
 type NativeFunc func([]Value) (Value, error)
 
-func (f FunctionData) Pc() int {
-	return f.pc
+func (f FunctionData) Pos() code.Pos {
+	return f.pos
 }
 
 func (f FunctionData) Args() uint {
@@ -152,18 +153,18 @@ func (f FunctionData) Native() NativeFunc {
 }
 
 func (f FunctionData) WithEnv(env mem.Ptr) FunctionData {
-	return FunctionData{pc: f.pc, args: f.args, env: env, native: f.native}
+	return FunctionData{pos: f.pos, args: f.args, env: env, native: f.native}
 }
 
 func (f FunctionData) WithArgs(args uint) FunctionData {
-	return FunctionData{pc: f.pc, args: args, env: f.env, native: f.native}
+	return FunctionData{pos: f.pos, args: args, env: f.env, native: f.native}
 }
 
 func (f FunctionData) String(_ mem.Mem) (string, error) {
 	if f.native != nil {
 		return fmt.Sprintf("<fn(%d) native>", f.args), nil
 	} else {
-		return fmt.Sprintf("<fn(%d) %d>", f.args, f.pc), nil
+		return fmt.Sprintf("<fn(%d) %d:%d>", f.args, f.pos.Module, f.pos.PC), nil
 	}
 }