UnflavoredMeson/monkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

utf8 support

Browse Source
This commit is contained in:
Chuck Smith
2024-01-22 20:49:06 -05:00
parent 94f7c01396
commit ed4d23de2d
2 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
evaluator/builtins.go
View File

@@ -3,6 +3,7 @@ package evaluator
import (
"fmt"
"monkey/object"
"unicode/utf8"
)
var builtins = map[string]*object.Builtin{
@@ -16,7 +17,7 @@ var builtins = map[string]*object.Builtin{
case *object.Array:
return &object.Integer{Value: int64(len(arg.Elements))}
case *object.String:
return &object.Integer{Value: int64(len(arg.Value))}
return &object.Integer{Value: int64(utf8.RuneCountInString(arg.Value))}
default:
return newError("argument to `len` not supported, got %s", args[0].Type())
@@ -30,7 +31,7 @@ var builtins = map[string]*object.Builtin{
return newError("wrong number of arguments. got=%d, want=1", len(args))
}
if args[0].Type() != object.ARRAY_OBJ {
return newError("argument to `first` must be Array, got %s", args[0].Type())
return newError("argument to `first` must be ARRAY, got %s", args[0].Type())
}
arr := args[0].(*object.Array)
@@ -48,7 +49,7 @@ var builtins = map[string]*object.Builtin{
return newError("wrong number of arguments. got=%d, want=1", len(args))
}
if args[0].Type() != object.ARRAY_OBJ {
return newError("argument to `last` must be Array, got %s", args[0].Type())
return newError("argument to `last` must be ARRAY, got %s", args[0].Type())
}
arr := args[0].(*object.Array)
@@ -64,36 +65,18 @@ var builtins = map[string]*object.Builtin{
"rest": &object.Builtin{
Fn: func(args ...object.Object) object.Object {
if len(args) != 1 {
return newError("wrong number of arguments. got=%d, want=1", len(args))
return newError("wrong number of arguments. got=%d, want=1",
len(args))
}
if args[0].Type() != object.ARRAY_OBJ {
return newError("argument to `rest` must be Array, got %s", args[0].Type())
}
arr := args[0].(*object.Array)
length := len(arr.Elements)
newElements := make([]object.Object, length+1)
copy(newElements, arr.Elements)
newElements[length] = args[1]
return &object.Array{Elements: newElements}
},
},
"push": &object.Builtin{
Fn: func(args ...object.Object) object.Object {
if len(args) != 1 {
return newError("wrong number of arguments. got=%d, want=1", len(args))
}
if args[0].Type() != object.ARRAY_OBJ {
return newError("argument to `push` must be Array, got %s", args[0].Type())
return newError("argument to `rest` must be ARRAY, got %s",
args[0].Type())
}
arr := args[0].(*object.Array)
length := len(arr.Elements)
if length > 0 {
newElements := make([]object.Object, length-1)
newElements := make([]object.Object, length-1, length-1)
copy(newElements, arr.Elements[1:length])
return &object.Array{Elements: newElements}
}
@@ -102,6 +85,28 @@ var builtins = map[string]*object.Builtin{
},
},
"push": &object.Builtin{
Fn: func(args ...object.Object) object.Object {
if len(args) != 2 {
return newError("wrong number of arguments. got=%d, want=2",
len(args))
}
if args[0].Type() != object.ARRAY_OBJ {
return newError("argument to `push` must be ARRAY, got %s",
args[0].Type())
}
arr := args[0].(*object.Array)
length := len(arr.Elements)
newElements := make([]object.Object, length+1, length+1)
copy(newElements, arr.Elements)
newElements[length] = args[1]
return &object.Array{Elements: newElements}
},
},
"puts": &object.Builtin{
Fn: func(args ...object.Object) object.Object {
for _, arg := range args {