Draft parse programOptions via fieldGrammar

jgotoh · Sep 6, 2024 · c727bf0 · c727bf0
1 parent f1fda9a
commit c727bf0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/cabal-install/parser-tests/Tests/ParserTests.hs b/cabal-install/parser-tests/Tests/ParserTests.hs
@@ -477,6 +477,7 @@ testProgramOptionsConcat = do
               Map.fromList
                 [ ("ghc", ["-threaded", "-Wall", "-fno-state-hack"])
                 , ("gcc", ["-baz", "-foo", "-bar"])
+                , ("haddock", ["--optghc=-optP -P"])
                 , ("ld", ["-Wl,--gc-sections"])
                 ]
         }

diff --git a/cabal-install/parser-tests/Tests/files/program-options-concat/cabal.project b/cabal-install/parser-tests/Tests/files/program-options-concat/cabal.project
@@ -1,6 +1,7 @@
 program-options
     ghc-options: -fno-state-hack
     gcc-options: -foo -bar
+    haddock-options: --optghc="-optP -P"
 
 program-options
     ghc-options: -threaded -Wall

diff --git a/cabal-install/src/Distribution/Client/ProjectConfig/Parsec.hs b/cabal-install/src/Distribution/Client/ProjectConfig/Parsec.hs
@@ -355,6 +355,10 @@ parsePackageName pos args = case args of
     parser =
       P.choice [P.try (P.char '*' >> return AllPackages), SpecificPackage <$> parsec]
 
+programArgsFieldGrammar :: ParsecFieldGrammar' [(String,[String])]
+programArgsFieldGrammar =
+  monoidalFieldAla "ghc-options" (alaList' NoCommaFSep Token') oida
+
 -- | Parse fields of a program-options stanza.
 parseProgramArgs :: ProgramDb -> Fields Position -> ParseResult (MapMappend String [String])
 parseProgramArgs programDb fields = foldM parseField mempty (filter hasOptionsSuffix $ Map.toList fields)