larvit/fejkdata
3
0
Fork 0
Code Pull Requests 1 Actions Activity

Hold a calc operand's draw for the expansion

Browse Source 
A field the format rendered and a calc read was drawn twice, so the operand
shown could differ from the operand computed — the same disagreement the
dotted-path rule already fences, in its plainest spelling. The README
carried it as a caveat, which is what a rule like this exists to remove.

A calc operand now joins the names an expansion holds, so it is drawn once
and every later read of it — the calc, and any bare token spelling it —
sees that draw. The hold stays per expansion: each repeat iteration and each
nested template draws its own.

expand reads a calc's operands before the call and hands over their values,
so a builtin takes (emitted, operands) rather than the sibling fields, and
the evaluator indexes that slice instead of walking the node tree. That is
what keeps the draws a local. Handing them to a builtin instead lets them
escape through an indirect call, which put two maps on the heap for every
held format, calc or not: BenchmarkBound went 56 B/5 allocs -> 744 B/10.

Measured against main: Bound 359 -> 349 ns at 56 B/5 allocs, unchanged;
Calc 416 -> 577 ns and one more alloc, which is what the correlation costs.

Validation is unchanged: t.bound still carries only the levels a dotted
token reads, so the overlap fences fence exactly what they did.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
M
2026-08-30 23:09:58 +02:00
committed by lilleman-tw
parent 4f87a4dd9e
commit 9ed0d3bf55
5 changed files with 155 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builtins.go
+10 -10
View File
@@ -31,35 +31,35 @@ var builtins = map[string]builtin{
"ulid": {arity: 0, prep: generate(ulid)},
"nanoid": {arity: 1, check: posIntArg, prep: func(a []string) callFn {
n := atoi(a[0])
return func(s *session, _ string, _ map[string]node) string { return nanoid(s, n) }
return func(s *session, _ string, _ []string) string { return nanoid(s, n) }
}},
"hex": {arity: 1, check: posIntArg, prep: func(a []string) callFn {
n := atoi(a[0])
return func(s *session, _ string, _ map[string]node) string { return randHex(s, n) }
return func(s *session, _ string, _ []string) string { return randHex(s, n) }
}},
"base64": {arity: 1, check: posIntArg, prep: func(a []string) callFn {
n := atoi(a[0])
return func(s *session, _ string, _ map[string]node) string {
return func(s *session, _ string, _ []string) string {
return base64.StdEncoding.EncodeToString(randBytes(s, n))
}
}},
"int": {arity: 2, check: intRangeArgs, prep: func(a []string) callFn {
lo, span := atoi(a[0]), atoi(a[1])-atoi(a[0])+1
return func(s *session, _ string, _ map[string]node) string { return strconv.Itoa(lo + s.IntN(span)) }
return func(s *session, _ string, _ []string) string { return strconv.Itoa(lo + s.IntN(span)) }
}},
"float": {arity: 3, check: floatArgs, prep: func(a []string) callFn {
lo, _ := strconv.ParseFloat(a[0], 64)
hi, _ := strconv.ParseFloat(a[1], 64)
dp := atoi(a[2])
return func(s *session, _ string, _ map[string]node) string {
return func(s *session, _ string, _ []string) string {
return strconv.FormatFloat(lo+s.Float64()*(hi-lo), 'f', dp, 64)
}
}},
"iban": {arity: 1, check: ibanArg, prep: func(a []string) callFn {
cc := a[0]
return func(s *session, _ string, _ map[string]node) string { return iban(s, cc) }
return func(s *session, _ string, _ []string) string { return iban(s, cc) }
}},
// calc is the one builtin that reads the sibling fields (to render its operands);
// calc is the one builtin that names operands (expand reads them for it);
// every other ignores them. 1 or 2 args: the expression and an optional decimals.
"calc": {arity: -1, check: checkCalc, prep: calcPrep},
// seq is the one stateful builtin: a per-session counter from 1, advancing on
@@ -70,7 +70,7 @@ var builtins = map[string]builtin{
if len(a) == 1 {
key = a[0]
}
return func(s *session, _ string, _ map[string]node) string {
return func(s *session, _ string, _ []string) string {
return strconv.FormatUint(s.next(key), 10)
}
}},
@@ -81,13 +81,13 @@ var builtins = map[string]builtin{
// lifts that one function into the prep every registry entry supplies.
func derive(f func(emitted string) string) func([]string) callFn {
return func([]string) callFn {
return func(_ *session, emitted string, _ map[string]node) string { return f(emitted) }
return func(_ *session, emitted string, _ []string) string { return f(emitted) }
}
}
func generate(f func(rng) string) func([]string) callFn {
return func([]string) callFn {
return func(s *session, _ string, _ map[string]node) string { return f(s) }
return func(s *session, _ string, _ []string) string { return f(s) }
}
}