From 4e318409ffe88c93c4631bfc16d5c9206e0ec061 Mon Sep 17 00:00:00 2001 From: brettlangdon Date: Mon, 14 Sep 2015 11:30:41 -0400 Subject: [PATCH] shuffle line/column incrementing around --- scanner/scanner.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scanner/scanner.go b/scanner/scanner.go index e1db326..1e2f74d 100644 --- a/scanner/scanner.go +++ b/scanner/scanner.go @@ -47,18 +47,17 @@ func (scanner *Scanner) nextPosition() *Position { scanner.currentColumn = 0 } + if next == '\n' || next == EOF { + scanner.currentLine++ + scanner.currentColumn = 0 + } + pos := &Position{ Char: next, Line: scanner.currentLine, Column: scanner.currentColumn, } - scanner.currentColumn++ - if next == '\n' || next == EOF { - scanner.currentLine++ - scanner.currentColumn = 0 - } - return pos }