X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=System%2FInfo.hs;h=597f2c8266964f1e3f016c74f3b90e6371d42154;hb=b9b6e38a1ebb5f05b382609fe0776d91cdd1090b;hp=452cec5c8dd641e68f71bd74194108e2272e6ecf;hpb=f7a485978f04e84b086f1974b88887cc72d832d0;p=haskell-directory.git

diff --git a/System/Info.hs b/System/Info.hs
index 452cec5..597f2c8 100644
--- a/System/Info.hs
+++ b/System/Info.hs
@@ -8,23 +8,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.
 --
 -----------------------------------------------------------------------------
 
-#include "MachDeps.h"
-
 module System.Info
    (
        os,		    -- :: String
-       arch		    -- :: String
+       arch,		    -- :: String
+       compilerName,	    -- :: String
+       compilerVersion	    -- :: Version
    ) where
 
 import Prelude
+import Data.Version
+
+-- | The version of 'compilerName' with which the program was compiled
+-- or is being interpreted.
+compilerVersion :: Version
+compilerVersion = Version {versionBranch=[maj,min], versionTags=[]}
+  where (maj,min) = 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
+#error Unknown compiler name
+#endif