Fix VM memory allocation optimizations by reducing what we allocate on the heap
Some checks failed
Build / build (push) Successful in 10m25s
Publish Image / publish (push) Failing after 39s
Test / build (push) Successful in 11m19s

This commit is contained in:
Charles Smith
2024-03-31 20:44:50 -04:00
parent a85dc73954
commit aebbe43999
61 changed files with 383 additions and 370 deletions

View File

@@ -15,10 +15,10 @@ func Abs(args ...object.Object) object.Object {
return newError(err.Error())
}
i := args[0].(*object.Integer)
i := args[0].(object.Integer)
value := i.Value
if value < 0 {
value = value * -1
}
return &object.Integer{Value: value}
return object.Integer{Value: value}
}

View File

@@ -21,12 +21,12 @@ func Accept(args ...object.Object) object.Object {
err error
)
fd := int(args[0].(*object.Integer).Value)
fd := int(args[0].(object.Integer).Value)
nfd, _, err = syscall.Accept(fd)
if err != nil {
return newError("SocketError: %s", err)
}
return &object.Integer{Value: int64(nfd)}
return object.Integer{Value: int64(nfd)}
}

View File

@@ -16,7 +16,7 @@ func args(args ...object.Object) object.Object {
elements := make([]object.Object, len(object.Args))
for i, arg := range object.Args {
elements[i] = &object.String{Value: arg}
elements[i] = object.String{Value: arg}
}
return &object.Array{Elements: elements}
}

View File

@@ -17,8 +17,8 @@ func Assert(args ...object.Object) object.Object {
return newError(err.Error())
}
if !args[0].(*object.Boolean).Value {
fmt.Printf("Assertion Error: %s", args[1].(*object.String).Value)
if !args[0].(object.Boolean).Value {
fmt.Printf("Assertion Error: %s", args[1].(object.String).Value)
os.Exit(1)
}

View File

@@ -17,6 +17,6 @@ func Bin(args ...object.Object) object.Object {
return newError(err.Error())
}
i := args[0].(*object.Integer)
return &object.String{Value: fmt.Sprintf("0b%s", strconv.FormatInt(i.Value, 2))}
i := args[0].(object.Integer)
return object.String{Value: fmt.Sprintf("0b%s", strconv.FormatInt(i.Value, 2))}
}

View File

@@ -21,8 +21,8 @@ func Bind(args ...object.Object) object.Object {
sockaddr syscall.Sockaddr
)
fd := int(args[0].(*object.Integer).Value)
address := args[1].(*object.String).Value
fd := int(args[0].(object.Integer).Value)
address := args[1].(object.String).Value
sockaddr, err = syscall.Getsockname(fd)
if err != nil {
@@ -50,5 +50,5 @@ func Bind(args ...object.Object) object.Object {
return newError("SocketError: %s", err)
}
return &object.Null{}
return object.Null{}
}

View File

@@ -14,5 +14,5 @@ func Bool(args ...object.Object) object.Object {
return newError(err.Error())
}
return &object.Boolean{Value: args[0].Bool()}
return object.Boolean{Value: args[0].Bool()}
}

View File

@@ -72,6 +72,6 @@ func init() {
}
}
func newError(format string, a ...interface{}) *object.Error {
return &object.Error{Message: fmt.Sprintf(format, a...)}
func newError(format string, a ...interface{}) object.Error {
return object.Error{Message: fmt.Sprintf(format, a...)}
}

View File

@@ -16,6 +16,6 @@ func Chr(args ...object.Object) object.Object {
return newError(err.Error())
}
i := args[0].(*object.Integer)
return &object.String{Value: fmt.Sprintf("%c", rune(i.Value))}
i := args[0].(object.Integer)
return object.String{Value: fmt.Sprintf("%c", rune(i.Value))}
}

View File

