[hoc-cvs] hoc/HOC/HOC ExportClass.hs,1.6,1.7

[Wolfgang T. <wth...@us...>]

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

Modified Files:
	ExportClass.hs 
Log Message:
This is GHC 6.4 Template Haskell, so we don't need to reexport
the InstanceVariables class any more (and this also helps work around
a GHC 6.4 bug)


Index: ExportClass.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC/ExportClass.hs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ExportClass.hs	6 Dec 2004 03:46:51 -0000	1.6
+++ ExportClass.hs	31 Mar 2005 20:44:08 -0000	1.7
@@ -70,10 +70,16 @@
             [normalC (mkName instanceDataName) strictTypes] [''Typeable],
         valD (varP $ mkName tyConVar) (normalB [| mkTyCon instanceDataName |]) [],
         instanceD (cxt []) (conT ''InstanceVariables
-                            `appT` clsTy `appT` instTy) `whereQ`
-            [d|
-                initializeInstanceVariables = $(initIVars)
-            |]
+                            `appT` clsTy `appT` instTy) 
+                [
+--                  All we want to do is this:
+--                      initializeInstanceVariables = $(initIVars)
+--                  But we want the name initializeInstanceVariables refer directly
+--                  to this module, so that we don't have to export it, but keep it
+--                  private.
+                    do e <- initIVars
+                       return (ValD (VarP 'initializeInstanceVariables) (NormalB e) [])
+                ]
     ] ++ declaredIVars
     where
         exportFunName = "initializeClass_" ++ name