Skip to content

Commit

Permalink
replace interface{} to any
Browse files Browse the repository at this point in the history
  • Loading branch information
noborus committed Nov 15, 2023
1 parent 36d824a commit a1b47c4
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var (
type XLSXReader struct {
names []string
types []string
body [][]interface{}
body [][]any
}

// NewXLSXReader function takes an io.Reader and trdsql.ReadOpts, and returns a new XLSXReader.
Expand Down Expand Up @@ -89,7 +89,7 @@ func NewXLSXReader(reader io.Reader, opts *trdsql.ReadOpts) (trdsql.Reader, erro

r.names, r.types = nameType(rows[header], cellX, columnNum, opts.InHeader)
rowNum := len(rows) - skip
body := make([][]interface{}, 0, rowNum)
body := make([][]any, 0, rowNum)
validColumns := make([]bool, columnNum)
for i := 0; i < len(r.names); i++ {
if r.names[i] != "" {
Expand All @@ -106,7 +106,7 @@ func NewXLSXReader(reader io.Reader, opts *trdsql.ReadOpts) (trdsql.Reader, erro
if j < skip {
continue
}
data := make([]interface{}, columnNum)
data := make([]any, columnNum)
for c, i := 0, cellX; i < len(row); i++ {
if c >= columnNum {
break
Expand Down Expand Up @@ -142,12 +142,12 @@ func cellName(i int) (string, error) {
return cn, nil
}

func filterColumns(src [][]interface{}, validColumns []bool) [][]interface{} {
func filterColumns(src [][]any, validColumns []bool) [][]any {
num := columnNum(validColumns)
dst := make([][]interface{}, 0, len(src))
dst := make([][]any, 0, len(src))
startRow := false
for _, row := range src {
cols := make([]interface{}, num)
cols := make([]any, num)
valid := false
for i := 0; i < num; i++ {
cols[i] = row[i]
Expand Down Expand Up @@ -249,12 +249,12 @@ func (r XLSXReader) Types() ([]string, error) {
}

// PreReadRow returns the rows of the XLSX file.
func (r XLSXReader) PreReadRow() [][]interface{} {
func (r XLSXReader) PreReadRow() [][]any {
return r.body
}

// ReadRow only returns EOF.
func (r XLSXReader) ReadRow(row []interface{}) ([]interface{}, error) {
func (r XLSXReader) ReadRow(row []any) ([]any, error) {
return nil, io.EOF
}

Expand Down

0 comments on commit a1b47c4

Please sign in to comment.