Draw every {…} afresh, keep a pick only by name, and delete drawGroup with the hold and draw fences

draws.go

@@ -1,11 +1,9 @@
 package fejkdata
 
-import "strings"
-
-// drawMemo is what a hold, a draw group or a named pick has drawn: the variant each level was
-// drawn as, so every path under it reads one variant; the value each read produced, by its path,
-// so the same read written twice reads one value; the frames a read opens for the name
-// scopes around where it lands (enter); and the rows drawn by each step down after a "..", by level.
+// drawMemo is what a named pick has drawn: the variant each level was drawn as, so every path
+// under it reads one variant; the value each read produced, by its path, so the same read written
+// twice reads one value; the frames a read opens for the name scopes around where it lands
+// (enter); and the rows drawn by each step down after a "..", by level.
 type drawMemo struct {
 	variant       map[string]node
 	value         map[string]readValue
@@ -30,39 +28,19 @@ func (m *drawMemo) stepDownPins(pins *pinSet, t *table, levels []string, at int)
 	return p
 }
 
-// groupDraws is what one render's draw group has drawn for its reference paths: a memo, and the
-// table rows those paths pinned.
-type groupDraws struct {
-	memo drawMemo
-	pins pinSet
-}
-
 // readValue is what one read drew: its text, and whether it landed on a null.
 type readValue struct {
 	text string
 	null bool
 }
 
-// renderTrace is a test's view of the fields a render reads; nil outside a test.
-type renderTrace func(group string, row renderedRow, a arm)
-
-// renderDraws is one render's reference draws: the unnamed draw group's, and each named one's;
-// a test's trace of its reads; and the frames of the name scopes rendering.
-type renderDraws struct {
-	unnamed    groupDraws
-	named      map[string]*groupDraws
-	trace      renderTrace
-	frameStack *frameStack
-}
-
-// renderScope is where a render reads its reference paths: its reference draws, in the draw group of the
-// template rendering; and row, the row of the table rendering, which its columns read. It passes
-// by value, and what is read from it reaches a map key, an interface or a func value only as a
-// copy; else sc, and with it every render's draws, moves to the heap.
+// renderScope is where a render reads: the frames of the name scopes rendering; and row, the row
+// of the table rendering, which its columns read. It passes by value, and what is read from it
+// reaches a map key, an interface or a func value only as a copy; else sc, and with it every
+// render's frames, moves to the heap.
 type renderScope struct {
-	draws *renderDraws
-	group string
-	row   renderedRow
+	frames *frameStack
+	row    renderedRow
 	// base is the depth of the frame stack when the read rendering the category entered it,
 	// below which no frame is the category's.
 	base int
@@ -77,14 +55,6 @@ type renderedRow struct {
 	index int
 }
 
-// in is the scope t renders in: its draw group where it names one, else its caller's.
-func (sc renderScope) in(t *template) renderScope {
-	if t.link.drawGroupKey != "" {
-		sc.group = t.link.drawGroupKey
-	}
-	return sc
-}
-
 // at is the scope n, the leaf of a path that pinned its rows in pins, renders in: where n is a
 // table's row or column, at the row pins holds for that table.
 func (sc renderScope) at(n node, pins *pinSet) renderScope {
@@ -104,18 +74,3 @@ func (sc renderScope) rowOf(t *table) int {
 	}
 	return sc.row.index
 }
-
-func (sc renderScope) groupDraws() *groupDraws {
-	if sc.group == "" {
-		return &sc.draws.unnamed
-	}
-	d, drew := sc.draws.named[sc.group]
-	if !drew {
-		if sc.draws.named == nil {
-			sc.draws.named = map[string]*groupDraws{}
-		}
-		d = &groupDraws{}
-		sc.draws.named[strings.Clone(sc.group)] = d
-	}
-	return d
-}