28c596b · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Do not split arguments indiscriminately on spaces

Fixes #2934 The arguments given in the flag directive are now split when that directive is handled.

commit28c596b33175d1ffc07f2aa6ed00f4781f7254af authorNiklas Larsson <niklas@mm.st> dateMon 1 Feb 2016, 17:34 (11 years ago) parent01484e6

2 files changed+8−6

unifiedsplit

src/IRTS/CodegenC.hs+4−4

@@ -81,10 +81,10 @@ codegenC' defs out exec incs objs libs flags exports iface dbg

8181 "-I."] ++ objs ++ envFlags ++

8282 (if (exec == Executable) then [] else ["-c"]) ++

8383 [tmpn] ++

84− (if not iface then concatMap words libFlags else []) ++

85− concatMap words incFlags ++

86− (if not iface then concatMap words libs else []) ++

87− concatMap words flags ++

84+ (if not iface then libFlags else []) ++

85+ incFlags ++

86+ (if not iface then libs else []) ++

87+ flags ++

8888 ["-o", out]

8989-- putStrLn (show args)

9090 exit <- rawSystem comp args

src/Idris/Directives.hs+4−2

@@ -21,8 +21,10 @@ directiveAction (DLink cgn obj) = do dirs <- allImportDirs

2121 addIBC (IBCObj cgn obj) -- just name, search on loading ibc

2222 addObjectFile cgn o

2323

24−directiveAction (DFlag cgn flag) = do addIBC (IBCCGFlag cgn flag)

25− addFlag cgn flag

24+directiveAction (DFlag cgn flag) = do

25+ let flags = words flag

26+ mapM_ (\f -> addIBC (IBCCGFlag cgn f)) flags

27+ mapM_ (addFlag cgn) flags

2628

2729directiveAction (DInclude cgn hdr) = do addHdr cgn hdr

2830 addIBC (IBCHeader cgn hdr)