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

Let a declared datatype win over a column read, count a repeat as written, refuse null alone on stdin and a second leading slash, and hand NewTemplate stdin as sent

Browse Source
This commit is contained in:
Lilleman auf Larv
2026-10-07 22:55:09 +02:00
committed by Lillem4n
parent 1a022dbd79
commit 6b26b18104
12 changed files with 73 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
datatype.go
+4 -13
View File
@@ -100,7 +100,7 @@ func columnDatatype(n node) DataType {
// itemDatatype is the datatype a column item declares, else that of the column it reads.
func itemDatatype(t *template) DataType {
if t.datatype == DataTypeString && t.readsColumn != nil {
if !t.declared && t.readsColumn != nil {
return columnDatatype(t.readsColumn.column)
}
return t.datatype
@@ -139,7 +139,7 @@ const (
func kindOf(t *template) itemKind {
switch {
case t.datatype != DataTypeString:
case t.declared:
return kindDeclares
case itemDatatype(t) != DataTypeString:
return kindReads
@@ -187,12 +187,12 @@ func (c clash) retypeRead() error {
if c.fits() {
return fmt.Errorf("%s, so %s", c.held, typedAs(c.fix, c.want))
}
return fmt.Errorf("%s, so to read %q as text, %s", c.held, c.fix.format, asText(c.fix))
return fmt.Errorf("%s, so to read %q as text, %s", c.held, c.fix.format, typedAs(c.fix, DataTypeString))
}
func (c clash) textBesideRead() error {
if !c.fits() {
return fmt.Errorf(`item %q is not %s, the datatype item %q takes from the column it reads; to read that column as text, %s`, c.fix.format, datatype.Noun(c.want), c.other.format, asText(c.other))
return fmt.Errorf(`item %q is not %s, the datatype item %q takes from the column it reads; to read that column as text, %s`, c.fix.format, datatype.Noun(c.want), c.other.format, typedAs(c.other, DataTypeString))
}
return c.declareText()
}
@@ -212,12 +212,3 @@ func typedAs(t *template, d DataType) string {
}
return fmt.Sprintf(`give %q "datatype": %q`, t.format, d)
}
// asText names the spelling that reads the column a column-read item reads as text, keeping the
// other keys an object item carries.
func asText(t *template) string {
if t.fromString {
return fmt.Sprintf(`write {"format":"{text}","text":%q}`, t.format)
}
return fmt.Sprintf(`set its "format" to "{text}" and add "text": %q`, t.format)
}