@@ -16,12 +16,12 @@ func Close(args ...object.Object) object.Object {
return newError(err.Error())
}
fd := int(args[0].(*object.Integer).Value)
fd := int(args[0].(object.Integer).Value)
err := syscall.Close(fd)
if err != nil {
return newError("IOError: %s", err)
}
return &object.Null{}
return object.Null{}
}

View File

@@ -18,8 +18,8 @@ func Connect(args ...object.Object) object.Object {
var sa syscall.Sockaddr
fd := int(args[0].(*object.Integer).Value)
address := args[1].(*object.String).Value
fd := int(args[0].(object.Integer).Value)
address := args[1].(object.String).Value
sockaddr, err := syscall.Getsockname(fd)
if err != nil {
@@ -46,5 +46,5 @@ func Connect(args ...object.Object) object.Object {
return newError("SocketError: %s", err)
}
return &object.Null{}
return object.Null{}
}

View File

@@ -15,10 +15,10 @@ func Divmod(args ...object.Object) object.Object {
return newError(err.Error())
}
a := args[0].(*object.Integer)
b := args[1].(*object.Integer)
a := args[0].(object.Integer)
b := args[1].(object.Integer)
elements := make([]object.Object, 2)
elements[0] = &object.Integer{Value: a.Value / b.Value}
elements[1] = &object.Integer{Value: a.Value % b.Value}
elements[0] = object.Integer{Value: a.Value / b.Value}
elements[1] = object.Integer{Value: a.Value % b.Value}
return &object.Array{Elements: elements}
}

View File

