Update of /cvsroot/hoc/hoc/HOC/HOC
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv19794/HOC/HOC
Modified Files:
CannedCIFs.hs DeclareSelector.hs TH.hs
Log Message:
Update for GHC 6.6
Index: DeclareSelector.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC/DeclareSelector.hs,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- DeclareSelector.hs 12 Mar 2006 18:49:41 -0000 1.12
+++ DeclareSelector.hs 1 Nov 2006 15:45:04 -0000 1.13
@@ -188,7 +188,7 @@
then [|n|]
else stringE haskellName)
$(staticCifForSelectorType
- "HOC.DeclareSelector"
+ 'marshallersUpTo
cannedCIFTypeNames
(return $ simplifyType doctoredTypeSig))
|]) [],
@@ -213,8 +213,8 @@
isUnit isPure resultRetained
else valD (varP $ mkName haskellName) (normalB [|
$(varE $
- mkNameG_v "HOC.DeclareSelector" $
- marshallerName nArgs isUnit
+ marshallerName nArgs isUnit `fromSameModuleAs_v`
+ 'marshallersUpTo
)
$(varE $ mkName infoName)
|]) []
Index: CannedCIFs.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC/CannedCIFs.hs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CannedCIFs.hs 26 Jul 2005 05:22:18 -0000 1.2
+++ CannedCIFs.hs 1 Nov 2006 15:45:04 -0000 1.3
@@ -3,7 +3,7 @@
import HOC.Base ( SEL )
import HOC.Arguments ( getCifForSelector )
import HOC.ID ( ID )
-import HOC.TH ( mkNameG_v )
+import HOC.TH ( fromSameModuleAs_v )
import Data.List ( intersperse )
import Data.Maybe ( catMaybes )
@@ -111,11 +111,11 @@
cannedCIFName n = mkName $ "cannedCIF_" ++ n
-staticCifForSelectorType mod ns t
+staticCifForSelectorType master ns t
= do
mbName <- getCifTypeName t
xt <- t
case mbName of
Just n | n `elem` ns
- -> varE $ mkNameG_v mod $ "cannedCIF_" ++ n
+ -> varE $ ("cannedCIF_" ++ n) `fromSameModuleAs_v` master
_ -> [| getCifForSelector $( [| undefined |] `sigE` t) |]
Index: TH.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC/TH.hs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TH.hs 20 Mar 2006 06:25:26 -0000 1.3
+++ TH.hs 1 Nov 2006 15:45:04 -0000 1.4
@@ -19,6 +19,7 @@
decls <- declsQ
header (map return decls)
+{-
fromSameModuleAs_tc :: String -> Name -> Name
s `fromSameModuleAs_tc` n
= case nameModule n of
@@ -30,3 +31,16 @@
= case nameModule n of
Nothing -> mkName s
Just m -> mkNameG_v m s
+-}
+
+fromSameModuleAs_tc :: String -> Name -> Name
+fromSameModuleAs_tc = fromSameModule TcClsName
+fromSameModuleAs_v :: String -> Name -> Name
+fromSameModuleAs_v = fromSameModule VarName
+
+fromSameModule :: NameSpace -> String -> Name -> Name
+fromSameModule ns s n
+ = Name (mkOccName s) $
+ case n of
+ Name _ (NameG _ pkg mod) -> NameG ns pkg mod
+ Name _ other -> other
|
