summaryrefslogtreecommitdiff
path: root/compiler/utils/Util.hs
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2015-11-11 11:05:16 +0100
committerBen Gamari <ben@smart-cactus.org>2015-11-11 11:05:16 +0100
commitfbc2537c0b2cbe947684bb39669643f1ef9d96c0 (patch)
tree2d8a8f0e78e4109437c615986e2e88b1ff78e61b /compiler/utils/Util.hs
parent5eb56eddaaa7bef3da864f6cd297bad39d6bf76c (diff)
downloadhaskell-fbc2537c0b2cbe947684bb39669643f1ef9d96c0.tar.gz
OPTIONS_GHC compiler flags may contain spaces (#4931)
When a .hsc contains `#define FOO "bar baz"`, hsc2hs emits: {-# OPTIONS_GHC -optc-DFOO="bar baz" #-} Make sure GHC can compile this, by tweaking `HeaderInfo.getOptions` a bit. Test Plan: driver/T4931 Reviewers: austin, bgamari Reviewed By: bgamari Differential Revision: https://phabricator.haskell.org/D1452 GHC Trac Issues: #4931
Diffstat (limited to 'compiler/utils/Util.hs')
-rw-r--r--compiler/utils/Util.hs41
1 files changed, 27 insertions, 14 deletions
diff --git a/compiler/utils/Util.hs b/compiler/utils/Util.hs
index e9b9d3f3df..7139eea6e9 100644
--- a/compiler/utils/Util.hs
+++ b/compiler/utils/Util.hs
@@ -872,22 +872,35 @@ toArgs str
Left ("Couldn't read " ++ show str ++ "as [String]")
s -> toArgs' s
where
+ toArgs' :: String -> Either String [String]
+ -- Remove outer quotes:
+ -- > toArgs' "\"foo\" \"bar baz\""
+ -- Right ["foo", "bar baz"]
+ --
+ -- Keep inner quotes:
+ -- > toArgs' "-DFOO=\"bar baz\""
+ -- Right ["-DFOO=\"bar baz\""]
toArgs' s = case dropWhile isSpace s of
[] -> Right []
- ('"' : _) -> case reads s of
- [(arg, rest)]
- -- rest must either be [] or start with a space
- | all isSpace (take 1 rest) ->
- case toArgs' rest of
- Left err -> Left err
- Right args -> Right (arg : args)
- _ ->
- Left ("Couldn't read " ++ show s ++ "as String")
- s' -> case break isSpace s' of
- (arg, s'') -> case toArgs' s'' of
- Left err -> Left err
- Right args -> Right (arg : args)
-
+ ('"' : _) -> do
+ -- readAsString removes outer quotes
+ (arg, rest) <- readAsString s
+ (arg:) `fmap` toArgs' rest
+ s' -> case break (isSpace <||> (== '"')) s' of
+ (argPart1, s''@('"':_)) -> do
+ (argPart2, rest) <- readAsString s''
+ -- show argPart2 to keep inner quotes
+ ((argPart1 ++ show argPart2):) `fmap` toArgs' rest
+ (arg, s'') -> (arg:) `fmap` toArgs' s''
+
+ readAsString :: String -> Either String (String, String)
+ readAsString s = case reads s of
+ [(arg, rest)]
+ -- rest must either be [] or start with a space
+ | all isSpace (take 1 rest) ->
+ Right (arg, rest)
+ _ ->
+ Left ("Couldn't read " ++ show s ++ "as String")
{-
-- -----------------------------------------------------------------------------
-- Floats