neemek/anglais
1
1
Fork 0
Code Issues Pull requests Releases 1 Wiki Activity Actions

improve errors, add warnings, add some compile-time optimizations, fix variables, make sure conditionals and loops get booleans, affirm types, keep variables to a single type

Browse source
This commit is contained in:
Neemek 2025-03-20 12:13:30 +01:00
parent e34b423967
commit b1b8e61f57
Signed by: neemek
GPG key ID: 28360A8951CD0E9B
14 changed files with 435 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

32
cli/main.go
View file

@ -14,8 +14,9 @@ type Context struct {
}
type RunCmd struct {
Bytecode bool `name:"bytecode" short:"c" help:"Run file as if it's bytecode"`
File string `arg:"" name:"file" help:"File to read program from" type:"existingfile"`
IgnoreWarnings bool `name:"ignore-warnings" help:"Ignore warning messages"`
Bytecode bool `name:"bytecode" short:"c" help:"Run file as if it's bytecode"`
File string `arg:"" name:"file" help:"File to read program from" type:"existingfile"`
}
// WorkingDirectoryResolver resolves imports relative to the working directory
@ -30,9 +31,9 @@ func (r *WorkingDirectoryResolver) Resolve(path string) (core.Node, error) {
return nil, err
}
str := string(f)
src := string(f)
l := core.NewLexer(str)
l := core.NewLexer(src)
tokens, err := l.Tokenize()
if err != nil {
@ -107,7 +108,7 @@ func (cmd *RunCmd) Run(ctx *Context) error {
if ctx.Debug {
log.Println("Initialized compiler")
}
c := core.NewCompiler()
c := core.NewCompiler([]rune(src))
if ctx.Debug {
log.Println("Setting imports resolver")
@ -125,11 +126,19 @@ func (cmd *RunCmd) Run(ctx *Context) error {
if err != nil {
var e core.CompilerError
if errors.As(err, &e) {
log.Fatal(e.Format([]rune(src)))
log.Fatal(e.Format())
}
log.Fatal(err)
}
// if there were non-critical warnings, report them
if !cmd.IgnoreWarnings && len(c.Warnings) != 0 {
for _, warning := range c.Warnings {
log.Println(warning.Format())
}
log.Fatal("compiler reported warning(s) (ignore warnings with the --ignore-warnings option)")
}
chunk = c.Chunk
} else {
if ctx.Debug {
@ -216,7 +225,7 @@ func (cmd *CompileCmd) Run(ctx *Context) error {
log.Println("Initialized compiler")
}
c := core.NewCompiler()
c := core.NewCompiler([]rune(src))
if ctx.Debug {
log.Println("Setting import resolver")
@ -235,11 +244,18 @@ func (cmd *CompileCmd) Run(ctx *Context) error {
if err != nil {
var e core.CompilerError
if errors.As(err, &e) {
log.Fatal(e.Format([]rune(src)))
log.Fatal(e.Format())
}
log.Fatal(err)
}
// if there were non-critical warnings, report them
if len(c.Warnings) != 0 {
for _, warning := range c.Warnings {
log.Println(warning.Format())
}
}
if ctx.Debug {
log.Println("Registering GOB types")
}