HEADS UP: Move modules under the System.* and Language.* namespace

* The Plugins.* modules now live under System.Plugins.*
* The Eval.* modules live under System.Eval.*, and they are part of the
  plugins package (no more separate eval package).
* The printf package has been removed
* The Hi.* modules are now available as Language.Hi.Parser

src/hi/Hi.hs

@@ -1,25 +0,0 @@
--- 
--- Copyright (C) 2004 Don Stewart - http://www.cse.unsw.edu.au/~dons
--- 
--- This library is free software; you can redistribute it and/or
--- modify it under the terms of the GNU Lesser General Public
--- License as published by the Free Software Foundation; either
--- version 2.1 of the License, or (at your option) any later version.
--- 
--- This library is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--- Lesser General Public License for more details.
--- 
--- You should have received a copy of the GNU Lesser General Public
--- License along with this library; if not, write to the Free Software
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
--- USA
--- 
-
-module Hi ( 
-        module Hi.Parser
-   ) where
-
-import Hi.Parser {-all-}
-

src/hi/Language/Hi/Binary.hs

@@ -33,7 +33,7 @@
 -- We never have to write stuff, so I've scrubbed all the put* code.
 --
 
-module Hi.Binary ( 
+module Language.Hi.Binary ( 
     {-type-}  Bin,
     {-class-} Binary(..),
     {-type-}  BinHandle,
@@ -69,8 +69,8 @@ module Hi.Binary (
 
 -- import Hi.Utils -- ?
 
-import Hi.FastMutInt
-import Hi.FastString
+import Language.Hi.FastMutInt
+import Language.Hi.FastString
 
 #if __GLASGOW_HASKELL__ < 604
 import Data.FiniteMap
@@ -465,7 +465,7 @@ binaryInterfaceMagic = 0x1face :: Word32
 
 getBinFileWithDict :: Binary a => FilePath -> IO a
 getBinFileWithDict file_path = do
-        bh <- Hi.Binary.readBinMem file_path
+        bh <- Language.Hi.Binary.readBinMem file_path
 
 	-- Read the magic number to check that this really is a GHC .hi file
 	-- (This magic number does not change when we change 
@@ -478,7 +478,7 @@ getBinFileWithDict file_path = do
 	-- Read the dictionary
 	-- The next word in the file is a pointer to where the dictionary is
 	-- (probably at the end of the file)
-        dict_p <- Hi.Binary.get bh	-- Get the dictionary ptr
+        dict_p <- Language.Hi.Binary.get bh	-- Get the dictionary ptr
         data_p <- tellBin bh		-- Remember where we are now
         seekBin bh dict_p
         dict <- getDictionary bh

src/hi/Language/Hi/FastMutInt.hs

@@ -26,7 +26,7 @@
 -- Unboxed mutable Ints
 --
 
-module Hi.FastMutInt (
+module Language.Hi.FastMutInt (
         FastMutInt, 
         newFastMutInt,
         readFastMutInt, 

src/hi/Language/Hi/FastString.hs

@@ -31,7 +31,7 @@
 -- unique identifiers (hash-cons'ish).
 --
 
-module Hi.FastString
+module Language.Hi.FastString
        (
 	FastString(..),     -- not abstract, for now.
 
@@ -65,7 +65,7 @@ module Hi.FastString
 	mkLitString#	    -- :: Addr# -> LitString
        ) where
 
-import Hi.PrimPacked
+import Language.Hi.PrimPacked
 
 import IO
 import Char             ( chr, ord )

src/hi/Language/Hi/Parser.hs

@@ -42,15 +42,15 @@
 
 
 
-module Hi.Parser ( readIface, module Hi.Syntax ) where
+module Language.Hi.Parser ( readIface, module Language.Hi.Syntax ) where
 
-import Hi.Syntax
-import Hi.Binary
-import Hi.FastString
+import Language.Hi.Syntax
+import Language.Hi.Binary
+import Language.Hi.FastString
 
 import GHC.Word  
 
-#include "../../../config.h"
+#include "../../../../config.h"
 
 -- ---------------------------------------------------------------------------
 -- how to get there from here

src/hi/Language/Hi/PrimPacked.hs

@@ -34,7 +34,7 @@
 
 {-# OPTIONS -optc-DNON_POSIX_SOURCE #-}
 
-module Hi.PrimPacked (
+module Language.Hi.PrimPacked (
 	Ptr(..), nullPtr, plusAddr#,
 	BA(..),
 	packString, 	   -- :: String -> (Int, BA)

src/hi/Language/Hi/Syntax.hs

@@ -20,9 +20,9 @@
 --  (c) The University of Glasgow 2002
 --
  
-module Hi.Syntax where
+module Language.Hi.Syntax where
 
-import Hi.FastString
+import Language.Hi.FastString
 
 import Data.List        ( intersperse )
 

src/hi/Makefile

@@ -1,15 +1,15 @@
 PKG	= hi
 UPKG	= Hi
 
-CSRC  = $(UPKG)/hschooks.c
-COBJ  = $(UPKG)/hschooks.o
+CSRC  = Language/$(UPKG)/hschooks.c
+COBJ  = Language/$(UPKG)/hschooks.o
 
-ALL_SRCS=$(wildcard $(patsubst ./%, %, $(patsubst %, %/*.hs, . $(UPKG))))
+ALL_SRCS=$(wildcard $(patsubst ./%, %, $(patsubst %, %/*.hs, Language Language/$(UPKG))))
 
 TOP=../..
 include ../build.mk
 
-HC_OPTS	+= -I$(UPKG)
+HC_OPTS	+= -ILanguage/$(UPKG)
 
 install: install-me
 

src/hi/hi.conf.in.cpp

@@ -26,15 +26,15 @@ license:	BSD3
 maintainer:	libraries@haskell.org
 exposed:	True
 exposed-modules:
-        Hi.Binary,    
-	Hi.FastMutInt,
-	Hi.FastString,
-	Hi.Parser,    
-	Hi.PrimPacked,
-	Hi.Syntax,    
-	Hi            
+	Language.Hi.Parser
 
 hidden-modules:
+        Language.Hi.Binary,
+        Language.Hi.FastString,
+	Language.Hi.Syntax,    
+        Language.Hi.FastMutInt,
+        Language.Hi.PrimPacked
+
 #ifdef INSTALLING
 import-dirs:          LIBDIR/imports
 library-dirs:         LIBDIR