Name a cell's line in its link-time errors, and say where a format holding a reference compiles

This commit is contained in:
2026-09-24 22:43:05 +02:00
committed by Lillem4n
parent 1bf684aab2
commit 2e778f3b31
3 changed files with 8 additions and 6 deletions
+4 -5
View File
@@ -41,7 +41,7 @@ func (*null) isNode() {}
// template renders a format string, substituting {tokens} from fields. A bare // template renders a format string, substituting {tokens} from fields. A bare
// JSON string is a template with no fields. repeat (default 1) renders that format // JSON string is a template with no fields. repeat (default 1) renders that format
// that many times and joins the results with separator (default ""), each render // that many times and joins the results with separator (default ""), each render
// an independent pick. // an independent pick. A format holding a reference compiles in `linkTemplateRefs`.
type template struct { type template struct {
// Filled by `compileString`, `compileTemplate` and `table.compileWhole`: // Filled by `compileString`, `compileTemplate` and `table.compileWhole`:
format string format string
@@ -207,14 +207,13 @@ func compileString(s string) (node, error) {
return nil, err return nil, err
} }
t := &template{format: s, repeat: 1, fromString: true} t := &template{format: s, repeat: 1, fromString: true}
if err := t.compileUnbound(); err != nil { if err := t.compileRefFree(); err != nil {
return nil, err return nil, err
} }
return t, nil return t, nil
} }
// compileUnbound compiles a format holding no reference; `linkTemplateRefs` compiles the rest. func (t *template) compileRefFree() error {
func (t *template) compileUnbound() error {
if len(refTokens(t.format)) > 0 { if len(refTokens(t.format)) > 0 {
return nil return nil
} }
@@ -339,7 +338,7 @@ func compileTemplate(m map[string]any, pos position) (node, error) {
return nil, err return nil, err
} }
t := &template{format: o.format, fields: fields, repeat: o.repeat, separator: o.separator, datatype: o.datatype, drawGroup: o.group, record: fieldPos == inColumn} t := &template{format: o.format, fields: fields, repeat: o.repeat, separator: o.separator, datatype: o.datatype, drawGroup: o.group, record: fieldPos == inColumn}
if err := t.compileUnbound(); err != nil { if err := t.compileRefFree(); err != nil {
return nil, err return nil, err
} }
return t, nil return t, nil
+3
View File
@@ -91,6 +91,9 @@ func linkTemplateRefs(folder []string, path, category string, t *template, root
if len(names) == 0 { if len(names) == 0 {
return nil return nil
} }
if t.cellOf != nil {
path = fmt.Sprintf("%s, line %d", path, t.cellRow+2)
}
t.refs = make(map[string]refBinding, len(names)) t.refs = make(map[string]refBinding, len(names))
t.refHeads = make(map[string]node, len(names)) t.refHeads = make(map[string]node, len(names))
for _, name := range names { for _, name := range names {
+1 -1
View File
@@ -335,7 +335,7 @@ func (t *table) compileWhole(format string) error {
} }
t.format = &template{format: format, fields: t.fields, repeat: 1, record: true, table: t} t.format = &template{format: format, fields: t.fields, repeat: 1, record: true, table: t}
t.whole = &row{t} t.whole = &row{t}
return t.format.compileUnbound() return t.format.compileRefFree()
} }
// setTablePaths gives every table the path a selector on it is written at, before a // setTablePaths gives every table the path a selector on it is written at, before a