@@ -17,7 +17,7 @@ func Exit(args ...object.Object) object.Object {
var status int
if len(args) == 1 {
status = int(args[0].(*object.Integer).Value)
status = int(args[0].(object.Integer).Value)
}
object.ExitFunction(status)

View File

@@ -20,8 +20,8 @@ func FFI(args ...object.Object) object.Object {
return newError(err.Error())
}
name := args[0].(*object.String).Value
symbol := args[1].(*object.String).Value
name := args[0].(object.String).Value
symbol := args[1].(object.String).Value
p, err := plugin.Open(fmt.Sprintf("%s.so", name))
if err != nil {

View File

@@ -20,7 +20,7 @@ func Find(args ...object.Object) object.Object {
}
// find substring in string
if haystack, ok := args[0].(*object.String); ok {
if haystack, ok := args[0].(object.String); ok {
if err := typing.Check(
"find", args,
typing.WithTypes(object.StringType, object.StringType),
@@ -28,9 +28,9 @@ func Find(args ...object.Object) object.Object {
return newError(err.Error())
}
needle := args[1].(*object.String)
needle := args[1].(object.String)
index := strings.Index(haystack.Value, needle.Value)
return &object.Integer{Value: int64(index)}
return object.Integer{Value: int64(index)}
}
// find in array
@@ -40,9 +40,9 @@ func Find(args ...object.Object) object.Object {
return needle.Compare(haystack.Elements[i]) == 0
})
if i < len(haystack.Elements) && needle.Compare(haystack.Elements[i]) == 0 {
return &object.Integer{Value: int64(i)}
return object.Integer{Value: int64(i)}
}
return &object.Integer{Value: -1}
return object.Integer{Value: -1}
}
return newError(

View File

@@ -15,7 +15,7 @@ func HashOf(args ...object.Object) object.Object {
}
if hash, ok := args[0].(object.Hashable); ok {
return &object.Integer{Value: int64(hash.HashKey().Value)}
return object.Integer{Value: int64(hash.HashKey().Value)}
}
return newError("TypeError: hash() expected argument #1 to be hashable")

View File

@@ -17,6 +17,6 @@ func Hex(args ...object.Object) object.Object {
return newError(err.Error())
}
i := args[0].(*object.Integer)
return &object.String{Value: fmt.Sprintf("0x%s", strconv.FormatInt(i.Value, 16))}
i := args[0].(object.Integer)
return object.String{Value: fmt.Sprintf("0x%s", strconv.FormatInt(i.Value, 16))}
}

View File

@@ -17,25 +17,24 @@ func IdOf(args ...object.Object) object.Object {
arg := args[0]
if n, ok := arg.(*object.Null); ok {
return &object.String{Value: fmt.Sprintf("%p", n)}
} else if b, ok := arg.(*object.Boolean); ok {
return &object.String{Value: fmt.Sprintf("%p", b)}
} else if i, ok := arg.(*object.Integer); ok {
return &object.String{Value: fmt.Sprintf("%p", i)}
} else if s, ok := arg.(*object.String); ok {
return &object.String{Value: fmt.Sprintf("%p", s)}
if n, ok := arg.(object.Null); ok {
return object.String{Value: fmt.Sprintf("%p", &n)}
} else if b, ok := arg.(object.Boolean); ok {
return object.String{Value: fmt.Sprintf("%p", &b)}
} else if i, ok := arg.(object.Integer); ok {
return object.String{Value: fmt.Sprintf("%p", &i)}
} else if s, ok := arg.(object.String); ok {
return object.String{Value: fmt.Sprintf("%p", &s)}
} else if a, ok := arg.(*object.Array); ok {
return &object.String{Value: fmt.Sprintf("%p", a)}
return object.String{Value: fmt.Sprintf("%p", a)}
} else if h, ok := arg.(*object.Hash); ok {
return &object.String{Value: fmt.Sprintf("%p", h)}
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)}
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", b)}
}
return nil
}

View File

@@ -20,7 +20,7 @@ func Input(args ...object.Object) object.Object {
}
if len(args) == 1 {
prompt := args[0].(*object.String).Value
prompt := args[0].(object.String).Value
fmt.Fprintf(os.Stdout, prompt)
}
@@ -30,5 +30,5 @@ func Input(args ...object.Object) object.Object {
if err != nil && err != io.EOF {
return newError(fmt.Sprintf("error reading input from stdin: %s", err))
}
return &object.String{Value: string(line)}
return object.String{Value: string(line)}
}

View File

@@ -16,20 +16,20 @@ func Int(args ...object.Object) object.Object {
}
switch arg := args[0].(type) {
case *object.Boolean:
case object.Boolean:
if arg.Value {
return &object.Integer{Value: 1}
return object.Integer{Value: 1}
}
return &object.Integer{Value: 0}
case *object.Integer:
return object.Integer{Value: 0}
case object.Integer:
return arg
case *object.String:
case object.String:
n, err := strconv.ParseInt(arg.Value, 10, 64)
if err != nil {
return newError("could not parse string to int: %s", err)
}
return &object.Integer{Value: n}
return object.Integer{Value: n}
default:
return &object.Integer{}
return object.Integer{}
}
}

View File

@@ -17,10 +17,10 @@ func Join(args ...object.Object) object.Object {
}
arr := args[0].(*object.Array)
sep := args[1].(*object.String)
sep := args[1].(object.String)
a := make([]string, len(arr.Elements))
for i, el := range arr.Elements {
a[i] = el.String()
}
return &object.String{Value: strings.Join(a, sep.Value)}
return object.String{Value: strings.Join(a, sep.Value)}
}

View File

@@ -15,7 +15,7 @@ func Len(args ...object.Object) object.Object {
}
if size, ok := args[0].(object.Sizeable); ok {
return &object.Integer{Value: int64(size.Len())}
return object.Integer{Value: int64(size.Len())}
}
return newError("TypeError: object of type '%s' has no len()", args[0].Type())
}

View File

@@ -16,12 +16,12 @@ func Listen(args ...object.Object) object.Object {
return newError(err.Error())
}
fd := int(args[0].(*object.Integer).Value)
backlog := int(args[1].(*object.Integer).Value)
fd := int(args[0].(object.Integer).Value)
backlog := int(args[1].(object.Integer).Value)
if err := syscall.Listen(fd, backlog); err != nil {
return newError("SocketError: %s", err)
}
return &object.Null{}
return object.Null{}
}

