cal: refactor

1 files changed, 0 insertions, 54 deletions

diff --git a/sw/cal/csv.go b/sw/cal/csv.go
deleted file mode 100644
index cdd5b44..0000000
--- a/sw/cal/csv.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package main
-
-import (
-	"encoding/csv"
-	"fmt"
-	"io"
-	"os"
-	"strconv"
-)
-
-func parseTable(filename string) (Table, error) {
-	f, err := os.Open(filename)
-	if err != nil {
-		eprintf("%v\n", err)
-	}
-	defer f.Close()
-
-	var tbl Table
-	rdr := csv.NewReader(f)
-	for {
-		err := parseRow(rdr, &tbl)
-		if err == io.EOF {
-			return tbl, nil
-		} else if err != nil {
-			return Table{}, fmt.Errorf("%s:%v", filename, err)
-		}
-	}
-}
-
-func parseRow(rdr *csv.Reader, tbl *Table) error {
-	row, err := rdr.Read()
-	if err != nil {
-		return err
-	}
-	if len(row) != 2 {
-		line, _ := rdr.FieldPos(0)
-		return fmt.Errorf("%d: malformed row", line)
-	}
-	key, err := strconv.ParseInt(row[0], 10, 32)
-	if err != nil {
-		line, col := rdr.FieldPos(0)
-		return fmt.Errorf("%d:%d: %v", line, col, err)
-	}
-	val, err := strconv.ParseUint(row[1], 10, 16)
-	if err != nil {
-		line, col := rdr.FieldPos(1)
-		return fmt.Errorf("%d:%d: %v", line, col, err)
-	}
-	if err := tbl.Insert(int32(key), uint16(val)); err != nil {
-		line, col := rdr.FieldPos(0)
-		return fmt.Errorf("%d:%d: %v", line, col, err)
-	}
-	return nil
-}