cli/q
Code Issues 1 Pull Requests Activity

Improved type system

Browse Source
This commit is contained in:
Eduard Urbach
2024-08-08 12:55:25 +02:00
parent d624a5f895
commit 5d9be01a85
20 changed files with 111 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/ExpressionToRegister.go
View File

@ -11,7 +11,7 @@ import (
)
// ExpressionToRegister puts the result of an expression into the specified register.
func (f *Function) ExpressionToRegister(node *expression.Expression, register cpu.Register) (types.Type, error) {
func (f *Function) ExpressionToRegister(node *expression.Expression, register cpu.Register) (*types.Type, error) {
f.SaveRegister(register)
if node.IsFolded {
@ -31,7 +31,7 @@ func (f *Function) ExpressionToRegister(node *expression.Expression, register cp
}
if fn == nil || len(fn.ReturnTypes) == 0 {
return types.Any, err
return nil, err
}
return fn.ReturnTypes[0], err
@ -46,7 +46,7 @@ func (f *Function) ExpressionToRegister(node *expression.Expression, register cp
if len(node.Children) == 1 {
if !node.Token.IsUnaryOperator() {
return types.Invalid, errors.New(errors.MissingOperand, f.File, node.Token.End())
return nil, errors.New(errors.MissingOperand, f.File, node.Token.End())
}
typ, err := f.ExpressionToRegister(node.Children[0], register)
@ -69,10 +69,10 @@ func (f *Function) ExpressionToRegister(node *expression.Expression, register cp
typ, err := f.ExpressionToRegister(left, register)
if err != nil {
return types.Invalid, err
return nil, err
}
if typ == types.Pointer && (node.Token.Kind == token.Add || node.Token.Kind == token.Sub) && right.Token.Kind == token.Identifier && f.VariableByName(right.Token.Text(f.File.Bytes)).Type == types.Pointer {
if typ == types.Pointer && right.Token.Kind == token.Identifier && f.VariableByName(right.Token.Text(f.File.Bytes)).Type == types.Pointer {
typ = types.Int
}