diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-11-22 19:41:45 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-11-22 19:43:28 +0900 |
| commit | 4a197313d58abc9ef249be9e1934b98dbbee93cb (patch) | |
| tree | ac41a0bd33eb0183206d4220360fa0545353a26b | |
| parent | f7c725ea5722959145db51847214897bad8e8b01 (diff) | |
internal/rosa/azalea: argument substitutions
These are run before the value is ever used. For implementing the source
TOFU update helper.
Signed-off-by: Ophestra <cat@gensokyo.uk>
| -rw-r--r-- | internal/rosa/azalea/evaluate.go | 71 | ||||
| -rw-r--r-- | internal/rosa/azalea/evaluate_test.go | 6 | ||||
| -rw-r--r-- | internal/rosa/state.go | 1 |
3 files changed, 59 insertions, 19 deletions
diff --git a/internal/rosa/azalea/evaluate.go b/internal/rosa/azalea/evaluate.go index 85e20583..40825d0a 100644 --- a/internal/rosa/azalea/evaluate.go +++ b/internal/rosa/azalea/evaluate.go @@ -103,16 +103,27 @@ func (e UndefinedError) Error() string { } // evaluate is evaluateAny with a type parameter. -func evaluate[T Value](d PF, s []Frame, expr any, rp *T) bool { - return evaluateAny(d, s, expr, rp) +func evaluate[T Value]( + d PF, + s []Frame, + sub Substitutions, + expr any, + rp *T, +) bool { + return evaluateAny(d, s, sub, expr, rp) } // evaluateArray evaluates expr and returns its values as a slice. -func evaluateArray[T Value](d PF, s []Frame, expr Array) []T { +func evaluateArray[T Value]( + d PF, + s []Frame, + sub Substitutions, + expr Array, +) []T { r := make([]T, 0, len(expr)) for i := range expr { var _r T - if evaluate(d, s, expr[i], &_r) { + if evaluate(d, s, sub, expr[i], &_r) { r = append(r, _r) } } @@ -272,8 +283,19 @@ var ( ErrInvalidSpecial = errors.New("special must not be common or bound to scope") ) +// Substitutions describe argument substitutions for package declarations. +type Substitutions map[Ident]func( + name unique.Handle[Ident], + prev any, +) (v any, ok bool) + // evaluateAny implements [Evaluate]. -func evaluateAny(d PF, s []Frame, expr, rp any) bool { +func evaluateAny( + d PF, + s []Frame, + sub Substitutions, + expr, rp any, +) bool { defer func() { r := recover() if r == nil { @@ -336,17 +358,17 @@ func evaluateAny(d PF, s []Frame, expr, rp any) bool { store(rp, Nil{}) return true default: - return evaluateAny(d, s, v, rp) + return evaluateAny(d, s, sub, v, rp) } default: - return evaluateAny(d, s, e[0], rp) + return evaluateAny(d, s, sub, e[0], rp) } } var v strings.Builder for i := range e { var _r string - if evaluate(d, s, e[i], &_r) { + if evaluate(d, s, sub, e[i], &_r) { v.WriteString(_r) } } @@ -356,19 +378,19 @@ func evaluateAny(d PF, s []Frame, expr, rp any) bool { case Array: if len(e) > 0 && len(e[0]) == 1 { if _, ok := e[0][0].(Int); ok { - store(rp, evaluateArray[int64](d, s, e)) + store(rp, evaluateArray[int64](d, s, sub, e)) return true } } - store(rp, evaluateArray[string](d, s, e)) + store(rp, evaluateArray[string](d, s, sub, e)) return true case []KV: r := make([][2]string, 0, len(e)) for i := range e { var _r [2]string - if evaluate(d, s, e[i].K, &_r[0]) && - (e[i].V == nil || evaluate(d, s, e[i].V, &_r[1])) { + if evaluate(d, s, sub, e[i].K, &_r[0]) && + (e[i].V == nil || evaluate(d, s, sub, e[i].V, &_r[1])) { r = append(r, _r) } } @@ -403,6 +425,11 @@ func evaluateAny(d PF, s []Frame, expr, rp any) bool { fp.Val = maps.Clone(f.V) } + var _sub func(name unique.Handle[Ident], prev any) (v any, ok bool) + if sub != nil && e.Package { + _sub = sub[e.Ident] + } + args: for _, arg := range e.Args { names := make([]unique.Handle[Ident], len(arg.K)) @@ -454,7 +481,7 @@ func evaluateAny(d PF, s []Frame, expr, rp any) bool { } } - if !evaluateAny(d, s, arg.V, &farg.V) { + if !evaluateAny(d, s, sub, arg.V, &farg.V) { farg.V = nil } for _, name := range names { @@ -465,7 +492,14 @@ func evaluateAny(d PF, s []Frame, expr, rp any) bool { if fp.Val == nil { fp.Val = make(map[unique.Handle[Ident]]any) } - (*fp).Val[name] = farg.V + + v := farg.V + if _sub != nil { + if _v, _ok := _sub(name, farg.V); _ok { + v = _v + } + } + (*fp).Val[name] = v } } } @@ -494,7 +528,12 @@ func evaluateAny(d PF, s []Frame, expr, rp any) bool { } // Evaluate evaluates a statement and returns its value. -func Evaluate[T any](d PF, s []Frame, expr any) (v T, set bool, err error) { +func Evaluate[T any]( + d PF, + s []Frame, + sub Substitutions, + expr any, +) (v T, set bool, err error) { defer func() { r := recover() if r == nil { @@ -507,6 +546,6 @@ func Evaluate[T any](d PF, s []Frame, expr any) (v T, set bool, err error) { } err = _err }() - set = evaluateAny(d, s, expr, &v) + set = evaluateAny(d, s, sub, expr, &v) return } diff --git a/internal/rosa/azalea/evaluate_test.go b/internal/rosa/azalea/evaluate_test.go index edd72432..45a23e2c 100644 --- a/internal/rosa/azalea/evaluate_test.go +++ b/internal/rosa/azalea/evaluate_test.go @@ -324,7 +324,7 @@ func TestEvaluate(t *testing.T) { } set = true return - }, tc.s, expr) + }, tc.s, nil, expr) if set != (err == nil) { t.Error("Evaluate: unexpected unset") } @@ -417,7 +417,7 @@ func TestEvaluateGCC(t *testing.T) { unique.Make(Ident("value")): "\xfd", }}, }, - }}, gcc); err != nil { + }}, nil, gcc); err != nil { t.Fatal(err) } else if r != "\x00" { t.Fatalf("package: %q", r) @@ -520,7 +520,7 @@ func BenchmarkEvaluate(b *testing.B) { FArgs, ) (v any, set bool, err error) { return - }, s, gcc); err != nil { + }, s, nil, gcc); err != nil { b.Fatal(err) } } diff --git a/internal/rosa/state.go b/internal/rosa/state.go index 9d13cab2..7bb4ebfe 100644 --- a/internal/rosa/state.go +++ b/internal/rosa/state.go @@ -1338,6 +1338,7 @@ func (s *S) RegisterAzalea(r io.Reader, name string, b fs.FS) error { v, set, err := azalea.Evaluate[cachedArtifact]( (&evalContext{b, f, t}).pf, t.getStack(), + nil, *f, ) if err != nil { |
