foo

Author: phadej

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

@@ -75,6 +75,12 @@ infixl 1 <&>
 
 -- $setup
 -- >>> :set -XOverloadedStrings
+-- >>> import Data.String (fromString)
+-- >>> import qualified Distribution.PackageDescription as C
+-- >>> import Text.Show (showListWith)
+-- >>> import Data.Functor.Classes (liftShowsPrec)
+-- >>> let sB (C.CondBranch c t f) = showString "CondBranch _ " . showParen True (sT t) . showChar ' ' . liftShowsPrec (\_ -> sT) undefined 11 f; sT (C.CondNode x c xs) = showString "CondTree " . showsPrec 11 x . showString " _ " . showListWith sB xs
+-- >>> pp x = putStrLn (either show (flip sT "") x)
 
 -- | @cabal.project@ file
 data Project uri opt pkg = Project
@@ -220,13 +226,14 @@ parseProject = parseWith $ \fields0 -> do
 
 -- | Parse project files with conditionals.
 --
--- >>> fmap (fmap prjPackages) $ parseProjectWithConditionals "cabal.project" "packages: foo bar/*.cabal"
--- Right (CondNode {condTreeData = ["foo","bar/*.cabal"], condTreeConstraints = (), condTreeComponents = []})
+-- >>> pp $ fmap (fmap prjPackages) $ parseProjectWithConditionals "cabal.project" "packages: foo bar/*.cabal"
+-- CondTree ["foo","bar/*.cabal"] _ []
 --
--- TODO:
+-- >>> pp $ fmap (fmap prjPackages) $ parseProjectWithConditionals "cabal.project" $ fromString $ unlines [ "packages: foo bar/*.cabal", "if impl(ghc >=9)", "  packages: quu" ]
+-- CondTree ["foo","bar/*.cabal"] _ [CondBranch _ (CondTree ["quu"] _ []) Nothing]
 --
--- >>> fmap (fmap prjPackages) $ parseProjectWithConditionals "cabal.project" "packages: foo bar/*.cabal\nif impl(ghc >=9)\n  packages: quu"
--- Right (CondNode {condTreeData = ["foo","bar/*.cabal"], condTreeConstraints = (), condTreeComponents = []})
+-- >>> 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]
 --
 parseProjectWithConditionals :: FilePath -> ByteString -> Either (ParseError NonEmpty) (C.CondTree C.ConfVar () (Project Void String String))
 parseProjectWithConditionals = parseWith $ \fields0 -> flip parseCondTree fields0 $ \fields1 sections -> do
@@ -465,16 +472,13 @@ 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 [] = do
-        let condTree = make Nothing
-        return (accS [], accB [condTree])
     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 ([], [])
         | name == "elif" = do
             C.parseFailure pos "elif is not supported yet"
             return ([], [])
-    goElse make accS accB (section : sections) = do
+    goElse make accS accB sections = do
         let condTree = make Nothing
-        goIfs (accS . (section :)) (accB . (condTree :)) sections
+        goIfs accS (accB . (condTree :)) sections