Scope the layout quote outside selectors and prove parent-keyed names in their own function

This commit is contained in:
2026-09-18 18:26:41 +02:00
parent 2dcc31fa63
commit 7d50f43d0b
2 changed files with 21 additions and 11 deletions
+15 -5
View File
@@ -228,15 +228,19 @@ func (t *table) bindOptions(o tableOptionValues) error {
if err := t.indexKeys(); err != nil {
return err
}
if err := t.proveNamesInsideParent(); err != nil {
return err
}
return t.sumWeights()
}
// indexKeys proves every key names one row, and keeps the index a link is proved by;
// without a key, a name names one row inside its parent.
func (t *table) indexKeys() error {
if t.key < 0 {
// proveNamesInsideParent proves a name without a key names one row inside its parent.
func (t *table) proveNamesInsideParent() error {
if t.key >= 0 || t.name < 0 {
return nil
}
inside := make(map[string]int, t.rows())
for r := 0; r < t.rows() && t.name >= 0; r++ {
for r := 0; r < t.rows(); r++ {
k := t.cell(r, t.parent) + "\t" + t.cell(r, t.name)
if first, dup := inside[k]; dup {
return fmt.Errorf("%s line %d: name %q repeats line %d inside %s %q; a name selects one row inside its parent", t.file, r+2, t.cell(r, t.name), first+2, t.columns[t.parent], t.cell(r, t.parent))
@@ -244,6 +248,12 @@ func (t *table) indexKeys() error {
inside[k] = r
}
return nil
}
// indexKeys proves every key names one row, and keeps the index a link is proved by.
func (t *table) indexKeys() error {
if t.key < 0 {
return nil
}
t.byKey = make(map[string]int, t.rows())
for r := 0; r < t.rows(); r++ {
+1 -1
View File
@@ -98,7 +98,7 @@ func splitArgs(s string) []string {
depth, quoted, start := 0, false, 0
for i := 0; i < len(s); i++ {
switch c := s[i]; {
case c == '\'':
case c == '\'' && depth == 0:
quoted = !quoted
case quoted:
case c == '[':