further improvements

internal/builtins/bind.go

@@ -50,5 +50,5 @@ func Bind(args ...object.Object) object.Object {
 		return newError("SocketError: %s", err)
 	}
 
-	return object.Null{}
+	return object.NULL
 }

internal/builtins/builtins.go

@@ -7,7 +7,7 @@ import (
 )
 
 // Builtins ...
-var Builtins = map[string]*object.Builtin{
+var Builtins = map[string]object.Builtin{
 	"len":       {Name: "len", Fn: Len},
 	"input":     {Name: "input", Fn: Input},
 	"print":     {Name: "print", Fn: Print},
@@ -58,7 +58,7 @@ var Builtins = map[string]*object.Builtin{
 }
 
 // BuiltinsIndex ...
-var BuiltinsIndex []*object.Builtin
+var BuiltinsIndex []object.Builtin
 
 func init() {
 	var keys []string

internal/builtins/close.go

@@ -23,5 +23,5 @@ func Close(args ...object.Object) object.Object {
 		return newError("IOError: %s", err)
 	}
 
-	return object.Null{}
+	return object.NULL
 }

internal/builtins/ffi.go

@@ -33,5 +33,5 @@ func FFI(args ...object.Object) object.Object {
 		return newError("error finding symbol: %s", err)
 	}
 
-	return &object.Builtin{Name: symbol, Fn: v.(object.BuiltinFunction)}
+	return object.Builtin{Name: symbol, Fn: v.(object.BuiltinFunction)}
 }

internal/builtins/id.go

@@ -30,11 +30,11 @@ func IdOf(args ...object.Object) object.Object {
 	} else if h, ok := arg.(*object.Hash); ok {
 		return object.String{Value: fmt.Sprintf("%p", h)}
 	} else if f, ok := arg.(*object.Function); ok {
-		return object.String{Value: fmt.Sprintf("%p", f)}
+		return object.String{Value: fmt.Sprintf("%p", &f)}
 	} else if c, ok := arg.(*object.Closure); ok {
-		return object.String{Value: fmt.Sprintf("%p", c)}
-	} else if b, ok := arg.(*object.Builtin); ok {
-		return object.String{Value: fmt.Sprintf("%p", b)}
+		return object.String{Value: fmt.Sprintf("%p", &c)}
+	} else if b, ok := arg.(object.Builtin); ok {
+		return object.String{Value: fmt.Sprintf("%p", &b)}
 	}
 	return nil
 }

internal/builtins/listen.go

@@ -23,5 +23,5 @@ func Listen(args ...object.Object) object.Object {
 		return newError("SocketError: %s", err)
 	}
 
-	return object.Null{}
+	return object.NULL
 }

internal/builtins/writefile.go

@@ -24,5 +24,5 @@ func WriteFile(args ...object.Object) object.Object {
 		return newError("IOError: error writing file %s: %s", filename, err)
 	}
 
-	return object.Null{}
+	return object.NULL
 }