From bad15a5bdb21690018847e9823aecc16f7ea130d Mon Sep 17 00:00:00 2001 From: Lilleman auf Larv Date: Tue, 29 Sep 2026 11:22:29 +0200 Subject: [PATCH] Name formatOps' held entry firstReach, and checkNameHeld's path spelling path --- format.go | 12 ++++++------ holdfence.go | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/format.go b/format.go index 2d25a8a..97d2704 100644 --- a/format.go +++ b/format.go @@ -382,26 +382,26 @@ type op struct { type formatOps struct { ops []op grow int - held map[string]heldName + held map[string]firstReach heldLocal bool // some held name is not a reference path, so expand makes a hold } -// heldName is how a format first reaches a held name: the reader holding it, for +// firstReach is how a format first reaches a held name: the reader holding it, for // error messages, and the first path starting from it, "" where none does. -type heldName struct { +type firstReach struct { holder string path string } func (c *formatOps) holdName(a arm, label string) { if c.held == nil { - c.held = map[string]heldName{} + c.held = map[string]firstReach{} } if !isRef(a.head) || len(a.tail) == 0 { c.heldLocal = true } - h, named := c.held[a.head] - if !named { + h, seen := c.held[a.head] + if !seen { h.holder = label } if len(a.tail) > 0 && h.path == "" { diff --git a/holdfence.go b/holdfence.go index ca30e1a..b754fdd 100644 --- a/holdfence.go +++ b/holdfence.go @@ -71,14 +71,14 @@ func checkNameHeld(t *template, name string, readers []reader) error { if len(held) == 0 { return nil // a fixed head holds nothing to reach } - reader := t.compiled.held[name].path + path := t.compiled.held[name].path seen := map[node]bool{} for _, e := range renderEdges(t) { if e.read.head == name || !renders(e.to, held, seen) { continue } - if reader != "" { - return fmt.Errorf("%s renders %q, which {%s} reads a path into; name the fields you want instead", e.reached(), name, reader) + if path != "" { + return fmt.Errorf("%s renders %q, which {%s} reads a path into; name the fields you want instead", e.reached(), name, path) } return fmt.Errorf("%s renders %q, which a {%s()} also reads; reach it one way so it is drawn once", e.reached(), name, operandReader(t, name)) }