View File

@@ -16,6 +16,6 @@ func Lower(args ...object.Object) object.Object {
return newError(err.Error())
}
str := args[0].(*object.String)
return &object.String{Value: strings.ToLower(str.Value)}
str := args[0].(object.String)
return object.String{Value: strings.ToLower(str.Value)}
}

View File

@@ -20,12 +20,12 @@ func Max(args ...object.Object) object.Object {
// TODO: Make this more generic
xs := []int{} //make([]int, len(a.Elements))
for n, e := range a.Elements {
if i, ok := e.(*object.Integer); ok {
if i, ok := e.(object.Integer); ok {
xs = append(xs, int(i.Value))
} else {
return newError("item #%d not an `int` got=%d", n, e.Type())
}
}
sort.Ints(xs)
return &object.Integer{Value: int64(xs[len(xs)-1])}
return object.Integer{Value: int64(xs[len(xs)-1])}
}

View File

@@ -20,12 +20,12 @@ func Min(args ...object.Object) object.Object {
// TODO: Make this more generic
xs := []int{} //make([]int, len(a.Elements))
for n, e := range a.Elements {
if i, ok := e.(*object.Integer); ok {
if i, ok := e.(object.Integer); ok {
xs = append(xs, int(i.Value))
} else {
return newError("item #%d not an `int` got=%d", n, e.Type())
}
}
sort.Ints(xs)
return &object.Integer{Value: int64(xs[0])}
return object.Integer{Value: int64(xs[0])}
}

View File

@@ -17,6 +17,6 @@ func Oct(args ...object.Object) object.Object {
return newError(err.Error())
}
i := args[0].(*object.Integer)
return &object.String{Value: fmt.Sprintf("0%s", strconv.FormatInt(i.Value, 8))}
i := args[0].(object.Integer)
return object.String{Value: fmt.Sprintf("0%s", strconv.FormatInt(i.Value, 8))}
}

View File

@@ -66,10 +66,10 @@ func Open(args ...object.Object) object.Object {
perm uint32 = 0640
)
filename = args[0].(*object.String).Value
filename = args[0].(object.String).Value
if len(args) == 2 {
mode = args[1].(*object.String).Value
mode = args[1].(object.String).Value
}
flag, err := parseMode(mode)
@@ -82,5 +82,5 @@ func Open(args ...object.Object) object.Object {
return newError("IOError: %s", err)
}
return &object.Integer{Value: int64(fd)}
return object.Integer{Value: int64(fd)}
}

View File

@@ -15,9 +15,9 @@ func Ord(args ...object.Object) object.Object {
return newError(err.Error())
}
s := args[0].(*object.String)
s := args[0].(object.String)
if len(s.Value) == 1 {
return &object.Integer{Value: int64(s.Value[0])}
return object.Integer{Value: int64(s.Value[0])}
}
return newError(
"TypeError: ord() expected a single character `str` got=%s",

View File

@@ -27,8 +27,8 @@ func Pow(args ...object.Object) object.Object {
return newError(err.Error())
}
x := args[0].(*object.Integer)
y := args[1].(*object.Integer)
x := args[0].(object.Integer)
y := args[1].(object.Integer)
value := pow(x.Value, y.Value)
return &object.Integer{Value: value}
return object.Integer{Value: value}
}

View File

@@ -24,10 +24,10 @@ func Read(args ...object.Object) object.Object {
n = DefaultBufferSize
)
fd = int(args[0].(*object.Integer).Value)
fd = int(args[0].(object.Integer).Value)
if len(args) == 2 {
n = int(args[1].(*object.Integer).Value)
n = int(args[1].(object.Integer).Value)
}
buf := make([]byte, n)
@@ -36,5 +36,5 @@ func Read(args ...object.Object) object.Object {
return newError("IOError: %s", err)
}
return &object.String{Value: string(buf[:n])}
return object.String{Value: string(buf[:n])}
}

