diff options
| author | Max Bolingbroke <batterseapower@hotmail.com> | 2008-07-31 12:07:41 +0000 |
|---|---|---|
| committer | Max Bolingbroke <batterseapower@hotmail.com> | 2008-07-31 12:07:41 +0000 |
| commit | 9adf8dd808d7b48cfe41a0ca8839fc97bdf87aa4 (patch) | |
| tree | 64c320a2f29ba9623e3afd3affcdf34e0d4226bd | |
| parent | a21c47c238161b9b337013085f50feeba9979a02 (diff) | |
| download | haskell-9adf8dd808d7b48cfe41a0ca8839fc97bdf87aa4.tar.gz | |
Follow OccName changes in Convert
| -rw-r--r-- | compiler/hsSyn/Convert.lhs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/hsSyn/Convert.lhs b/compiler/hsSyn/Convert.lhs index 5a5bb1b1a9..6b1014e03c 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 |