From: simonmar <unknown>
Date: Thu, 6 Oct 2005 10:39:37 +0000 (+0000)
Subject: [project @ 2005-10-06 10:39:37 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~189
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=026ea0a939957d22803f19b88b1bed2c779e46c5;p=ghc-hetmet.git

[project @ 2005-10-06 10:39:37 by simonmar]
refactoring (use record fields instead of selector functions)

From: Autrijus Tang <autrijus@autrijus.org>
---

diff --git a/ghc/compiler/basicTypes/OccName.lhs b/ghc/compiler/basicTypes/OccName.lhs
index 00a46f0..529117c 100644
--- a/ghc/compiler/basicTypes/OccName.lhs
+++ b/ghc/compiler/basicTypes/OccName.lhs
@@ -162,9 +162,9 @@ nameSpaceString TcClsName = "Type constructor or class"
 
 \begin{code}
 data OccName = OccName 
-			NameSpace
-			EncodedFS
-   {-! derive : Binary !-}
+    { occNameSpace  :: NameSpace
+    , occNameFS     :: EncodedFS
+    }
 \end{code}
 
 
@@ -346,18 +346,12 @@ intersectsOccSet s1 s2 = not (isEmptyOccSet (s1 `intersectOccSet` s2))
 %************************************************************************
 
 \begin{code} 
-occNameFS :: OccName -> EncodedFS
-occNameFS (OccName _ s) = s
-
 occNameString :: OccName -> EncodedString
 occNameString (OccName _ s) = unpackFS s
 
 occNameUserString :: OccName -> UserString
 occNameUserString occ = decode (occNameString occ)
 
-occNameSpace :: OccName -> NameSpace
-occNameSpace (OccName sp _) = sp
-
 setOccNameSpace :: NameSpace -> OccName -> OccName
 setOccNameSpace sp (OccName _ occ) = OccName sp occ