Added types
This commit is contained in:
parent
7c5e0ae3a1
commit
baa2463b4b
19 changed files with 122 additions and 60 deletions
|
@ -7,15 +7,16 @@ import (
|
|||
"git.akyoto.dev/cli/q/src/build/errors"
|
||||
"git.akyoto.dev/cli/q/src/build/expression"
|
||||
"git.akyoto.dev/cli/q/src/build/token"
|
||||
"git.akyoto.dev/cli/q/src/build/types"
|
||||
)
|
||||
|
||||
// ExpressionToRegister puts the result of an expression into the specified register.
|
||||
func (f *Function) ExpressionToRegister(node *expression.Expression, register cpu.Register) error {
|
||||
func (f *Function) ExpressionToRegister(node *expression.Expression, register cpu.Register) (types.Type, error) {
|
||||
f.SaveRegister(register)
|
||||
|
||||
if node.IsFolded {
|
||||
f.RegisterNumber(asm.MOVE, register, node.Value)
|
||||
return nil
|
||||
return types.Int, nil
|
||||
}
|
||||
|
||||
if node.IsLeaf() {
|
||||
|
@ -23,34 +24,38 @@ func (f *Function) ExpressionToRegister(node *expression.Expression, register cp
|
|||
}
|
||||
|
||||
if ast.IsFunctionCall(node) {
|
||||
err := f.CompileCall(node)
|
||||
fn, err := f.CompileCall(node)
|
||||
|
||||
if register != f.CPU.Output[0] {
|
||||
f.RegisterRegister(asm.MOVE, register, f.CPU.Output[0])
|
||||
}
|
||||
|
||||
return err
|
||||
if fn == nil || len(fn.ReturnTypes) == 0 {
|
||||
return types.Invalid, err
|
||||
}
|
||||
|
||||
return fn.ReturnTypes[0], err
|
||||
}
|
||||
|
||||
if node.Token.Kind == token.Array {
|
||||
array := f.VariableByName(node.Children[0].Token.Text(f.File.Bytes))
|
||||
offset, err := f.Number(node.Children[1].Token)
|
||||
f.MemoryRegister(asm.LOAD, asm.Memory{Base: array.Register, Offset: byte(offset), Length: 1}, register)
|
||||
return err
|
||||
return types.Int, err
|
||||
}
|
||||
|
||||
if len(node.Children) == 1 {
|
||||
if !node.Token.IsUnaryOperator() {
|
||||
return errors.New(errors.MissingOperand, f.File, node.Token.End())
|
||||
return types.Invalid, errors.New(errors.MissingOperand, f.File, node.Token.End())
|
||||
}
|
||||
|
||||
err := f.ExpressionToRegister(node.Children[0], register)
|
||||
typ, err := f.ExpressionToRegister(node.Children[0], register)
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
return typ, err
|
||||
}
|
||||
|
||||
return f.ExecuteRegister(node.Token, register)
|
||||
return typ, f.ExecuteRegister(node.Token, register)
|
||||
}
|
||||
|
||||
left := node.Children[0]
|
||||
|
@ -61,10 +66,10 @@ func (f *Function) ExpressionToRegister(node *expression.Expression, register cp
|
|||
register = f.NewRegister()
|
||||
}
|
||||
|
||||
err := f.ExpressionToRegister(left, register)
|
||||
typ, err := f.ExpressionToRegister(left, register)
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
return types.Invalid, err
|
||||
}
|
||||
|
||||
err = f.Execute(node.Token, register, right)
|
||||
|
@ -74,5 +79,5 @@ func (f *Function) ExpressionToRegister(node *expression.Expression, register cp
|
|||
f.FreeRegister(register)
|
||||
}
|
||||
|
||||
return err
|
||||
return typ, err
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue