From: panne <unknown>
Date: Mon, 31 Jan 2005 19:28:42 +0000 (+0000)
Subject: [project @ 2005-01-31 19:28:42 by panne]
X-Git-Tag: nhc98-1-18-release~50
X-Git-Url: http://git.megacz.com/?p=ghc-base.git;a=commitdiff_plain;h=2f5eceabb9a273bfaf11830714cc209bf7dcc469

[project @ 2005-01-31 19:28:42 by panne]
* Unbreak System.Info for Hugs, rearranging the whole module a bit.

* Platform-specific exports suck, so even Hugs has a compilerVersion
  now, although it is currently always version 0.0 :-)

Tested with Hugs only...
---

diff --git a/System/Info.hs b/System/Info.hs
index c27ef9d..02cfa0d 100644
--- a/System/Info.hs
+++ b/System/Info.hs
@@ -1,4 +1,4 @@
------------------------------------------------------------------------------
+<-----------------------------------------------------------------------------
 -- |
 -- Module      :  System.Info
 -- Copyright   :  (c) The University of Glasgow 2001
@@ -18,51 +18,38 @@ module System.Info
        os,		    -- :: String
        arch,		    -- :: String
        compilerName,	    -- :: String
-#ifdef __GLASGOW_HASKELL__
        compilerVersion	    -- :: Version
-#endif
    ) where
 
 import Prelude
 import Data.Version
 
-#ifndef __NHC__
-
-#include "ghcplatform.h"
-
-arch :: String
-arch = HOST_ARCH
-
-os :: String
-os = HOST_OS
+compilerVersion :: Version
+compilerVersion = Version {versionBranch=[maj,min], versionTags=[]}
+  where (maj,min) = compilerVersionRaw `divMod` 100
 
-#else
-os,arch ::String
-#include "OSInfo.hs"
-#endif
+os, arch, compilerName :: String
+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
-