Fix parsing of commas in programArgs

jgotoh · Aug 24, 2024 · 38ca2d3 · 38ca2d3
1 parent fceeb15
commit 38ca2d3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/cabal-install/parser-tests/Tests/ParserTests.hs b/cabal-install/parser-tests/Tests/ParserTests.hs
@@ -472,7 +472,13 @@ testProgramOptionsConcat = do
     expected :: PackageConfig
     expected =
       mempty
-        { packageConfigProgramArgs = MapMappend $ Map.fromList [("ghc", ["-threaded", "-Wall", "-fno-state-hack"]), ("gcc", ["-baz", "-foo", "-bar"])]
+        { packageConfigProgramArgs =
+            MapMappend $
+              Map.fromList
+                [ ("ghc", ["-threaded", "-Wall", "-fno-state-hack"])
+                , ("gcc", ["-baz", "-foo", "-bar"])
+                , ("ld", ["-Wl,--gc-sections"])
+                ]
         }
 
 testRelaxDepsConcat :: Assertion

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
@@ -5,3 +5,4 @@ program-options
 program-options
     ghc-options: -threaded -Wall
     gcc-options: -baz
+    ld-options: -Wl,--gc-sections
diff --git a/cabal-install/src/Distribution/Client/ProjectConfig/Parsec.hs b/cabal-install/src/Distribution/Client/ProjectConfig/Parsec.hs
@@ -41,7 +41,7 @@ import Distribution.Solver.Types.ProjectConfigPath
 
 import Distribution.Fields (Field (..), FieldLine (..), FieldName, Name (..), SectionArg (..), readFields', showPWarning)
 import Distribution.Fields.LexerMonad (toPWarnings)
-import Distribution.Parsec (CabalParsing, PError (..), ParsecParser, eitherParsec, parsec, parsecFilePath, parsecToken, runParsecParser)
+import Distribution.Parsec (CabalParsing, PError (..), ParsecParser, eitherParsec, parsec, parsecFilePath, parsecToken', runParsecParser)
 import Distribution.Parsec.Position (Position (..), zeroPos)
 import Distribution.Parsec.Warning (PWarnType (..))
 import Distribution.Simple.Program.Db (ProgramDb, defaultProgramDb, knownPrograms, lookupKnownProgram)
@@ -393,7 +393,7 @@ parseProgramArgsFieldLines :: Position -> [FieldLine Position] -> ParseResult [S
 parseProgramArgsFieldLines pos = runFieldParser pos programArgsFieldParser cabalSpec
 
 programArgsFieldParser :: CabalParsing m => m [String]
-programArgsFieldParser = parseSep (Proxy :: Proxy FSep) parsecToken
+programArgsFieldParser = parseSep (Proxy :: Proxy NoCommaFSep) parsecToken'
 
 type FieldSuffix = String