projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a21c47c
)
Follow OccName changes in Convert
author
Max Bolingbroke
<batterseapower@hotmail.com>
Thu, 31 Jul 2008 12:07:41 +0000
(12:07 +0000)
committer
Max Bolingbroke
<batterseapower@hotmail.com>
Thu, 31 Jul 2008 12:07:41 +0000
(12:07 +0000)
compiler/hsSyn/Convert.lhs
patch
|
blob
|
history
diff --git
a/compiler/hsSyn/Convert.lhs
b/compiler/hsSyn/Convert.lhs
index
5a5bb1b
..
6b1014e
100644
(file)
--- 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:_)
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
badOcc :: OccName.NameSpace -> String -> SDoc
badOcc ctxt_ns occ
@@
-634,8
+634,8
@@
isBuiltInOcc ctxt_ns occ
go_tuple _ _ = Nothing
tup_name n
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
mk_uniq_occ :: OccName.NameSpace -> String -> Int# -> OccName.OccName
mk_uniq_occ ns occ uniq