hsimport 0.2.6.8 → 0.2.7
raw patch · 2 files changed
+9/−3 lines, 2 files
Files
- hsimport.cabal +1/−1
- src/HsImport/Parse.hs +8/−2
hsimport.cabal view
@@ -1,5 +1,5 @@ Name: hsimport-Version: 0.2.6.8+Version: 0.2.7 License: BSD3 License-file: LICENSE Author: Daniel Trstenjak
src/HsImport/Parse.hs view
@@ -17,7 +17,7 @@ parseFile :: FilePath -> IO (Either Error (HS.ParseResult HS.Module)) parseFile file = do srcFile <- unlines. replaceCPPByComment . lines . T.unpack <$> TIO.readFile file- catch (do let result = HS.parseFileContents srcFile+ catch (do let result = parseFileContents srcFile case result of HS.ParseOk _ -> return $ Right result @@ -43,7 +43,7 @@ parseInvalidSource srcLines lastValidLine firstInvalidLine | null srcLines || lastValidLine >= firstInvalidLine = return Nothing | otherwise =- catch (case HS.parseFileContents source of+ catch (case parseFileContents source of result@(HS.ParseOk _) | (nextLine + 1) == firstInvalidLine -> return $ Just result@@ -56,3 +56,9 @@ where source = unlines $ take (nextLine + 1) srcLines nextLine = lastValidLine + (floor ((realToFrac (firstInvalidLine - lastValidLine) / 2) :: Double) :: Int)+++parseFileContents :: String -> HS.ParseResult HS.Module+parseFileContents = HS.parseFileContentsWithMode parseMode+ where+ parseMode = HS.defaultParseMode { HS.fixities = Just [] }