aboutsummaryrefslogtreecommitdiff
path: root/src/CabalHelper/Shared
diff options
context:
space:
mode:
Diffstat (limited to 'src/CabalHelper/Shared')
-rw-r--r--src/CabalHelper/Shared/Common.hs16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/CabalHelper/Shared/Common.hs b/src/CabalHelper/Shared/Common.hs
index 4165ab0..2d4b037 100644
--- a/src/CabalHelper/Shared/Common.hs
+++ b/src/CabalHelper/Shared/Common.hs
@@ -104,6 +104,9 @@ parsePkgId bs =
parseVer :: String -> Version
parseVer vers = runReadP parseVersion vers
+parseVerMay :: String -> Maybe Version
+parseVerMay vers = runReadPMay parseVersion vers
+
trim :: String -> String
trim = dropWhileEnd isSpace
@@ -114,9 +117,16 @@ sameMajorVersionAs :: Version -> Version -> Bool
sameMajorVersionAs a b = majorVer a == majorVer b
runReadP :: ReadP t -> String -> t
-runReadP p i = case filter ((=="") . snd) $ readP_to_S p i of
- (a,""):[] -> a
- _ -> error $ "Error parsing: " ++ show i
+runReadP p i =
+ case runReadPMay p i of
+ Just x -> x
+ Nothing -> error $ "Error parsing version: " ++ show i
+
+runReadPMay :: ReadP t -> String -> Maybe t
+runReadPMay p i = case filter ((=="") . snd) $ readP_to_S p i of
+ (a,""):[] -> Just a
+ _ -> Nothing
+
appCacheDir :: IO FilePath
appCacheDir =