[commit: ghc] wip/nfs-locking: Clean up. (bc4a11c)

[git at git.haskell.org]

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

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

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

commit bc4a11c9eba6c98e82c2ed8e0f0452c101179660
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Fri Aug 21 16:11:53 2015 +0100

    Clean up.


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

bc4a11c9eba6c98e82c2ed8e0f0452c101179660
 src/Way.hs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Way.hs b/src/Way.hs
index 74d1f26..a1df1ce 100644
--- a/src/Way.hs
+++ b/src/Way.hs
@@ -1,4 +1,4 @@
-module Way ( -- TODO: rename to "Way"?
+module Way (
     WayUnit (..),
     Way, wayFromUnits, wayUnit,
 
@@ -13,7 +13,7 @@ module Way ( -- TODO: rename to "Way"?
     safeDetectWay, detectWay, matchBuildResult
     ) where
 
-import Base
+import Base hiding (unit)
 import Util
 import Oracles.Setting
 import Data.List
@@ -74,6 +74,7 @@ instance Read Way where
 instance Eq Way where
     Way a == Way b = a == b
 
+vanilla, profiling, logging, parallel, granSim :: Way
 vanilla   = wayFromUnits []
 profiling = wayFromUnits [Profiling]
 logging   = wayFromUnits [Logging]
@@ -82,6 +83,11 @@ granSim   = wayFromUnits [GranSim]
 
 -- RTS only ways
 -- TODO: do we need to define *only* these? Shall we generalise/simplify?
+threaded, threadedProfiling, threadedLogging, debug, debugProfiling,
+    threadedDebug, threadedDebugProfiling, dynamic, profilingDynamic,
+    threadedProfilingDynamic, threadedDynamic, threadedDebugDynamic,
+    debugDynamic, loggingDynamic, threadedLoggingDynamic :: Way
+
 threaded                 = wayFromUnits [Threaded]
 threadedProfiling        = wayFromUnits [Threaded, Profiling]
 threadedLogging          = wayFromUnits [Threaded, Logging]
@@ -102,7 +108,7 @@ wayPrefix :: Way -> String
 wayPrefix way | way == vanilla = ""
               | otherwise      = show way ++ "_"
 
-hisuf, osuf, hcsuf, obootsuf, ssuf :: Way -> String
+osuf, ssuf, hisuf, hcsuf, obootsuf, hibootsuf :: Way -> String
 osuf      = (++ "o"      ) . wayPrefix
 ssuf      = (++ "s"      ) . wayPrefix
 hisuf     = (++ "hi"     ) . wayPrefix