Added more tests
This commit is contained in:
parent
e4cbb91f61
commit
c8b5c4dbfe
@ -7,7 +7,7 @@ import (
|
|||||||
"git.akyoto.dev/cli/q/src/ast"
|
"git.akyoto.dev/cli/q/src/ast"
|
||||||
"git.akyoto.dev/cli/q/src/cpu"
|
"git.akyoto.dev/cli/q/src/cpu"
|
||||||
"git.akyoto.dev/cli/q/src/errors"
|
"git.akyoto.dev/cli/q/src/errors"
|
||||||
"git.akyoto.dev/cli/q/src/token"
|
"git.akyoto.dev/cli/q/src/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
// CompileAssignArray compiles an assign statement for array elements.
|
// CompileAssignArray compiles an assign statement for array elements.
|
||||||
@ -33,7 +33,7 @@ func (f *Function) CompileAssignArray(node *ast.Assign) error {
|
|||||||
|
|
||||||
index := left.Children[1]
|
index := left.Children[1]
|
||||||
|
|
||||||
if index.Token.Kind == token.Number {
|
if index.Token.IsNumeric() {
|
||||||
offset, err := f.Number(index.Token)
|
offset, err := f.Number(index.Token)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -42,12 +42,16 @@ func (f *Function) CompileAssignArray(node *ast.Assign) error {
|
|||||||
|
|
||||||
memory.Offset = int8(offset)
|
memory.Offset = int8(offset)
|
||||||
} else {
|
} else {
|
||||||
_, indexRegister, isTemporary, err := f.Evaluate(index)
|
typ, indexRegister, isTemporary, err := f.Evaluate(index)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if !types.Is(typ, types.Int) {
|
||||||
|
return errors.New(&errors.TypeMismatch{Encountered: typ.Name(), Expected: types.Int.Name()}, f.File, index.Token.Position)
|
||||||
|
}
|
||||||
|
|
||||||
memory.OffsetRegister = indexRegister
|
memory.OffsetRegister = indexRegister
|
||||||
|
|
||||||
if isTemporary {
|
if isTemporary {
|
||||||
|
@ -25,12 +25,11 @@ func (f *Function) CompileDefinition(node *ast.Define) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
variable.Type = typ
|
if typ == nil {
|
||||||
|
return errors.New(errors.UntypedExpression, f.File, node.Expression.Token.End())
|
||||||
if variable.Type == nil {
|
|
||||||
return errors.New(errors.CouldNotInferType, f.File, node.Expression.Token.End())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable.Type = typ
|
||||||
f.AddVariable(variable)
|
f.AddVariable(variable)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
package core
|
package core
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"math"
|
||||||
|
|
||||||
"git.akyoto.dev/cli/q/src/asm"
|
"git.akyoto.dev/cli/q/src/asm"
|
||||||
"git.akyoto.dev/cli/q/src/ast"
|
"git.akyoto.dev/cli/q/src/ast"
|
||||||
"git.akyoto.dev/cli/q/src/cpu"
|
"git.akyoto.dev/cli/q/src/cpu"
|
||||||
@ -40,10 +42,46 @@ func (f *Function) ExpressionToRegister(node *expression.Expression, register cp
|
|||||||
}
|
}
|
||||||
|
|
||||||
if node.Token.Kind == token.Array {
|
if node.Token.Kind == token.Array {
|
||||||
array := f.VariableByName(node.Children[0].Token.Text(f.File.Bytes))
|
name := node.Children[0].Token.Text(f.File.Bytes)
|
||||||
offset, err := f.Number(node.Children[1].Token)
|
array := f.VariableByName(name)
|
||||||
f.MemoryRegister(asm.LOAD, asm.Memory{Base: array.Register, Offset: int8(offset), Length: 1}, register)
|
|
||||||
return types.Int, err
|
if array == nil {
|
||||||
|
return nil, errors.New(&errors.UnknownIdentifier{Name: name}, f.File, node.Children[0].Token.Position)
|
||||||
|
}
|
||||||
|
|
||||||
|
index := node.Children[1]
|
||||||
|
|
||||||
|
memory := asm.Memory{
|
||||||
|
Base: array.Register,
|
||||||
|
Offset: 0,
|
||||||
|
OffsetRegister: cpu.Register(math.MaxUint8),
|
||||||
|
Length: byte(1),
|
||||||
|
}
|
||||||
|
|
||||||
|
if index.Token.IsNumeric() {
|
||||||
|
offset, err := f.Number(index.Token)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
memory.Offset = int8(offset)
|
||||||
|
} else {
|
||||||
|
typ, err := f.ExpressionToRegister(index, register)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if !types.Is(typ, types.Int) {
|
||||||
|
return nil, errors.New(&errors.TypeMismatch{Encountered: typ.Name(), Expected: types.Int.Name()}, f.File, index.Token.Position)
|
||||||
|
}
|
||||||
|
|
||||||
|
memory.OffsetRegister = register
|
||||||
|
}
|
||||||
|
|
||||||
|
f.MemoryRegister(asm.LOAD, memory, register)
|
||||||
|
return types.Int, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if node.Token.Kind == token.Period {
|
if node.Token.Kind == token.Period {
|
||||||
|
@ -1,9 +1,7 @@
|
|||||||
package errors
|
package errors
|
||||||
|
|
||||||
var (
|
var (
|
||||||
CouldNotInferType = &Base{"Couldn't infer type"}
|
|
||||||
EmptySwitch = &Base{"Empty switch"}
|
EmptySwitch = &Base{"Empty switch"}
|
||||||
ExpectedFunctionName = &Base{"Expected function name"}
|
|
||||||
ExpectedFunctionParameters = &Base{"Expected function parameters"}
|
ExpectedFunctionParameters = &Base{"Expected function parameters"}
|
||||||
ExpectedFunctionDefinition = &Base{"Expected function definition"}
|
ExpectedFunctionDefinition = &Base{"Expected function definition"}
|
||||||
ExpectedIfBeforeElse = &Base{"Expected an 'if' block before 'else'"}
|
ExpectedIfBeforeElse = &Base{"Expected an 'if' block before 'else'"}
|
||||||
@ -24,4 +22,5 @@ var (
|
|||||||
MissingParameter = &Base{"Missing parameter"}
|
MissingParameter = &Base{"Missing parameter"}
|
||||||
MissingType = &Base{"Missing type"}
|
MissingType = &Base{"Missing type"}
|
||||||
NotImplemented = &Base{"Not implemented"}
|
NotImplemented = &Base{"Not implemented"}
|
||||||
|
UntypedExpression = &Base{"Untyped expression"}
|
||||||
)
|
)
|
||||||
|
7
tests/errors/TypeMismatch3.q
Normal file
7
tests/errors/TypeMismatch3.q
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
import mem
|
||||||
|
|
||||||
|
main() {
|
||||||
|
a := mem.alloc(16)
|
||||||
|
b := a["not a number"]
|
||||||
|
b += 1
|
||||||
|
}
|
6
tests/errors/TypeMismatch4.q
Normal file
6
tests/errors/TypeMismatch4.q
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
import mem
|
||||||
|
|
||||||
|
main() {
|
||||||
|
a := mem.alloc(16)
|
||||||
|
a["not a number"] = 42
|
||||||
|
}
|
6
tests/errors/UntypedExpression.q
Normal file
6
tests/errors/UntypedExpression.q
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
main() {
|
||||||
|
a := unknown()
|
||||||
|
a += 1
|
||||||
|
}
|
||||||
|
|
||||||
|
unknown() {}
|
@ -57,6 +57,7 @@ var errs = []struct {
|
|||||||
{"UnknownIdentifier3.q", &errors.UnknownIdentifier{Name: "x"}},
|
{"UnknownIdentifier3.q", &errors.UnknownIdentifier{Name: "x"}},
|
||||||
{"UnknownPackage.q", &errors.UnknownPackage{Name: "sys"}},
|
{"UnknownPackage.q", &errors.UnknownPackage{Name: "sys"}},
|
||||||
{"UnknownStructField.q", &errors.UnknownStructField{StructName: "A", FieldName: "x"}},
|
{"UnknownStructField.q", &errors.UnknownStructField{StructName: "A", FieldName: "x"}},
|
||||||
|
{"UntypedExpression.q", errors.UntypedExpression},
|
||||||
{"UnusedImport.q", &errors.UnusedImport{Package: "sys"}},
|
{"UnusedImport.q", &errors.UnusedImport{Package: "sys"}},
|
||||||
{"UnusedVariable.q", &errors.UnusedVariable{Name: "x"}},
|
{"UnusedVariable.q", &errors.UnusedVariable{Name: "x"}},
|
||||||
{"VariableAlreadyExists.q", &errors.VariableAlreadyExists{Name: "x"}},
|
{"VariableAlreadyExists.q", &errors.VariableAlreadyExists{Name: "x"}},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user