From ac56835912b23a53673c5fa7cf45f5aa89e30dda Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 30 Jan 2018 19:20:57 +0100 Subject: scanner --- hmp.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hmp.go b/hmp.go index 879f12b..0e1cb17 100644 --- a/hmp.go +++ b/hmp.go @@ -1,20 +1,24 @@ package main import ( - "io/ioutil" - "strings" + "bufio" "log" + "os" "strconv" + "strings" ) func getMap(fname string) []int { var n []int - - f, err := ioutil.ReadFile(fname) + f, err := os.Open(fname) if err != nil { log.Fatal(err) } - for _, r := range strings.Fields(string(f)) { + defer f.Close() + scanner := bufio.NewScanner(f) + scanner.Split(bufio.ScanWords) + for scanner.Scan() { + r := scanner.Text() if strings.Contains(r, "-") { rr := strings.Split(r, "-") a, _ := strconv.Atoi(rr[0]) -- cgit v1.2.3