View File

@@ -16,11 +16,11 @@ func ReadFile(args ...object.Object) object.Object {
return newError(err.Error())
}
filename := args[0].(*object.String).Value
filename := args[0].(object.String).Value
data, err := os.ReadFile(filename)
if err != nil {
return newError("IOError: error reading from file %s: %s", filename, err)
}
return &object.String{Value: string(data)}
return object.String{Value: string(data)}
}

View File

@@ -21,11 +21,11 @@ func Seek(args ...object.Object) object.Object {
whence = 0
)
fd = int(args[0].(*object.Integer).Value)
offset := args[1].(*object.Integer).Value
fd = int(args[0].(object.Integer).Value)
offset := args[1].(object.Integer).Value
if len(args) == 3 {
whence = int(args[2].(*object.Integer).Value)
whence = int(args[2].(object.Integer).Value)
}
offset, err := syscall.Seek(fd, offset, whence)
@@ -33,5 +33,5 @@ func Seek(args ...object.Object) object.Object {
return newError("IOError: %s", err)
}
return &object.Integer{Value: offset}
return object.Integer{Value: offset}
}

View File

@@ -23,7 +23,7 @@ func Socket(args ...object.Object) object.Object {
proto int
)
arg := args[0].(*object.String).Value
arg := args[0].(object.String).Value
switch strings.ToLower(arg) {
case "unix":
@@ -61,5 +61,5 @@ func Socket(args ...object.Object) object.Object {
}
}
return &object.Integer{Value: int64(fd)}
return object.Integer{Value: int64(fd)}
}

View File

@@ -17,16 +17,16 @@ func Split(args ...object.Object) object.Object {
}
var sep string
s := args[0].(*object.String).Value
s := args[0].(object.String).Value
if len(args) == 2 {
sep = args[1].(*object.String).Value
sep = args[1].(object.String).Value
}
tokens := strings.Split(s, sep)
elements := make([]object.Object, len(tokens))
for i, token := range tokens {
elements[i] = &object.String{Value: token}
elements[i] = object.String{Value: token}
}
return &object.Array{Elements: elements}
}

View File

@@ -14,5 +14,5 @@ func Str(args ...object.Object) object.Object {
return newError(err.Error())
}
return &object.String{Value: args[0].String()}
return object.String{Value: args[0].String()}
}

View File

@@ -14,5 +14,5 @@ func TypeOf(args ...object.Object) object.Object {
return newError(err.Error())
}
return &object.String{Value: args[0].Type().String()}
return object.String{Value: args[0].Type().String()}
}

View File

@@ -16,5 +16,5 @@ func Upper(args ...object.Object) object.Object {
return newError(err.Error())
}
return &object.String{Value: strings.ToUpper(args[0].(*object.String).Value)}
return object.String{Value: strings.ToUpper(args[0].(object.String).Value)}
}

View File

@@ -16,13 +16,13 @@ func Write(args ...object.Object) object.Object {
return newError(err.Error())
}
fd := int(args[0].(*object.Integer).Value)
data := []byte(args[1].(*object.String).Value)
fd := int(args[0].(object.Integer).Value)
data := []byte(args[1].(object.String).Value)
n, err := syscall.Write(fd, data)
if err != nil {
return newError("IOError: %s", err)
}
return &object.Integer{Value: int64(n)}
return object.Integer{Value: int64(n)}
}

View File

@@ -16,13 +16,13 @@ func WriteFile(args ...object.Object) object.Object {
return newError(err.Error())
}
filename := args[0].(*object.String).Value
data := []byte(args[1].(*object.String).Value)
filename := args[0].(object.String).Value
data := []byte(args[1].(object.String).Value)
err := os.WriteFile(filename, data, 0755)
if err != nil {
return newError("IOError: error writing file %s: %s", filename, err)
}
return &object.Null{}
return object.Null{}
}