Implemented package imports

This commit is contained in:
Eduard Urbach 2024-07-18 18:08:30 +02:00
parent fa373e7dc2
commit b34470a97d
Signed by: akyoto
GPG Key ID: C874F672B1AF20C0
21 changed files with 510 additions and 353 deletions

View File

@ -1,5 +1,7 @@
import sys
main() { main() {
syscall(60, factorial(5)) sys.exit(factorial(5))
} }
factorial(x) { factorial(x) {

View File

@ -1,5 +1,7 @@
import sys
main() { main() {
syscall(60, fibonacci(10)) sys.exit(fibonacci(10))
} }
fibonacci(x) { fibonacci(x) {

View File

@ -1,11 +1,9 @@
import sys
main() { main() {
print("Hello", 5) print("Hello", 5)
} }
print(address, length) { print(address, length) {
write(1, address, length) sys.write(1, address, length)
}
write(fd, address, length) {
syscall(1, fd, address, length)
} }

55
lib/sys/linux.q Normal file
View File

@ -0,0 +1,55 @@
read(fd, address, length) {
return syscall(0, fd, address, length)
}
write(fd, address, length) {
syscall(1, fd, address, length)
}
open(file, flags, mode) {
return syscall(2, file, flags, mode)
}
close(fd) {
return syscall(3, fd)
}
mmap(address, length, protection, flags) {
return syscall(9, address, length, protection, flags)
}
munmap(address, length) {
return syscall(11, address, length)
}
clone(flags, stack) {
return syscall(56, flags, stack)
}
exit(code) {
syscall(60, code)
}
getcwd(buffer, length) {
return syscall(79, buffer, length)
}
chdir(path) {
return syscall(80, path)
}
rename(old, new) {
return syscall(82, old, new)
}
mkdir(path, mode) {
return syscall(83, path, mode)
}
rmdir(path) {
return syscall(84, path)
}
unlink(file) {
return syscall(87, file)
}

View File

@ -1,7 +0,0 @@
package config
import "runtime/debug"
func init() {
debug.SetGCPercent(-1)
}

53
src/build/config/init.go Normal file
View File

@ -0,0 +1,53 @@
package config
import (
"os"
"path"
"path/filepath"
"runtime/debug"
)
var (
Executable string
Root string
Library string
)
func init() {
debug.SetGCPercent(-1)
executable, err := os.Executable()
if err != nil {
panic(err)
}
Executable = executable
Root = filepath.Dir(executable)
Library = filepath.Join(Root, "lib")
stat, err := os.Stat(Library)
if !os.IsNotExist(err) && stat != nil && stat.IsDir() {
return
}
dir, err := os.Getwd()
if err != nil {
panic(err)
}
for {
Library = path.Join(dir, "lib")
stat, err := os.Stat(Library)
if !os.IsNotExist(err) && stat != nil && stat.IsDir() {
return
}
if dir == "/" {
panic("standard library not found")
}
dir = filepath.Dir(dir)
}
}

View File

@ -11,7 +11,15 @@ import (
// Registers that are in use must be saved if they are modified by the function. // Registers that are in use must be saved if they are modified by the function.
// After the function call, they must be restored in reverse order. // After the function call, they must be restored in reverse order.
func (f *Function) CompileCall(root *expression.Expression) error { func (f *Function) CompileCall(root *expression.Expression) error {
funcName := root.Children[0].Token.Text() funcNameRoot := root.Children[0]
funcName := ""
if funcNameRoot.IsLeaf() {
funcName = funcNameRoot.Token.Text()
} else {
funcName = funcNameRoot.Children[0].Token.Text() + funcNameRoot.Token.Text() + funcNameRoot.Children[1].Token.Text()
}
isSyscall := funcName == "syscall" isSyscall := funcName == "syscall"
if !isSyscall { if !isSyscall {

View File

@ -2,6 +2,7 @@ package keyword
const ( const (
If = "if" If = "if"
Import = "import"
Loop = "loop" Loop = "loop"
Return = "return" Return = "return"
) )
@ -9,6 +10,7 @@ const (
// Map is a map of all keywords used in the language. // Map is a map of all keywords used in the language.
var Map = map[string][]byte{ var Map = map[string][]byte{
If: []byte(If), If: []byte(If),
Import: []byte(Import),
Loop: []byte(Loop), Loop: []byte(Loop),
Return: []byte(Return), Return: []byte(Return),
} }

View File

@ -1,278 +1,20 @@
package scanner package scanner
import ( import "git.akyoto.dev/cli/q/src/build/core"
"os"
"path/filepath"
"strings"
"sync"
"git.akyoto.dev/cli/q/src/build/arch/x64" // Scan scans the list of files.
"git.akyoto.dev/cli/q/src/build/core"
"git.akyoto.dev/cli/q/src/build/errors"
"git.akyoto.dev/cli/q/src/build/expression"
"git.akyoto.dev/cli/q/src/build/fs"
"git.akyoto.dev/cli/q/src/build/token"
)
// Scan scans the directory.
func Scan(files []string) (<-chan *core.Function, <-chan error) { func Scan(files []string) (<-chan *core.Function, <-chan error) {
functions := make(chan *core.Function) scanner := Scanner{
errors := make(chan error) functions: make(chan *core.Function),
errors: make(chan error),
}
go func() { go func() {
scanFiles(files, functions, errors) scanner.queue(files...)
close(functions) scanner.group.Wait()
close(errors) close(scanner.functions)
close(scanner.errors)
}() }()
return functions, errors return scanner.functions, scanner.errors
}
// scanFiles scans the list of files without channel allocations.
func scanFiles(files []string, functions chan<- *core.Function, errors chan<- error) {
wg := sync.WaitGroup{}
for _, file := range files {
stat, err := os.Stat(file)
if err != nil {
errors <- err
return
}
if stat.IsDir() {
err = fs.Walk(file, func(name string) {
if !strings.HasSuffix(name, ".q") {
return
}
fullPath := filepath.Join(file, name)
wg.Add(1)
go func() {
defer wg.Done()
err := scanFile(fullPath, functions)
if err != nil {
errors <- err
}
}()
})
if err != nil {
errors <- err
}
} else {
wg.Add(1)
go func() {
defer wg.Done()
err := scanFile(file, functions)
if err != nil {
errors <- err
}
}()
}
}
wg.Wait()
}
// scanFile scans a single file.
func scanFile(path string, functions chan<- *core.Function) error {
contents, err := os.ReadFile(path)
if err != nil {
return err
}
tokens := token.Tokenize(contents)
file := &fs.File{
Tokens: tokens,
Path: path,
}
var (
i = 0
groupLevel = 0
blockLevel = 0
nameStart = -1
paramsStart = -1
paramsEnd = -1
bodyStart = -1
)
for {
// Function name
for i < len(tokens) {
if tokens[i].Kind == token.Identifier {
nameStart = i
i++
break
}
if tokens[i].Kind == token.NewLine || tokens[i].Kind == token.Comment {
i++
continue
}
if tokens[i].Kind == token.Invalid {
return errors.New(&errors.InvalidCharacter{Character: tokens[i].Text()}, file, tokens[i].Position)
}
if tokens[i].Kind == token.EOF {
return nil
}
return errors.New(errors.ExpectedFunctionName, file, tokens[i].Position)
}
// Function parameters
for i < len(tokens) {
if tokens[i].Kind == token.GroupStart {
groupLevel++
i++
if groupLevel == 1 {
paramsStart = i
}
continue
}
if tokens[i].Kind == token.GroupEnd {
groupLevel--
if groupLevel < 0 {
return errors.New(errors.MissingGroupStart, file, tokens[i].Position)
}
if groupLevel == 0 {
paramsEnd = i
i++
break
}
i++
continue
}
if tokens[i].Kind == token.Invalid {
return errors.New(&errors.InvalidCharacter{Character: tokens[i].Text()}, file, tokens[i].Position)
}
if tokens[i].Kind == token.EOF {
if groupLevel > 0 {
return errors.New(errors.MissingGroupEnd, file, tokens[i].Position)
}
if paramsStart == -1 {
return errors.New(errors.ExpectedFunctionParameters, file, tokens[i].Position)
}
return nil
}
if groupLevel > 0 {
i++
continue
}
return errors.New(errors.ExpectedFunctionParameters, file, tokens[i].Position)
}
// Function definition
for i < len(tokens) {
if tokens[i].Kind == token.BlockStart {
blockLevel++
i++
if blockLevel == 1 {
bodyStart = i
}
continue
}
if tokens[i].Kind == token.BlockEnd {
blockLevel--
if blockLevel < 0 {
return errors.New(errors.MissingBlockStart, file, tokens[i].Position)
}
if blockLevel == 0 {
break
}
i++
continue
}
if tokens[i].Kind == token.Invalid {
return errors.New(&errors.InvalidCharacter{Character: tokens[i].Text()}, file, tokens[i].Position)
}
if tokens[i].Kind == token.EOF {
if blockLevel > 0 {
return errors.New(errors.MissingBlockEnd, file, tokens[i].Position)
}
if bodyStart == -1 {
return errors.New(errors.ExpectedFunctionDefinition, file, tokens[i].Position)
}
return nil
}
if blockLevel > 0 {
i++
continue
}
return errors.New(errors.ExpectedFunctionDefinition, file, tokens[i].Position)
}
name := tokens[nameStart].Text()
body := tokens[bodyStart:i]
function := core.NewFunction(name, file, body)
parameters := tokens[paramsStart:paramsEnd]
count := 0
err := expression.EachParameter(parameters, func(tokens token.List) error {
if len(tokens) != 1 {
return errors.New(errors.NotImplemented, file, tokens[0].Position)
}
name := tokens[0].Text()
register := x64.CallRegisters[count]
uses := token.Count(function.Body, token.Identifier, name)
if uses == 0 {
return errors.New(&errors.UnusedVariable{Name: name}, file, tokens[0].Position)
}
variable := &core.Variable{
Name: name,
Register: register,
Alive: uses,
}
function.AddVariable(variable)
count++
return nil
})
if err != nil {
return err
}
functions <- function
nameStart = -1
paramsStart = -1
bodyStart = -1
i++
}
} }

View File

@ -0,0 +1,14 @@
package scanner
import (
"sync"
"git.akyoto.dev/cli/q/src/build/core"
)
// Scanner is used to scan files before the actual compilation step.
type Scanner struct {
functions chan *core.Function
errors chan error
group sync.WaitGroup
}

View File

@ -0,0 +1,21 @@
package scanner
import "os"
// queue scans the list of files.
func (s *Scanner) queue(files ...string) {
for _, file := range files {
stat, err := os.Stat(file)
if err != nil {
s.errors <- err
return
}
if stat.IsDir() {
s.queueDirectory(file, "")
} else {
s.queueFile(file, "")
}
}
}

View File

@ -0,0 +1,24 @@
package scanner
import (
"path/filepath"
"strings"
"git.akyoto.dev/cli/q/src/build/fs"
)
// queueDirectory queues an entire directory to be scanned.
func (s *Scanner) queueDirectory(directory string, pkg string) {
err := fs.Walk(directory, func(name string) {
if !strings.HasSuffix(name, ".q") {
return
}
fullPath := filepath.Join(directory, name)
s.queueFile(fullPath, pkg)
})
if err != nil {
s.errors <- err
}
}

View File

@ -0,0 +1,15 @@
package scanner
// queueFile queues a single file to be scanned.
func (s *Scanner) queueFile(file string, pkg string) {
s.group.Add(1)
go func() {
defer s.group.Done()
err := s.scanFile(file, pkg)
if err != nil {
s.errors <- err
}
}()
}

View File

@ -0,0 +1,238 @@
package scanner
import (
"fmt"
"os"
"path/filepath"
"git.akyoto.dev/cli/q/src/build/arch/x64"
"git.akyoto.dev/cli/q/src/build/config"
"git.akyoto.dev/cli/q/src/build/core"
"git.akyoto.dev/cli/q/src/build/errors"
"git.akyoto.dev/cli/q/src/build/expression"
"git.akyoto.dev/cli/q/src/build/fs"
"git.akyoto.dev/cli/q/src/build/keyword"
"git.akyoto.dev/cli/q/src/build/token"
)
// scanFile scans a single file.
func (s *Scanner) scanFile(path string, pkg string) error {
contents, err := os.ReadFile(path)
if err != nil {
return err
}
tokens := token.Tokenize(contents)
file := &fs.File{
Tokens: tokens,
Path: path,
}
var (
i = 0
groupLevel = 0
blockLevel = 0
nameStart = -1
paramsStart = -1
paramsEnd = -1
bodyStart = -1
)
for {
for i < len(tokens) && tokens[i].Kind == token.Keyword && tokens[i].Text() == keyword.Import {
i++
if tokens[i].Kind != token.Identifier {
panic("expected package name")
}
packageName := tokens[i].Text()
s.queueDirectory(filepath.Join(config.Library, packageName), packageName)
i++
if tokens[i].Kind != token.NewLine && tokens[i].Kind != token.EOF {
panic("expected newline or eof")
}
i++
}
// Function name
for i < len(tokens) {
if tokens[i].Kind == token.Identifier {
nameStart = i
i++
break
}
if tokens[i].Kind == token.NewLine || tokens[i].Kind == token.Comment {
i++
continue
}
if tokens[i].Kind == token.Invalid {
return errors.New(&errors.InvalidCharacter{Character: tokens[i].Text()}, file, tokens[i].Position)
}
if tokens[i].Kind == token.EOF {
return nil
}
return errors.New(errors.ExpectedFunctionName, file, tokens[i].Position)
}
// Function parameters
for i < len(tokens) {
if tokens[i].Kind == token.GroupStart {
groupLevel++
i++
if groupLevel == 1 {
paramsStart = i
}
continue
}
if tokens[i].Kind == token.GroupEnd {
groupLevel--
if groupLevel < 0 {
return errors.New(errors.MissingGroupStart, file, tokens[i].Position)
}
if groupLevel == 0 {
paramsEnd = i
i++
break
}
i++
continue
}
if tokens[i].Kind == token.Invalid {
return errors.New(&errors.InvalidCharacter{Character: tokens[i].Text()}, file, tokens[i].Position)
}
if tokens[i].Kind == token.EOF {
if groupLevel > 0 {
return errors.New(errors.MissingGroupEnd, file, tokens[i].Position)
}
if paramsStart == -1 {
return errors.New(errors.ExpectedFunctionParameters, file, tokens[i].Position)
}
return nil
}
if groupLevel > 0 {
i++
continue
}
return errors.New(errors.ExpectedFunctionParameters, file, tokens[i].Position)
}
// Function definition
for i < len(tokens) {
if tokens[i].Kind == token.BlockStart {
blockLevel++
i++
if blockLevel == 1 {
bodyStart = i
}
continue
}
if tokens[i].Kind == token.BlockEnd {
blockLevel--
if blockLevel < 0 {
return errors.New(errors.MissingBlockStart, file, tokens[i].Position)
}
if blockLevel == 0 {
break
}
i++
continue
}
if tokens[i].Kind == token.Invalid {
return errors.New(&errors.InvalidCharacter{Character: tokens[i].Text()}, file, tokens[i].Position)
}
if tokens[i].Kind == token.EOF {
if blockLevel > 0 {
return errors.New(errors.MissingBlockEnd, file, tokens[i].Position)
}
if bodyStart == -1 {
return errors.New(errors.ExpectedFunctionDefinition, file, tokens[i].Position)
}
return nil
}
if blockLevel > 0 {
i++
continue
}
return errors.New(errors.ExpectedFunctionDefinition, file, tokens[i].Position)
}
name := tokens[nameStart].Text()
body := tokens[bodyStart:i]
if pkg != "" {
name = fmt.Sprintf("%s.%s", pkg, name)
}
function := core.NewFunction(name, file, body)
parameters := tokens[paramsStart:paramsEnd]
count := 0
err := expression.EachParameter(parameters, func(tokens token.List) error {
if len(tokens) != 1 {
return errors.New(errors.NotImplemented, file, tokens[0].Position)
}
name := tokens[0].Text()
register := x64.CallRegisters[count]
uses := token.Count(function.Body, token.Identifier, name)
if uses == 0 {
return errors.New(&errors.UnusedVariable{Name: name}, file, tokens[0].Position)
}
variable := &core.Variable{
Name: name,
Register: register,
Alive: uses,
}
function.AddVariable(variable)
count++
return nil
})
if err != nil {
return err
}
s.functions <- function
nameStart = -1
paramsStart = -1
bodyStart = -1
i++
}
}

View File

@ -1,37 +1,35 @@
import sys
main() { main() {
x := 0 x := 0
if x != x && x != x { if x != x && x != x {
exit(1) sys.exit(1)
} }
if x == x && x != x { if x == x && x != x {
exit(1) sys.exit(1)
} }
if x != x && x == x { if x != x && x == x {
exit(1) sys.exit(1)
} }
if x == x && x != x && x != x { if x == x && x != x && x != x {
exit(1) sys.exit(1)
} }
if x != x && x == x && x != x { if x != x && x == x && x != x {
exit(1) sys.exit(1)
} }
if x != x && x != x && x == x { if x != x && x != x && x == x {
exit(1) sys.exit(1)
} }
if x == x && x == x && x == x { if x == x && x == x && x == x {
exit(0) sys.exit(0)
} }
exit(1) sys.exit(1)
}
exit(x) {
syscall(60, x)
} }

View File

@ -1,47 +1,45 @@
import sys
main() { main() {
x := 0 x := 0
if x == x && x != x || x != x && x != x { if x == x && x != x || x != x && x != x {
exit(1) sys.exit(1)
} }
if x != x && x == x || x != x && x != x { if x != x && x == x || x != x && x != x {
exit(1) sys.exit(1)
} }
if x != x && x != x || x == x && x != x { if x != x && x != x || x == x && x != x {
exit(1) sys.exit(1)
} }
if x != x && x != x || x != x && x == x { if x != x && x != x || x != x && x == x {
exit(1) sys.exit(1)
} }
if (x == x || x != x) && (x != x || x != x) { if (x == x || x != x) && (x != x || x != x) {
exit(1) sys.exit(1)
} }
if (x != x || x == x) && (x != x || x != x) { if (x != x || x == x) && (x != x || x != x) {
exit(1) sys.exit(1)
} }
if (x != x || x != x) && (x == x || x != x) { if (x != x || x != x) && (x == x || x != x) {
exit(1) sys.exit(1)
} }
if (x != x || x != x) && (x != x || x == x) { if (x != x || x != x) && (x != x || x == x) {
exit(1) sys.exit(1)
} }
if (x == x && x != x || x == x && x == x) && (x == x && x == x || x == x && x != x) { if (x == x && x != x || x == x && x == x) && (x == x && x == x || x == x && x != x) {
if (x != x || x == x) && (x != x || x != x) || (x == x || x != x) && (x != x || x == x) { if (x != x || x == x) && (x != x || x != x) || (x == x || x != x) && (x != x || x == x) {
exit(0) sys.exit(0)
} }
} }
exit(1) sys.exit(1)
}
exit(x) {
syscall(60, x)
} }

View File

@ -1,12 +1,14 @@
import sys
main() { main() {
x := 0 x := 0
if x != x || x != x { if x != x || x != x {
exit(1) sys.exit(1)
} }
if x != x || x != x || x != x { if x != x || x != x || x != x {
exit(1) sys.exit(1)
} }
if x == x || x != x { if x == x || x != x {
@ -14,16 +16,12 @@ main() {
if x == x || x != x || x != x { if x == x || x != x || x != x {
if x != x || x == x || x != x { if x != x || x == x || x != x {
if x != x || x != x || x == x { if x != x || x != x || x == x {
exit(0) sys.exit(0)
} }
} }
} }
} }
} }
exit(1) sys.exit(1)
}
exit(x) {
syscall(60, x)
} }

View File

@ -1,75 +1,73 @@
import sys
main() { main() {
x := 0 x := 0
if x != 0 { if x != 0 {
exit(1) sys.exit(1)
} }
if x > 0 { if x > 0 {
exit(1) sys.exit(1)
} }
if x < 0 { if x < 0 {
exit(1) sys.exit(1)
} }
if 0 != x { if 0 != x {
exit(1) sys.exit(1)
} }
if 0 > x { if 0 > x {
exit(1) sys.exit(1)
} }
if 0 < x { if 0 < x {
exit(1) sys.exit(1)
} }
if x >= 1 { if x >= 1 {
exit(1) sys.exit(1)
} }
if 1 <= x { if 1 <= x {
exit(1) sys.exit(1)
} }
if x + 1 != x + 1 { if x + 1 != x + 1 {
exit(1) sys.exit(1)
} }
if x + 1 != inc(x) { if x + 1 != inc(x) {
exit(1) sys.exit(1)
} }
if x - 1 != dec(x) { if x - 1 != dec(x) {
exit(1) sys.exit(1)
} }
if inc(x) != x + 1 { if inc(x) != x + 1 {
exit(1) sys.exit(1)
} }
if dec(x) != x - 1 { if dec(x) != x - 1 {
exit(1) sys.exit(1)
} }
if x != inc(dec(x)) { if x != inc(dec(x)) {
exit(1) sys.exit(1)
} }
if inc(dec(x)) != x { if inc(dec(x)) != x {
exit(1) sys.exit(1)
} }
if x == 0 { if x == 0 {
exit(0) sys.exit(0)
} }
exit(1) sys.exit(1)
}
exit(x) {
syscall(60, x)
} }
inc(x) { inc(x) {

View File

@ -1,9 +1,7 @@
main() { import sys
exit(f(1) + f(2) + f(3))
}
exit(code) { main() {
syscall(60, code) sys.exit(f(1) + f(2) + f(3))
} }
f(x) { f(x) {

View File

@ -1,3 +1,5 @@
import sys
main() { main() {
x := 10 x := 10
@ -175,13 +177,13 @@ main() {
fail() fail()
} }
exit(0) success()
} }
fail() { fail() {
exit(1) sys.exit(1)
} }
exit(code) { success() {
syscall(60, code) sys.exit(0)
} }

View File

@ -1,9 +1,7 @@
main() { import sys
exit(f(f(f(1))))
}
exit(code) { main() {
syscall(60, code) sys.exit(f(f(f(1))))
} }
f(x) { f(x) {