foo

Author: phadej

cabal-install-parsers/src/Cabal/Index.hs

@@ -399,7 +399,7 @@ indexMetadata indexFilepath mindexState = do
 
                 f :: Maybe TmpPackageInfo -> Maybe TmpPackageInfo
                 f Nothing = Just TmpPackageInfo
-                    { tmpPiVersions  = Map.singleton ver TmpReleaseInfo 
+                    { tmpPiVersions  = Map.singleton ver TmpReleaseInfo
                         { tmpRiRevision    = 0
                         , tmpRiTarOffset   = offset
                         , tmpRiCabalHash   = Just digest

cabal-install-parsers/src/Cabal/Project.hs

@@ -28,6 +28,7 @@ module Cabal.Project (
 
 import Control.DeepSeq            (NFData (..))
 import Control.Exception          (Exception (..), throwIO)
+import Control.Monad              (unless)
 import Control.Monad.IO.Class     (liftIO)
 import Control.Monad.Trans.Except (ExceptT, runExceptT, throwE)
 import Data.Bifoldable            (Bifoldable (..))
@@ -235,6 +236,12 @@ parseProject = parseWith $ \fields0 -> do
 -- >>> pp $ fmap (fmap prjPackages) $ parseProjectWithConditionals "cabal.project" $ fromString $ unlines [ "packages: foo bar/*.cabal", "if impl(ghc >=9)", "  packages: quu", "if impl(ghc >=10)", "  packages: zoo" ]
 -- CondTree ["foo","bar/*.cabal"] _ [CondBranch _ (CondTree ["quu"] _ []) Nothing,CondBranch _ (CondTree ["zoo"] _ []) Nothing]
 --
+-- >>> pp $ fmap (fmap prjPackages) $ parseProjectWithConditionals "cabal.project" $ fromString $ unlines [ "packages: foo bar/*.cabal", "if impl(ghc >=9)", "  packages: quu", "else", "  packages: zoo" ]
+-- CondTree ["foo","bar/*.cabal"] _ [CondBranch _ (CondTree ["quu"] _ []) (Just CondTree ["zoo"] _ [])]
+--
+-- >>> pp $ fmap (fmap prjPackages) $ parseProjectWithConditionals "cabal.project" $ fromString $ unlines [ "packages: foo bar/*.cabal", "if impl(ghc >=9)", "  packages: quu", "elif impl(ghc >=10)", "  packages: zoo", "else", "  packages: yyz" ]
+-- CondTree ["foo","bar/*.cabal"] _ [CondBranch _ (CondTree ["quu"] _ []) (Just CondTree [] _ [CondBranch _ (CondTree ["zoo"] _ []) (Just CondTree ["yyz"] _ [])])]
+--
 parseProjectWithConditionals :: FilePath -> ByteString -> Either (ParseError NonEmpty) (C.CondTree C.ConfVar () (Project Void String String))
 parseProjectWithConditionals = parseWith $ \fields0 -> flip parseCondTree fields0 $ \fields1 sections -> do
     let fields2  = M.filterWithKey (\k _ -> k `elem` knownFields) fields1
@@ -452,9 +459,9 @@ parseCondTree subparse = go
         -> C.ParseResult ([C.Section C.Position], [C.CondBranch C.ConfVar () a])
     goIfs accS accB [] = do
         return (accS [], accB [])
-    goIfs accS accB (C.MkSection (C.Name pos name) test fields : sections)
+    goIfs accS accB (C.MkSection (C.Name pos name) args fields : sections)
         | name == "if" = do
-            test' <- C.parseConditionConfVar test
+            test' <- C.parseConditionConfVar args
             fields' <- go fields
             goElse (C.CondBranch test' fields') accS accB sections
         | name == "else" = do
@@ -472,13 +479,17 @@ parseCondTree subparse = go
         -> ([C.CondBranch C.ConfVar () a] -> [C.CondBranch C.ConfVar () a])
         -> [C.Section C.Position]
         -> C.ParseResult ([C.Section C.Position], [C.CondBranch C.ConfVar () a])
-    goElse _make _accS _accB (C.MkSection (C.Name pos name) _args _fields : _sections)
+    goElse make accS accB (C.MkSection (C.Name pos name) args fields : sections)
         | name == "else" = do
-            C.parseFailure pos "else is not supported yet"
-            return ([], [])
+            unless (null args) $ C.parseFailure pos "arguments passed to else"
+            fields' <- go fields
+            let condTree = make (Just fields')
+            goIfs accS (accB . (condTree :)) sections
         | name == "elif" = do
-            C.parseFailure pos "elif is not supported yet"
-            return ([], [])
+            test' <- C.parseConditionConfVar args
+            fields' <- go fields
+            emptyA <- subparse mempty []
+            goElse (make . Just . C.CondNode emptyA () . pure .  C.CondBranch test' fields') accS accB sections
     goElse make accS accB sections = do
         let condTree = make Nothing
         goIfs accS (accB . (condTree :)) sections