Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Faster binary operations #388

Open
wants to merge 3 commits into
base: v3
Choose a base branch
from
Open

Faster binary operations #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e302d64
faster BinaryOp
geseq Jul 20, 2022
9515d2f
fix comment
geseq Jul 20, 2022
fe792a9
value semantics for bools
geseq Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 25 additions & 28 deletions builtins.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ func builtinIsInt(args ...Object) (Object, error) {
if len(args) != 1 {
return nil, ErrWrongNumArguments
}
if _, ok := args[0].(*Int); ok {
if _, ok := args[0].(Int); ok {
return TrueValue, nil
}
return FalseValue, nil
Expand All @@ -163,7 +163,7 @@ func builtinIsFloat(args ...Object) (Object, error) {
if len(args) != 1 {
return nil, ErrWrongNumArguments
}
if _, ok := args[0].(*Float); ok {
if _, ok := args[0].(Float); ok {
return TrueValue, nil
}
return FalseValue, nil
Expand All @@ -173,7 +173,7 @@ func builtinIsBool(args ...Object) (Object, error) {
if len(args) != 1 {
return nil, ErrWrongNumArguments
}
if _, ok := args[0].(*Bool); ok {
if _, ok := args[0].(Bool); ok {
return TrueValue, nil
}
return FalseValue, nil
Expand All @@ -183,7 +183,7 @@ func builtinIsChar(args ...Object) (Object, error) {
if len(args) != 1 {
return nil, ErrWrongNumArguments
}
if _, ok := args[0].(*Char); ok {
if _, ok := args[0].(Char); ok {
return TrueValue, nil
}
return FalseValue, nil
Expand Down Expand Up @@ -307,17 +307,17 @@ func builtinLen(args ...Object) (Object, error) {
}
switch arg := args[0].(type) {
case *Array:
return &Int{Value: int64(len(arg.Value))}, nil
return Int{Value: int64(len(arg.Value))}, nil
case *ImmutableArray:
return &Int{Value: int64(len(arg.Value))}, nil
return Int{Value: int64(len(arg.Value))}, nil
case *String:
return &Int{Value: int64(len(arg.Value))}, nil
return Int{Value: int64(len(arg.Value))}, nil
case *Bytes:
return &Int{Value: int64(len(arg.Value))}, nil
return Int{Value: int64(len(arg.Value))}, nil
case *Map:
return &Int{Value: int64(len(arg.Value))}, nil
return Int{Value: int64(len(arg.Value))}, nil
case *ImmutableMap:
return &Int{Value: int64(len(arg.Value))}, nil
return Int{Value: int64(len(arg.Value))}, nil
default:
return nil, ErrInvalidArgumentType{
Name: "first",
Expand All @@ -333,10 +333,11 @@ func builtinRange(args ...Object) (Object, error) {
if numArgs < 2 || numArgs > 3 {
return nil, ErrWrongNumArguments
}
var start, stop, step *Int
var start, stop Int
step := Int{Value: 1}

for i, arg := range args {
v, ok := args[i].(*Int)
v, ok := args[i].(Int)
if !ok {
var name string
switch i {
Expand Down Expand Up @@ -367,24 +368,20 @@ func builtinRange(args ...Object) (Object, error) {
}
}

if step == nil {
step = &Int{Value: int64(1)}
}

return buildRange(start.Value, stop.Value, step.Value), nil
}

func buildRange(start, stop, step int64) *Array {
array := &Array{}
if start <= stop {
for i := start; i < stop; i += step {
array.Value = append(array.Value, &Int{
array.Value = append(array.Value, Int{
Value: i,
})
}
} else {
for i := start; i > stop; i -= step {
array.Value = append(array.Value, &Int{
array.Value = append(array.Value, Int{
Value: i,
})
}
Expand Down Expand Up @@ -449,12 +446,12 @@ func builtinInt(args ...Object) (Object, error) {
if !(argsLen == 1 || argsLen == 2) {
return nil, ErrWrongNumArguments
}
if _, ok := args[0].(*Int); ok {
if _, ok := args[0].(Int); ok {
return args[0], nil
}
v, ok := ToInt64(args[0])
if ok {
return &Int{Value: v}, nil
return Int{Value: v}, nil
}
if argsLen == 2 {
return args[1], nil
Expand All @@ -467,12 +464,12 @@ func builtinFloat(args ...Object) (Object, error) {
if !(argsLen == 1 || argsLen == 2) {
return nil, ErrWrongNumArguments
}
if _, ok := args[0].(*Float); ok {
if _, ok := args[0].(Float); ok {
return args[0], nil
}
v, ok := ToFloat64(args[0])
if ok {
return &Float{Value: v}, nil
return Float{Value: v}, nil
}
if argsLen == 2 {
return args[1], nil
Expand All @@ -484,7 +481,7 @@ func builtinBool(args ...Object) (Object, error) {
if len(args) != 1 {
return nil, ErrWrongNumArguments
}
if _, ok := args[0].(*Bool); ok {
if _, ok := args[0].(Bool); ok {
return args[0], nil
}
v, ok := ToBool(args[0])
Expand All @@ -502,12 +499,12 @@ func builtinChar(args ...Object) (Object, error) {
if !(argsLen == 1 || argsLen == 2) {
return nil, ErrWrongNumArguments
}
if _, ok := args[0].(*Char); ok {
if _, ok := args[0].(Char); ok {
return args[0], nil
}
v, ok := ToRune(args[0])
if ok {
return &Char{Value: v}, nil
return Char{Value: v}, nil
}
if argsLen == 2 {
return args[1], nil
Expand All @@ -522,7 +519,7 @@ func builtinBytes(args ...Object) (Object, error) {
}

// bytes(N) => create a new bytes with given size N
if n, ok := args[0].(*Int); ok {
if n, ok := args[0].(Int); ok {
if n.Value > int64(MaxBytesLen) {
return nil, ErrBytesLimit
}
Expand Down Expand Up @@ -627,7 +624,7 @@ func builtinSplice(args ...Object) (Object, error) {

var startIdx int
if argsLen > 1 {
arg1, ok := args[1].(*Int)
arg1, ok := args[1].(Int)
if !ok {
return nil, ErrInvalidArgumentType{
Name: "second",
Expand All @@ -643,7 +640,7 @@ func builtinSplice(args ...Object) (Object, error) {

delCount := len(array.Value)
if argsLen > 2 {
arg2, ok := args[2].(*Int)
arg2, ok := args[2].(Int)
if !ok {
return nil, ErrInvalidArgumentType{
Name: "third",
Expand Down
Loading