Improved parameter handling
All checks were successful
/ test (push) Successful in 14s

This commit is contained in:
Eduard Urbach 2025-06-21 21:28:21 +02:00
parent 3717a61414
commit 320e023d74
Signed by: akyoto
GPG key ID: 49226B848C78F6C8
9 changed files with 45 additions and 21 deletions

View file

@ -32,6 +32,8 @@ var errs = []struct {
{"MissingParameter.q", scanner.MissingParameter},
{"MissingParameter2.q", scanner.MissingParameter},
{"MissingParameter3.q", scanner.MissingParameter},
{"MissingParameter4.q", scanner.MissingParameter},
{"MissingParameter5.q", scanner.MissingParameter},
{"MissingType.q", scanner.MissingType},
}

View file

@ -63,7 +63,7 @@ func scanSignature(file *fs.File, tokens token.List, i int, delimiter token.Kind
return nil, i, errors.New(InvalidFunctionDefinition, file, tokens[i].Position)
}
return nil, i, nil
return nil, i, errors.New(InvalidFunctionDefinition, file, tokens[i].Position)
}
if groupLevel > 0 {
@ -98,7 +98,10 @@ func scanSignature(file *fs.File, tokens token.List, i int, delimiter token.Kind
return nil, i, errors.New(MissingType, file, param[0].End())
}
function.Input = append(function.Input, core.NewParameter(param))
function.Input = append(function.Input, &core.Parameter{
Name: param[0].String(file.Bytes),
TypeTokens: param[1:],
})
}
if typeStart != -1 {
@ -109,8 +112,30 @@ func scanSignature(file *fs.File, tokens token.List, i int, delimiter token.Kind
outputTokens := tokens[typeStart:typeEnd]
if len(outputTokens) == 0 {
return nil, i, errors.New(MissingParameter, file, tokens[typeStart].Position)
}
errorPos := token.Position(typeStart)
for param := range outputTokens.Split {
function.Output = append(function.Output, core.NewParameter(param))
if len(param) == 0 {
return nil, i, errors.New(MissingParameter, file, errorPos)
}
if len(param) == 1 {
function.Output = append(function.Output, &core.Parameter{
Name: "",
TypeTokens: param,
})
} else {
function.Output = append(function.Output, &core.Parameter{
Name: param[0].String(file.Bytes),
TypeTokens: param[1:],
})
}
errorPos = param[len(param)-1].End() + 1
}
}

View file

@ -0,0 +1 @@
f() -> {}

View file

@ -0,0 +1 @@
f() -> (int,) {}