Skip to content

:string:starts_with: evaluate the pattern argument #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brian-slashguard wants to merge 1 commit into
base: main
Choose a base branch
from
Open

:string:starts_with: evaluate the pattern argument #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions builtin/builtin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,9 +471,15 @@ func match(pattern ast.Atom, subst *unionfind.UnionFind) (bool, *unionfind.Union
if len(pattern.Args) != 2 {
return false, nil, fmt.Errorf("wrong number of arguments for built-in predicate ':string:starts_with': %v", pattern.Args)
}
pat, ok := pattern.Args[1].(ast.Constant)
// Evaluate the pattern through the substitution, as the scrutinee already is,
// so a prefix computed from data works and not only a program literal.
evaluatedPat, err := functional.EvalExpr(pattern.Args[1], subst)
if err != nil {
return false, nil, err
}
pat, ok := evaluatedPat.(ast.Constant)
if !ok || pat.Type != ast.StringType {
return false, nil, fmt.Errorf("2nd arguments must be string constant for ':string:starts_with': %v", pattern)
return false, nil, fmt.Errorf("2nd argument must evaluate to a string for ':string:starts_with': %v", pattern)
}
str, ok := evaluatedArg.(ast.Constant)
if !ok || str.Type != ast.StringType {
Expand Down