[project @ 1999-01-15 13:32:19 by simonm]

[ghc-hetmet.git] / ghc / compiler / basicTypes / OccName.lhs

diff --git a/ghc/compiler/basicTypes/OccName.lhs b/ghc/compiler/basicTypes/OccName.lhs
index 4a0901f..bc08698 100644 (file)
--- a/ghc/compiler/basicTypes/OccName.lhs
+++ b/ghc/compiler/basicTypes/OccName.lhs
@@ -20,6 +20,7 @@ module OccName (
        mkClassTyConOcc, mkClassDataConOcc,
        
        isTvOcc, isTCOcc, isVarOcc, isConSymOcc, isConOcc, isSymOcc,
+       isWildCardOcc, isAnonOcc, 
        pprOccName, occNameString, occNameFlavour, 
 
        -- The basic form of names
@@ -37,7 +38,11 @@ module OccName (
 
 #include "HsVersions.h"
 
+#if __HASKELL1__ > 4
+import Char    ( isAlpha, isUpper, isLower, isAlphaNum{-sigh-}, ord )
+#else
 import Char    ( isAlpha, isUpper, isLower, isAlphanum, ord )
+#endif
 import Util    ( thenCmp )
 import FiniteMap ( FiniteMap, emptyFM, lookupFM, addToFM, elemFM )
 import Outputable
@@ -390,7 +395,7 @@ occNameFlavour (OccName TvOcc _ _ _)                     = "Type variable"
 occNameFlavour (OccName TCOcc s _ _)                = "Type constructor or class"
 
 isVarOcc, isTCOcc, isTvOcc,
- isConSymOcc, isSymOcc :: OccName -> Bool
+ isConSymOcc, isSymOcc, isWildCardOcc :: OccName -> Bool
 
 isVarOcc (OccName VarOcc _ _ _) = True
 isVarOcc other                  = False
@@ -406,6 +411,10 @@ isConSymOcc (OccName _ s _ _) = isLexConSym s
 isSymOcc (OccName _ s _ _) = isLexSym s
 
 isConOcc (OccName _ s _ _) = isLexCon s
+
+isWildCardOcc (OccName _ s _ _) = (_HEAD_ s) == '_' && _LENGTH_ s == 1 
+
+isAnonOcc (OccName _ s _ _) = (_HEAD_ s) == '_'
 \end{code}
 
 
@@ -581,7 +590,7 @@ encode_ch '#'  = "Zh"
 encode_ch '<'  = "Zl"
 encode_ch '-'  = "Zm"
 encode_ch '!'  = "Zn"
-encode_ch '.'  = "Zd"
+encode_ch '.'  = "Zs"
 encode_ch '\'' = "Zq"
 encode_ch '*'  = "Zt"
 encode_ch '+'  = "Zp"