rename View.AnyValue to Cell and move View.ReflectValue to ReflectCellView.ReflectCell

Author: ungerik

anyvaluesview.go

@@ -1,9 +1,5 @@
 package retable
 
-import (
-	"reflect"
-)
-
 var _ View = new(AnyValuesView)
 
 // AnyValuesView is a View implementation
@@ -25,7 +21,7 @@ func NewAnyValuesViewFrom(source View) *AnyValuesView {
 	for row := 0; row < source.NumRows(); row++ {
 		view.Rows[row] = make([]any, len(source.Columns()))
 		for col := range view.Rows[row] {
-			view.Rows[row][col] = source.AnyValue(row, col)
+			view.Rows[row][col] = source.Cell(row, col)
 		}
 	}
 	return view
@@ -35,16 +31,9 @@ func (view *AnyValuesView) Title() string     { return view.Tit }
 func (view *AnyValuesView) Columns() []string { return view.Cols }
 func (view *AnyValuesView) NumRows() int      { return len(view.Rows) }
 
-func (view *AnyValuesView) AnyValue(row, col int) any {
+func (view *AnyValuesView) Cell(row, col int) any {
 	if row < 0 || col < 0 || row >= len(view.Rows) || col >= len(view.Rows[row]) {
 		return nil
 	}
 	return view.Rows[row][col]
 }
-
-func (view *AnyValuesView) ReflectValue(row, col int) reflect.Value {
-	if row < 0 || col < 0 || row >= len(view.Rows) || col >= len(view.Rows[row]) {
-		return reflect.Value{}
-	}
-	return reflect.ValueOf(view.Rows[row][col])
-}

cellformatter.go

@@ -30,7 +30,7 @@ func (f CellFormatterFunc) FormatCell(ctx context.Context, view View, row, col i
 type PrintfCellFormatter string
 
 func (format PrintfCellFormatter) FormatCell(ctx context.Context, view View, row, col int) (str string, raw bool, err error) {
-	return fmt.Sprintf(string(format), view.AnyValue(row, col)), false, nil
+	return fmt.Sprintf(string(format), view.Cell(row, col)), false, nil
 }
 
 // PrintfRawCellFormatter implements CellFormatter by calling
@@ -39,15 +39,15 @@ func (format PrintfCellFormatter) FormatCell(ctx context.Context, view View, row
 type PrintfRawCellFormatter string
 
 func (format PrintfRawCellFormatter) FormatCell(ctx context.Context, view View, row, col int) (str string, raw bool, err error) {
-	return fmt.Sprintf(string(format), view.AnyValue(row, col)), true, nil
+	return fmt.Sprintf(string(format), view.Cell(row, col)), true, nil
 }
 
 // SprintCellFormatter returns a CellFormatter
 // that formats a cell's value using fmt.Sprint
 // and returns the result together with the rawResult argument.
 func SprintCellFormatter(rawResult bool) CellFormatter {
 	return CellFormatterFunc(func(ctx context.Context, view View, row, col int) (string, bool, error) {
-		return fmt.Sprint(view.AnyValue(row, col)), rawResult, nil
+		return fmt.Sprint(view.Cell(row, col)), rawResult, nil
 	})
 }
 
@@ -80,7 +80,7 @@ func TryFormattersOrSprint(formatters ...CellFormatter) CellFormatter {
 
 		// Fallback for no formatters passed or when
 		// all formatters returned errors.ErrUnsupported
-		v := view.ReflectValue(row, col)
+		v := AsReflectCellView(view).ReflectCell(row, col)
 		if IsNullLike(v) {
 			return "", false, nil
 		}
@@ -106,9 +106,9 @@ func (rawStr RawCellString) FormatCell(ctx context.Context, view View, row, col
 type LayoutFormatter string
 
 func (f LayoutFormatter) FormatCell(ctx context.Context, view View, row, col int) (str string, raw bool, err error) {
-	formatter, ok := view.AnyValue(row, col).(interface{ Format(string) string })
+	formatter, ok := view.Cell(row, col).(interface{ Format(string) string })
 	if !ok {
-		return "", false, fmt.Errorf("%T does not implement interface{ Format(string) string }", view.AnyValue(row, col))
+		return "", false, fmt.Errorf("%T does not implement interface{ Format(string) string }", view.Cell(row, col))
 	}
 	return formatter.Format(string(f)), false, nil
 }
@@ -119,7 +119,7 @@ func (f LayoutFormatter) FormatCell(ctx context.Context, view View, row, col int
 type StringIfTrue string
 
 func (f StringIfTrue) FormatCell(ctx context.Context, view View, row, col int) (str string, raw bool, err error) {
-	if view.ReflectValue(row, col).Bool() {
+	if view.Cell(row, col).(bool) {
 		return string(f), false, nil
 	}
 	return "", false, nil
@@ -131,7 +131,7 @@ func (f StringIfTrue) FormatCell(ctx context.Context, view View, row, col int) (
 type RawStringIfTrue string
 
 func (f RawStringIfTrue) FormatCell(ctx context.Context, view View, row, col int) (str string, raw bool, err error) {
-	if view.ReflectValue(row, col).Bool() {
+	if view.Cell(row, col).(bool) {
 		return string(f), true, nil
 	}
 	return "", true, nil
@@ -203,7 +203,7 @@ func ReflectCellFormatterFunc(function any, rawResult bool) (formatter CellForma
 			args[ctxIndex] = reflect.ValueOf(ctx)
 		}
 		if valIndex != -1 {
-			args[valIndex] = view.ReflectValue(row, col)
+			args[valIndex] = AsReflectCellView(view).ReflectCell(row, col)
 		}
 		res := fv.Call(args)
 		if errIndex != -1 && !res[errIndex].IsNil() {

csvtable/writer.go

@@ -309,7 +309,7 @@ func (w *Writer[T]) cellString(ctx context.Context, view retable.View, row, col
 	// Continue after errors.ErrUnsupported
 
 	// Use fallback methods for formatting
-	v := view.ReflectValue(row, col)
+	v := retable.AsReflectCellView(view).ReflectCell(row, col)
 	if retable.IsNullLike(v) {
 		return w.escapeString(w.nilValue, false), nil
 	}

derefview.go

@@ -7,22 +7,22 @@ import "reflect"
 // by calling reflect.Value.Elem()
 // wich might panic if the contained value
 // does not support calling the Elem method.
-func DerefView(source View) View {
-	return derefView{source: source}
+func DerefView(source View) ReflectCellView {
+	return derefView{source: AsReflectCellView(source)}
 }
 
 type derefView struct {
-	source View
+	source ReflectCellView
 }
 
 func (v derefView) Title() string     { return v.source.Title() }
 func (v derefView) Columns() []string { return v.source.Columns() }
 func (v derefView) NumRows() int      { return v.source.NumRows() }
 
-func (v derefView) AnyValue(row, col int) any {
-	return v.source.ReflectValue(row, col).Elem().Interface()
+func (v derefView) Cell(row, col int) any {
+	return v.source.ReflectCell(row, col).Elem().Interface()
 }
 
-func (v derefView) ReflectValue(row, col int) reflect.Value {
-	return v.source.ReflectValue(row, col).Elem()
+func (v derefView) ReflectCell(row, col int) reflect.Value {
+	return v.source.ReflectCell(row, col).Elem()
 }

exceltable/read.go

@@ -114,14 +114,14 @@ func (view *sheetStringsView) Title() string     { return view.sheet }
 func (view *sheetStringsView) Columns() []string { return view.columns }
 func (view *sheetStringsView) NumRows() int      { return len(view.rows) }
 
-func (view *sheetStringsView) AnyValue(row, col int) any {
+func (view *sheetStringsView) Cell(row, col int) any {
 	if row < 0 || col < 0 || row >= len(view.rows) || col >= len(view.rows[row]) {
 		return nil
 	}
 	return view.rows[row][col]
 }
 
-func (view *sheetStringsView) ReflectValue(row, col int) reflect.Value {
+func (view *sheetStringsView) ReflectCell(row, col int) reflect.Value {
 	if row < 0 || col < 0 || row >= len(view.rows) || col >= len(view.rows[row]) {
 		return reflect.Value{}
 	}
@@ -139,14 +139,14 @@ func (view *sheetStringsView) ReflectValue(row, col int) reflect.Value {
 // func (view *sheetView) Columns() []string { return view.columns }
 // func (view *sheetView) NumRows() int      { return view.numRows }
 
-// func (view *sheetView) AnyValue(row, col int) any {
+// func (view *sheetView) Cell(row, col int) any {
 // 	if row < 0 || col < 0 || row >= view.numRows || col >= len(view.columns) {
 // 		return nil
 // 	}
 // 	panic("TODO")
 // }
 
-// func (view *sheetView) ReflectValue(row, col int) reflect.Value {
+// func (view *sheetView) ReflectCell(row, col int) reflect.Value {
 // 	if row < 0 || col < 0 || row >= view.numRows || col >= len(view.columns) {
 // 		return reflect.Value{}
 // 	}

extracolsfuncview.go

@@ -4,9 +4,9 @@ import (
 	"reflect"
 )
 
-func ExtraColsAnyValueFuncView(left View, columns []string, anyValue func(row, col int) any) View {
+func ExtraColsAnyValueFuncView(left View, columns []string, anyValue func(row, col int) any) ReflectCellView {
 	return &extraColsFuncView{
-		left:     left,
+		left:     AsReflectCellView(left),
 		columns:  columns,
 		anyValue: anyValue,
 		reflectValue: func(row, col int) reflect.Value {
@@ -15,9 +15,9 @@ func ExtraColsAnyValueFuncView(left View, columns []string, anyValue func(row, c
 	}
 }
 
-func ExtraColsReflectValueFuncView(left View, columns []string, reflectValue func(row, col int) reflect.Value) View {
+func ExtraColsReflectValueFuncView(left View, columns []string, reflectValue func(row, col int) reflect.Value) ReflectCellView {
 	return &extraColsFuncView{
-		left:    left,
+		left:    AsReflectCellView(left),
 		columns: columns,
 		anyValue: func(row, col int) any {
 			v := reflectValue(row, col)
@@ -31,7 +31,7 @@ func ExtraColsReflectValueFuncView(left View, columns []string, reflectValue fun
 }
 
 type extraColsFuncView struct {
-	left         View
+	left         ReflectCellView
 	columns      []string
 	anyValue     func(row, col int) any
 	reflectValue func(row, col int) reflect.Value
@@ -49,18 +49,18 @@ func (e *extraColsFuncView) NumRows() int {
 	return e.left.NumRows()
 }
 
-func (e *extraColsFuncView) AnyValue(row, col int) any {
+func (e *extraColsFuncView) Cell(row, col int) any {
 	numLeftCols := len(e.left.Columns())
 	if col < numLeftCols {
-		return e.left.AnyValue(row, col)
+		return e.left.Cell(row, col)
 	}
 	return e.anyValue(row, col-numLeftCols)
 }
 
-func (e *extraColsFuncView) ReflectValue(row, col int) reflect.Value {
+func (e *extraColsFuncView) ReflectCell(row, col int) reflect.Value {
 	numLeftCols := len(e.left.Columns())
 	if col < numLeftCols {
-		return e.left.ReflectValue(row, col)
+		return e.left.ReflectCell(row, col)
 	}
 	return e.reflectValue(row, col-numLeftCols)
 }

extracolsview.go

@@ -1,9 +1,5 @@
 package retable
 
-import (
-	"reflect"
-)
-
 var _ View = ExtraColsView(nil)
 
 type ExtraColsView []View
@@ -31,7 +27,7 @@ func (e ExtraColsView) NumRows() int {
 	return maxNumRows
 }
 
-func (e ExtraColsView) AnyValue(row, col int) any {
+func (e ExtraColsView) Cell(row, col int) any {
 	if row < 0 || col < 0 {
 		return nil
 	}
@@ -40,25 +36,9 @@ func (e ExtraColsView) AnyValue(row, col int) any {
 		numCols := len(view.Columns())
 		colRight := colLeft + numCols
 		if col < colRight {
-			return view.AnyValue(row, col-colLeft)
+			return view.Cell(row, col-colLeft)
 		}
 		colLeft = colRight
 	}
 	return nil
 }
-
-func (e ExtraColsView) ReflectValue(row, col int) reflect.Value {
-	if row < 0 || col < 0 {
-		return reflect.Value{}
-	}
-	colLeft := 0
-	for _, view := range e {
-		numCols := len(view.Columns())
-		colRight := colLeft + numCols
-		if col < colRight {
-			return view.ReflectValue(row, col-colLeft)
-		}
-		colLeft = colRight
-	}
-	return reflect.Value{}
-}

extrarowsview.go

@@ -1,9 +1,5 @@
 package retable
 
-import (
-	"reflect"
-)
-
 var _ View = ExtraRowView(nil)
 
 type ExtraRowView []View
@@ -30,7 +26,7 @@ func (e ExtraRowView) NumRows() int {
 	return numRows
 }
 
-func (e ExtraRowView) AnyValue(row, col int) any {
+func (e ExtraRowView) Cell(row, col int) any {
 	if row < 0 || col < 0 || col >= len(e.Columns()) {
 		return nil
 	}
@@ -39,25 +35,9 @@ func (e ExtraRowView) AnyValue(row, col int) any {
 		numRows := view.NumRows()
 		rowBottom := rowTop + numRows
 		if row < rowBottom {
-			return view.AnyValue(row-rowTop, col)
+			return view.Cell(row-rowTop, col)
 		}
 		rowTop = rowBottom
 	}
 	return nil
 }
-
-func (e ExtraRowView) ReflectValue(row, col int) reflect.Value {
-	if row < 0 || col < 0 || col >= len(e.Columns()) {
-		return reflect.Value{}
-	}
-	rowTop := 0
-	for _, view := range e {
-		numRows := view.NumRows()
-		rowBottom := rowTop + numRows
-		if row < rowBottom {
-			return view.ReflectValue(row-rowTop, col)
-		}
-		rowTop = rowBottom
-	}
-	return reflect.Value{}
-}

filteredview.go

@@ -1,7 +1,5 @@
 package retable
 
-import "reflect"
-
 var _ View = new(FilteredView)
 
 type FilteredView struct {
@@ -51,7 +49,7 @@ func (view *FilteredView) NumRows() int {
 	return n
 }
 
-func (view *FilteredView) AnyValue(row, col int) any {
+func (view *FilteredView) Cell(row, col int) any {
 	numRows := view.NumRows()
 	numCols := view.NumCols()
 	if row < 0 || col < 0 || row >= numRows || col >= numCols {
@@ -61,18 +59,5 @@ func (view *FilteredView) AnyValue(row, col int) any {
 	if view.ColumnMapping != nil {
 		col = view.ColumnMapping[col]
 	}
-	return view.Source.AnyValue(row, col)
-}
-
-func (view *FilteredView) ReflectValue(row, col int) reflect.Value {
-	numRows := view.NumRows()
-	numCols := view.NumCols()
-	if row < 0 || col < 0 || row >= numRows || col >= numCols {
-		return reflect.Value{}
-	}
-	row += max(view.RowOffset, 0)
-	if view.ColumnMapping != nil {
-		col = view.ColumnMapping[col]
-	}
-	return view.Source.ReflectValue(row, col)
+	return view.Source.Cell(row, col)
 }

formatter.go

@@ -33,7 +33,7 @@ func (UnsupportedFormatter) Format(v reflect.Value) (string, error) {
 
 func CellFormatterFromFormatter(f Formatter, rawResult bool) CellFormatter {
 	return CellFormatterFunc(func(ctx context.Context, view View, row, col int) (str string, raw bool, err error) {
-		str, err = f.Format(view.ReflectValue(row, col))
+		str, err = f.Format(AsReflectCellView(view).ReflectCell(row, col))
 		return str, rawResult, err
 	})
 }