cli/q
1
0
Fork 0
Code Issues Pull requests Releases Activity

Implemented runes

Browse source
This commit is contained in:
Eduard Urbach 2024-07-22 15:32:16 +02:00
parent eaeeba495e
commit f7645104fb
Signed by: eduard
GPG key ID: 49226B848C78F6C8
11 changed files with 88 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/build/core/CompileAssign.go
View file

@ -1,8 +1,6 @@
package core
import (
"strconv"
"git.akyoto.dev/cli/q/src/build/asm"
"git.akyoto.dev/cli/q/src/build/ast"
"git.akyoto.dev/cli/q/src/build/errors"
@ -38,19 +36,25 @@ func (f *Function) CompileAssign(node *ast.Assign) error {
defer f.useVariable(variable)
index := left.Children[1]
offset, err := strconv.Atoi(index.Token.Text(f.File.Bytes))
offset, _, err := f.Number(index.Token)
if err != nil {
return err
}
num, err := strconv.Atoi(right.Token.Text(f.File.Bytes))
number, size, err := f.Number(right.Token)
if err != nil {
return err
}
f.MemoryNumber(asm.STORE, asm.Memory{Base: variable.Register, Offset: byte(offset), Length: 1}, num)
elementSize := byte(1)
if size != elementSize {
return errors.New(&errors.NumberExceedsBounds{Number: number, ExpectedSize: elementSize, Size: size}, f.File, right.Token.Position)
}
f.MemoryNumber(asm.STORE, asm.Memory{Base: variable.Register, Offset: byte(offset), Length: elementSize}, number)
return nil
}

7
src/build/core/ExecuteLeaf.go
View file

@ -1,8 +1,6 @@
package core
import (
"strconv"
"git.akyoto.dev/cli/q/src/build/cpu"
"git.akyoto.dev/cli/q/src/build/errors"
"git.akyoto.dev/cli/q/src/build/token"
@ -22,9 +20,8 @@ func (f *Function) ExecuteLeaf(operation token.Token, register cpu.Register, ope
defer f.useVariable(variable)
return f.ExecuteRegisterRegister(operation, register, variable.Register)
case token.Number:
value := operand.Text(f.File.Bytes)
number, err := strconv.Atoi(value)
case token.Number, token.Rune:
number, _, err := f.Number(operand)
if err != nil {
return err

36
src/build/core/Number.go Normal file
View file

@ -0,0 +1,36 @@
package core
import (
"strconv"
"unicode/utf8"
"git.akyoto.dev/cli/q/src/build/errors"
"git.akyoto.dev/cli/q/src/build/token"
)
// Number tries to convert the token into a numeric value.
func (f *Function) Number(t token.Token) (int, byte, error) {
switch t.Kind {
case token.Number:
number, err := strconv.Atoi(t.Text(f.File.Bytes))
return number, 8, err
case token.Rune:
r := t.Bytes(f.File.Bytes)
r = r[1 : len(r)-1]
if len(r) == 0 {
return 0, 0, errors.New(errors.InvalidRune, f.File, t.Position+1)
}
number, size := utf8.DecodeRune(r)
if len(r) > size {
return 0, 0, errors.New(errors.InvalidRune, f.File, t.Position+1)
}
return int(number), byte(size), nil
}
return 0, 0, errors.New(errors.InvalidNumber, f.File, t.Position)
}

8
src/build/core/TokenToRegister.go
View file

@ -2,7 +2,6 @@ package core
import (
"fmt"
"strconv"
"git.akyoto.dev/cli/q/src/build/asm"
"git.akyoto.dev/cli/q/src/build/cpu"
@ -26,15 +25,14 @@ func (f *Function) TokenToRegister(t token.Token, register cpu.Register) error {
f.RegisterRegister(asm.MOVE, register, variable.Register)
return nil
case token.Number:
value := t.Text(f.File.Bytes)
n, err := strconv.Atoi(value)
case token.Number, token.Rune:
number, _, err := f.Number(t)
if err != nil {
return err
}
f.RegisterNumber(asm.MOVE, register, n)
f.RegisterNumber(asm.MOVE, register, number)
return nil
case token.String: