clean up builtins

2024-03-18 17:08:36 -04:00
parent 5890a80daf
commit c59ce311b0
6 changed files with 191 additions and 211 deletions
--- a/compiler/compiler.go
+++ b/compiler/compiler.go
@@ -42,8 +42,8 @@ func New() *Compiler {

 	symbolTable := NewSymbolTable()

-	for i, v := range object.Builtins {
-		symbolTable.DefineBuiltin(i, v.Name)
+	for i, builtin := range object.BuiltinsIndex {
+		symbolTable.DefineBuiltin(i, builtin.Name)
 	}

 	return &Compiler{
--- a/compiler/compiler_test.go
+++ b/compiler/compiler_test.go
@@ -977,11 +977,11 @@ func TestBuiltins(t *testing.T) {
            `,
 			expectedConstants: []interface{}{1},
 			expectedInstructions: []code.Instructions{
-				code.Make(code.OpGetBuiltin, 0),
+				code.Make(code.OpGetBuiltin, 4),
 				code.Make(code.OpArray, 0),
 				code.Make(code.OpCall, 1),
 				code.Make(code.OpPop),
-				code.Make(code.OpGetBuiltin, 6),
+				code.Make(code.OpGetBuiltin, 7),
 				code.Make(code.OpArray, 0),
 				code.Make(code.OpConstant, 0),
 				code.Make(code.OpCall, 2),
@@ -992,7 +992,7 @@ func TestBuiltins(t *testing.T) {
 			input: `fn() { len([]) }`,
 			expectedConstants: []interface{}{
 				[]code.Instructions{
-					code.Make(code.OpGetBuiltin, 0),
+					code.Make(code.OpGetBuiltin, 4),
 					code.Make(code.OpArray, 0),
 					code.Make(code.OpCall, 1),
 					code.Make(code.OpReturn),