X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=System%2FInfo.hs;h=92da1a64b7b43a364232f29a0f6e9cf894164cd3;hb=41e8fba828acbae1751628af50849f5352b27873;hp=c27ef9d704b434777ce096fd62f84797009b1c66;hpb=23d401400bf5d81c31d3c2d1af6e735368bc7169;p=ghc-base.git

diff --git a/System/Info.hs b/System/Info.hs
index c27ef9d..92da1a6 100644
--- a/System/Info.hs
+++ b/System/Info.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE CPP #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  System.Info
@@ -8,8 +10,8 @@
 -- Stability   :  experimental
 -- Portability :  portable
 --
--- Misc information about the characteristics of the host 
--- architecture\/machine lucky enough to run your program.
+-- Information about the characteristics of the host 
+-- system lucky enough to run your program.
 --
 -----------------------------------------------------------------------------
 
@@ -18,51 +20,49 @@ module System.Info
        os,		    -- :: String
        arch,		    -- :: String
        compilerName,	    -- :: String
-#ifdef __GLASGOW_HASKELL__
        compilerVersion	    -- :: Version
-#endif
    ) where
 
 import Prelude
 import Data.Version
 
-#ifndef __NHC__
+-- | The version of 'compilerName' with which the program was compiled
+-- or is being interpreted.
+compilerVersion :: Version
+compilerVersion = Version {versionBranch=[major, minor], versionTags=[]}
+  where (major, minor) = compilerVersionRaw `divMod` 100
 
-#include "ghcplatform.h"
+-- | The operating system on which the program is running.
+os :: String
 
+-- | The machine architecture on which the program is running.
 arch :: String
-arch = HOST_ARCH
 
-os :: String
-os = HOST_OS
+-- | The Haskell implementation with which the program was compiled
+-- or is being interpreted.
+compilerName :: String
 
-#else
-os,arch ::String
-#include "OSInfo.hs"
-#endif
+compilerVersionRaw :: Int
 
-compilerName :: String
 #if defined(__NHC__)
+#include "OSInfo.hs"
 compilerName = "nhc98"
+compilerVersionRaw = __NHC__
+
 #elif defined(__GLASGOW_HASKELL__)
+#include "ghcplatform.h"
+os = HOST_OS
+arch = HOST_ARCH
 compilerName = "ghc"
+compilerVersionRaw = __GLASGOW_HASKELL__
+
 #elif defined(__HUGS__)
+#include "platform.h"
+os = HOST_OS
+arch = HOST_ARCH
 compilerName = "hugs"
+compilerVersionRaw = 0  -- ToDo
+
 #else
 #error Unknown compiler name
 #endif
-
-#ifdef __GLASGOW_HASKELL__
-compilerVersion :: Version
-compilerVersion = Version {versionBranch=[maj,min], versionTags=[]}
-  where (maj,min) = __GLASGOW_HASKELL__ `divMod` 100
-#endif
-
-#ifdef __NHC__
-compilerVersion :: Version
-compilerVersion = Version {versionBranch=[maj,min], versionTags=[]}
-  where version = __NHC__ `divMod` 100
-        maj = fst version
-        min = snd version
-#endif
-