cli/q
Code Issues 1 Pull Requests Activity

Implemented struct pointer types

Browse Source
This commit is contained in:
Eduard Urbach
2025-02-05 15:16:00 +01:00
parent 85568949a2
commit 5d38a4980a
17 changed files with 190 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/CompileCall.go
View File

@ -31,9 +31,11 @@ func (f *Function) CompileCall(root *expression.Expression) (*Function, error) {
return nil, f.CompileSyscall(root)
case "new":
return &Function{
ReturnTypes: []types.Type{
&types.Pointer{
To: f.Types[root.Children[1].Token.Text(f.File.Bytes)],
Output: []*Output{
{
Type: &types.Pointer{
To: f.Types[root.Children[1].Token.Text(f.File.Bytes)],
},
},
},
}, f.CompileNew(root)
@ -92,16 +94,16 @@ func (f *Function) CompileCall(root *expression.Expression) (*Function, error) {
return nil, err
}
if !types.Is(typ, fn.Parameters[i].Type) {
if !types.Is(typ, fn.Input[i].Type) {
return nil, errors.New(&errors.TypeMismatch{
Encountered: typ.Name(),
Expected: fn.Parameters[i].Type.Name(),
ParameterName: fn.Parameters[i].Name,
Expected: fn.Input[i].Type.Name(),
ParameterName: fn.Input[i].Name,
}, f.File, parameters[i].Token.Position)
}
}
for _, register := range f.CPU.Output[:len(fn.ReturnTypes)] {
for _, register := range f.CPU.Output[:len(fn.Output)] {
f.SaveRegister(register)
}

4
src/core/CompileDefinition.go
View File

@ -28,7 +28,7 @@ func (f *Function) CompileDefinition(node *ast.Define) error {
variable.Type = typ
if variable.Type == nil {
return errors.New(errors.UnknownType, f.File, node.Expression.Token.End())
return errors.New(errors.CouldNotInferType, f.File, node.Expression.Token.End())
}
f.AddVariable(variable)
@ -54,7 +54,7 @@ func (f *Function) CompileDefinition(node *ast.Define) error {
}
if called != nil {
variable.Type = called.ReturnTypes[count]
variable.Type = called.Output[count].Type
}
f.RegisterRegister(asm.MOVE, variable.Register, f.CPU.Output[count])

8
src/core/CompileReturn.go
View File

@ -14,8 +14,8 @@ func (f *Function) CompileReturn(node *ast.Return) error {
return nil
}
if len(node.Values) != len(f.ReturnTypes) {
return errors.New(&errors.ReturnCountMismatch{Count: len(node.Values), ExpectedCount: len(f.ReturnTypes)}, f.File, node.Values[0].Token.Position)
if len(node.Values) != len(f.Output) {
return errors.New(&errors.ReturnCountMismatch{Count: len(node.Values), ExpectedCount: len(f.Output)}, f.File, node.Values[0].Token.Position)
}
for i := len(node.Values) - 1; i >= 0; i-- {
@ -25,10 +25,10 @@ func (f *Function) CompileReturn(node *ast.Return) error {
return err
}
if !types.Is(typ, f.ReturnTypes[i]) {
if !types.Is(typ, f.Output[i].Type) {
return errors.New(&errors.TypeMismatch{
Encountered: typ.Name(),
Expected: f.ReturnTypes[i].Name(),
Expected: f.Output[i].Type.Name(),
ParameterName: "",
IsReturn: true,
}, f.File, node.Values[i].Token.Position)

4
src/core/ExpressionToRegister.go
View File

@ -30,11 +30,11 @@ func (f *Function) ExpressionToRegister(node *expression.Expression, register cp
f.RegisterRegister(asm.MOVE, register, f.CPU.Output[0])
}
if fn == nil || len(fn.ReturnTypes) == 0 {
if fn == nil || len(fn.Output) == 0 {
return nil, err
}
return fn.ReturnTypes[0], err
return fn.Output[0].Type, err
}
if node.Token.Kind == token.Array {

27
src/core/Function.go
View File

@ -4,7 +4,6 @@ import (
"git.akyoto.dev/cli/q/src/dll"
"git.akyoto.dev/cli/q/src/fs"
"git.akyoto.dev/cli/q/src/register"
"git.akyoto.dev/cli/q/src/scope"
"git.akyoto.dev/cli/q/src/token"
"git.akyoto.dev/cli/q/src/types"
)
@ -12,19 +11,19 @@ import (
// Function represents the smallest unit of code.
type Function struct {
register.Machine
Package string
Name string
UniqueName string
File *fs.File
Body token.List
Parameters []*scope.Variable
ReturnTypes []types.Type
Functions map[string]*Function
Types map[string]types.Type
DLLs dll.List
Err error
deferred []func()
count counter
Package string
Name string
UniqueName string
File *fs.File
Body token.List
Input []*Input
Output []*Output
Functions map[string]*Function
Types map[string]types.Type
DLLs dll.List
Err error
deferred []func()
count counter
}
// counter stores how often a certain statement appeared so we can generate a unique label from it.

16
src/core/Input.go Normal file
View File

@ -0,0 +1,16 @@
package core
import (
"git.akyoto.dev/cli/q/src/token"
"git.akyoto.dev/cli/q/src/types"
)
type Input struct {
Name string
Type types.Type
tokens token.List
}
func NewInput(tokens token.List) *Input {
return &Input{tokens: tokens}
}

15
src/core/Output.go Normal file
View File

@ -0,0 +1,15 @@
package core
import (
"git.akyoto.dev/cli/q/src/token"
"git.akyoto.dev/cli/q/src/types"
)
type Output struct {
Type types.Type
tokens token.List
}
func NewOutput(tokens token.List) *Output {
return &Output{tokens: tokens}
}

45
src/core/ResolveTypes.go Normal file
View File

@ -0,0 +1,45 @@
package core
import (
"git.akyoto.dev/cli/q/src/errors"
"git.akyoto.dev/cli/q/src/scope"
"git.akyoto.dev/cli/q/src/token"
"git.akyoto.dev/cli/q/src/x64"
)
// ResolveTypes parses the input and output types.
func (f *Function) ResolveTypes() error {
for i, param := range f.Input {
param.Name = param.tokens[0].Text(f.File.Bytes)
typeName := param.tokens[1:].Text(f.File.Bytes)
param.Type = f.TypeByName(typeName)
if param.Type == nil {
return errors.New(&errors.UnknownType{Name: typeName}, f.File, param.tokens[1].Position)
}
uses := token.Count(f.Body, f.File.Bytes, token.Identifier, param.Name)
if uses == 0 && param.Name != "_" {
return errors.New(&errors.UnusedVariable{Name: param.Name}, f.File, param.tokens[0].Position)
}
f.AddVariable(&scope.Variable{
Name: param.Name,
Type: param.Type,
Register: x64.InputRegisters[i],
Alive: uses,
})
}
for _, param := range f.Output {
typeName := param.tokens.Text(f.File.Bytes)
param.Type = f.TypeByName(typeName)
if param.Type == nil {
return errors.New(&errors.UnknownType{Name: typeName}, f.File, param.tokens[1].Position)
}
}
return nil
}

17
src/core/TypeByName.go Normal file
View File

@ -0,0 +1,17 @@
package core
import (
"strings"
"git.akyoto.dev/cli/q/src/types"
)
// TypeByName returns the type with the given name or `nil` if it doesn't exist.
func (f *Function) TypeByName(name string) types.Type {
if strings.HasPrefix(name, "*") {
to := strings.TrimPrefix(name, "*")
return &types.Pointer{To: f.TypeByName(to)}
}
return f.Types[name]
}