X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=System%2FInfo.hs;h=92da1a64b7b43a364232f29a0f6e9cf894164cd3;hb=HEAD;hp=02cd45de0bd2506ed9b3077a4b1ff7696a3957de;hpb=3c52c938ecbf4c769d0dfcb310707149dcef1f93;p=ghc-base.git

diff --git a/System/Info.hs b/System/Info.hs
index 02cd45d..92da1a6 100644
--- a/System/Info.hs
+++ b/System/Info.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE CPP #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  System.Info
@@ -8,32 +10,59 @@
 -- 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.
 --
 -----------------------------------------------------------------------------
 
-#ifndef __NHC__
-#include "MachDeps.h"
-#endif
-
 module System.Info
    (
        os,		    -- :: String
-       arch		    -- :: String
+       arch,		    -- :: String
+       compilerName,	    -- :: String
+       compilerVersion	    -- :: Version
    ) 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
 
+-- | The operating system on which the program is running.
+os :: String
+
+-- | The machine architecture on which the program is running.
 arch :: String
+
+-- | The Haskell implementation with which the program was compiled
+-- or is being interpreted.
+compilerName :: String
+
+compilerVersionRaw :: Int
+
+#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__
 
-os :: String
+#elif defined(__HUGS__)
+#include "platform.h"
 os = HOST_OS
+arch = HOST_ARCH
+compilerName = "hugs"
+compilerVersionRaw = 0  -- ToDo
 
 #else
-os,arch ::String
-#include "OSInfo.hs"
+#error Unknown compiler name
 #endif