From 9adf8dd808d7b48cfe41a0ca8839fc97bdf87aa4 Mon Sep 17 00:00:00 2001 From: Max Bolingbroke Date: Thu, 31 Jul 2008 12:07:41 +0000 Subject: [PATCH] Follow OccName changes in Convert --- compiler/hsSyn/Convert.lhs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/hsSyn/Convert.lhs b/compiler/hsSyn/Convert.lhs index 5a5bb1b..6b1014e 100644 --- a/compiler/hsSyn/Convert.lhs +++ b/compiler/hsSyn/Convert.lhs @@ -591,8 +591,8 @@ cvtName ctxt_ns (TH.Name occ flavour) okOcc :: OccName.NameSpace -> String -> Bool okOcc _ [] = False okOcc ns str@(c:_) - | OccName.isVarName ns = startsVarId c || startsVarSym c - | otherwise = startsConId c || startsConSym c || str == "[]" + | OccName.isVarNameSpace ns = startsVarId c || startsVarSym c + | otherwise = startsConId c || startsConSym c || str == "[]" badOcc :: OccName.NameSpace -> String -> SDoc badOcc ctxt_ns occ @@ -634,8 +634,8 @@ isBuiltInOcc ctxt_ns occ go_tuple _ _ = Nothing tup_name n - | OccName.isTcClsName ctxt_ns = Name.getName (tupleTyCon Boxed n) - | otherwise = Name.getName (tupleCon Boxed n) + | OccName.isTcClsNameSpace ctxt_ns = Name.getName (tupleTyCon Boxed n) + | otherwise = Name.getName (tupleCon Boxed n) mk_uniq_occ :: OccName.NameSpace -> String -> Int# -> OccName.OccName mk_uniq_occ ns occ uniq -- 1.7.10.4