From 2d9588f5b309aa6b5114d8719bfe3d0b17abbcff Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Tue, 27 Sep 2022 15:57:23 +0300 Subject: Fix position math --- src/Tokenizer.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Tokenizer.hs') diff --git a/src/Tokenizer.hs b/src/Tokenizer.hs index 565caa5..6a5cc5c 100644 --- a/src/Tokenizer.hs +++ b/src/Tokenizer.hs @@ -83,7 +83,7 @@ _tokenize fileName acc current (x:xs) tokenize :: String -> String -> LContext [Token] tokenize fileName src = do - let tChars = augment 0 0 src + let tChars = augment 1 1 src tokens <- _tokenize fileName [] [] tChars return $ tokens $> reverse @@ -91,9 +91,9 @@ tokenize fileName src = do where augment row col ('\r':'\n':rest) = - TChar '\n' row col : augment 0 (col + 1) rest + TChar '\n' row col : augment (row + 1) 1 rest augment row col ('\n':rest) = - TChar '\n' row col : augment 0 (col + 1) rest + TChar '\n' row col : augment (row + 1) 1 rest augment row col (c:rest) = - TChar c (row + 1) col : augment 0 (col + 1) rest + TChar c row col : augment row (col + 1) rest augment _ _ [] = [] -- cgit v1.3