Fix lexer bug when C++-style comments are not EOL terminated (#60)

Author: chameco

src/Lichen/Lexer.hs

@@ -4,6 +4,7 @@ module Lichen.Lexer where
 
 import Data.Aeson
 import Data.Foldable()
+import Data.Functor (($>))
 import Data.Semigroup ((<>))
 import qualified Data.List.NonEmpty as NE
 import qualified Data.ByteString as BS
@@ -51,6 +52,9 @@ reserved s = try (string s >> notFollowedBy (alphaNumChar <|> char '_') >> pure
 operator :: String -> Parser String
 operator = try . string
 
+term :: Parser Char
+term = char '\r' <|> (head <$> eol) <|> (eof $> '\n') 
+
 -- Parse a C-style character literal. Ex: 'a', '@'.
 charLit :: Parser String
 charLit = char '\'' *> manyTill (noneOf ['\'']) (char '\'' <|> (eof >> pure ' '))

src/Lichen/Lexer/C.hs

@@ -39,8 +39,8 @@ sc :: Parser ()
 sc = void (many spaceChar)
 
 onetoken :: Parser (Tagged Tok)
-onetoken = wrap (("//"++) <$> (operator "//" *> manyTill anyChar (char '\r' <|> (head <$> eol)))) Comment
-       <|> wrap (("#"++) <$> (operator "#" *> manyTill anyChar (char '\r' <|> (head <$> eol)))) Comment
+onetoken = wrap (("//"++) <$> (operator "//" *> manyTill anyChar term)) Comment
+       <|> wrap (("#"++) <$> (operator "#" *> manyTill anyChar term)) Comment
        <|> wrap (("/**/"++) <$> (operator "/*" *> manyTill anyChar (head <$> operator "*/"))) Comment
        <|> wrap (reserved "auto") Auto
        <|> wrap (reserved "break") Break

src/Lichen/Plagiarism/Main.hs

@@ -7,12 +7,12 @@ import System.FilePath
 
 import Data.Aeson
 import Data.Semigroup ((<>))
-import qualified Data.Set as Set
+--import qualified Data.Set as Set
 import qualified Data.Text as T
 import qualified Data.ByteString.Lazy as BS
 
 import Control.Monad.Reader
-import Control.Monad.Except
+--import Control.Monad.Except
 
 import Options.Applicative
 

src/Lichen/Plagiarism/Provided.hs

@@ -1,9 +1,9 @@
 module Lichen.Plagiarism.Provided where
 
 import qualified Data.Set as Set
-import qualified Data.Map.Strict as Map
+--import qualified Data.Map.Strict as Map
 
 import Lichen.Plagiarism.Submitty
 
 providedFingerprints :: FilePath -> Set.Set Fingerprint
-providedFingerprints pc = undefined
+providedFingerprints _ = undefined