From cde705a95f6456a8c91428fd4a2c5be18666bbee Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Thu, 21 Mar 2019 20:26:58 -0400 Subject: Fixed line-count when line comments are used. --- GrepNested.hs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/GrepNested.hs b/GrepNested.hs index c62262f..df52581 100644 --- a/GrepNested.hs +++ b/GrepNested.hs @@ -65,10 +65,12 @@ grepNested p !lin !col s = case cmtToken p s of in mkComment lin col xs : grepNested p (lin + lcnt) col' cs' (StartLine,tlen,cs) -> let findEOL !tot xs = case cmtToken p xs of - (EOL,tlen,_) -> tot + (EOL,tlen,_) -> (tot , tlen ) (tok,tlen,ys) -> findEOL (tot + tlen) ys - (comment,_) = cmtSplitAt p (findEOL 0 cs) cs - in mkComment lin col comment : grepNested p (lin + 1) 1 cs + (clen,dlen) = findEOL 0 cs + (comment,ds) = cmtSplitAt p clen cs + (_,es) = cmtSplitAt p dlen ds + in mkComment lin col comment : grepNested p (lin + 1) 1 es (EOL,tlen,cs) -> grepNested p (lin+1) 1 cs (NullInput,tlen,_) -> [] (IgnoredChar clen,_,cs) -> grepNested p lin (col+clen) cs -- cgit v1.2.3