aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2018-01-30 19:20:57 +0100
committerDimitri Sokolyuk <demon@dim13.org>2018-01-30 19:20:57 +0100
commitac56835912b23a53673c5fa7cf45f5aa89e30dda (patch)
tree06828c40414d261eb831ad695c08316e694b8af0
parentdcae7f43926adcfa3b082f4d0d2f0435fb61faef (diff)
scanner
-rw-r--r--hmp.go14
1 files 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])