[hoc-cvs] hoc/InterfaceGenerator BindingScript.hs,1.7,1.8 ExportModule.hs,1.4,1.5 Main.hs,1.5,1.6 PrepareDeclarations.hs,1.9,1.10

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/InterfaceGenerator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18523/InterfaceGenerator

Modified Files:
	BindingScript.hs ExportModule.hs Main.hs 
	PrepareDeclarations.hs 
Log Message:
Get HOC/ and InterfaceGenerator/ subdirectories compiling with GHC 6.4



Index: ExportModule.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/InterfaceGenerator/ExportModule.hs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ExportModule.hs	5 Apr 2004 00:04:46 -0000	1.4
+++ ExportModule.hs	31 Mar 2005 15:30:19 -0000	1.5
@@ -13,7 +13,7 @@
 import Enums(enumName, pprEnumType)
 import NameCaseChange
 
-import Data.Set
+import Data.Set hiding (map, null, filter, partition, empty)
 import qualified Data.HashTable as HashTable
 import Data.List(nub, partition, isPrefixOf)
 import Data.Maybe(fromMaybe, catMaybes, mapMaybe, maybeToList, isNothing)

Index: PrepareDeclarations.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/InterfaceGenerator/PrepareDeclarations.hs,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- PrepareDeclarations.hs	5 Apr 2004 00:04:46 -0000	1.9
+++ PrepareDeclarations.hs	31 Mar 2005 15:30:19 -0000	1.10
@@ -17,7 +17,7 @@
 import HOC.SelectorNameMangling(mangleSelectorName)
 
 import Control.Monad(when)
-import Data.Set
+import Data.Set hiding (map)
 import Data.FiniteMap
 import qualified Data.HashTable as HashTable
 import Data.Maybe(maybeToList, fromMaybe, mapMaybe)
@@ -53,11 +53,6 @@
     }
     deriving(Show)
     
-instance (Show key, Show elem) => Show (FiniteMap key elem) where
-    show = show . fmToList
-instance (Show elem) => Show (Set elem) where
-    show = show . setToList
-    
 classInfoForDeclaration (moduleName, SelectorList (Interface name super protocols) methods) =
     Just $ (nameToUppercase name, ClassInfo {
         ciProtocol = False,

Index: BindingScript.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/InterfaceGenerator/BindingScript.hs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- BindingScript.hs	5 Apr 2004 00:04:46 -0000	1.7
+++ BindingScript.hs	31 Mar 2005 15:30:19 -0000	1.8
@@ -13,7 +13,7 @@
 
 import Control.Monad(when)
 import Data.FiniteMap
-import Data.Set
+import Data.Set hiding (map, null)
 import Data.List(intersperse)
 
 import Text.ParserCombinators.Parsec.Language(haskellStyle)

Index: Main.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/InterfaceGenerator/Main.hs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Main.hs	5 Apr 2004 00:04:46 -0000	1.5
+++ Main.hs	31 Mar 2005 15:30:19 -0000	1.6
@@ -6,7 +6,7 @@
 import qualified Data.HashTable as HashTable
 import Data.List(isPrefixOf,isSuffixOf,partition)
 import Data.Maybe(fromMaybe,mapMaybe,isJust,isNothing,catMaybes,maybeToList)
-import Data.Set
+import Data.Set hiding (map, filter, null, partition, empty)
 import Control.Monad(unless)
 
 import System.Info(os)