[commit: ghc] wip/nfs-locking: Fix formatting, add TODOs. (d2f3a74)

git at git.haskell.org git at git.haskell.org
Thu Oct 26 23:00:27 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/d2f3a74ae4e0ba1218025aca1b2786a35f169cee/ghc

>---------------------------------------------------------------

commit d2f3a74ae4e0ba1218025aca1b2786a35f169cee
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Dec 30 15:20:37 2014 +0000

    Fix formatting, add TODOs.


>---------------------------------------------------------------

d2f3a74ae4e0ba1218025aca1b2786a35f169cee
 src/Ways.hs | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Ways.hs b/src/Ways.hs
index 6e186ab..91cbd4f 100644
--- a/src/Ways.hs
+++ b/src/Ways.hs
@@ -23,7 +23,7 @@ data WayUnit = Profiling | Logging | Parallel | GranSim | Threaded | Debug | Dyn
 data Way = Way
      {
          tag         :: String,    -- e.g., "thr_p"
-         description :: String,    -- e.g., "threaded profiled"
+         description :: String,    -- e.g., "threaded profiled"; TODO: get rid of this field?
          units       :: [WayUnit]  -- e.g., [Threaded, Profiling]
      }
      deriving Eq
@@ -72,17 +72,18 @@ defaultWays stage = do
 wayHcOpts :: Way -> Args
 wayHcOpts (Way _ _ units) =
     mconcat
-    [ when (Dynamic `notElem` units) $ arg [ "-static" ]
-    , when (Dynamic    `elem` units) $ arg [ "-fPIC", "-dynamic" ]
-    , when (Threaded   `elem` units) $ arg [ "-optc-DTHREADED_RTS" ]
-    , when (Debug      `elem` units) $ arg [ "-optc-DDEBUG"        ]
-    , when (Profiling  `elem` units) $ arg [ "-prof"               ]
-    , when (Logging    `elem` units) $ arg [ "-eventlog"           ]
-    , when (Parallel   `elem` units) $ arg [ "-parallel"           ]
-    , when (GranSim    `elem` units) $ arg [ "-gransim"            ]
-    , when (units == [Debug] || units == [Debug, Dynamic]) $ arg [ "-ticky", "-DTICKY_TICKY" ]
+    [ when (Dynamic `notElem` units) $ arg ["-static"]
+    , when (Dynamic    `elem` units) $ arg ["-fPIC", "-dynamic"]
+    , when (Threaded   `elem` units) $ arg ["-optc-DTHREADED_RTS"]
+    , when (Debug      `elem` units) $ arg ["-optc-DDEBUG"]
+    , when (Profiling  `elem` units) $ arg ["-prof"]
+    , when (Logging    `elem` units) $ arg ["-eventlog"]
+    , when (Parallel   `elem` units) $ arg ["-parallel"]
+    , when (GranSim    `elem` units) $ arg ["-gransim"]
+    , when (units == [Debug] || units == [Debug, Dynamic]) $ arg ["-ticky", "-DTICKY_TICKY"]
     ]
 
+-- TODO: cover other cases
 suffix :: FilePath -> Way -> FilePath
 suffix base (Way _ _ units) = 
     concat $



More information about the ghc-commits mailing list