From ffb05ba37449e9717300101dfc45480a098c753b Mon Sep 17 00:00:00 2001
From: simonm <unknown>
Date: Fri, 15 Jan 1999 14:06:50 +0000
Subject: [PATCH] [project @ 1999-01-15 14:06:50 by simonm] wibble
---
ghc/compiler/basicTypes/OccName.lhs | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/ghc/compiler/basicTypes/OccName.lhs b/ghc/compiler/basicTypes/OccName.lhs
index bc08698e7018..ede2a97f9c41 100644
--- a/ghc/compiler/basicTypes/OccName.lhs
+++ b/ghc/compiler/basicTypes/OccName.lhs
@@ -39,10 +39,12 @@ module OccName (
#include "HsVersions.h"
#if __HASKELL1__ > 4
-import Char ( isAlpha, isUpper, isLower, isAlphaNum{-sigh-}, ord )
+#define ISALPHANUM isAlphaNum
#else
-import Char ( isAlpha, isUpper, isLower, isAlphanum, ord )
+#define ISALPHANUM isAlphanum
#endif
+
+import Char ( isAlpha, isUpper, isLower, ISALPHANUM, ord )
import Util ( thenCmp )
import FiniteMap ( FiniteMap, emptyFM, lookupFM, addToFM, elemFM )
import Outputable
@@ -553,7 +555,7 @@ We provide two interfaces for efficiency.
\begin{code}
identToC :: String -> FAST_STRING
identToC str
- | all isAlphanum str && not std = _PK_ str
+ | all ISALPHANUM str && not std = _PK_ str
| std = _PK_ ("Zs" ++ encode str)
| otherwise = _PK_ (encode str)
where
@@ -561,7 +563,7 @@ identToC str
identFsToC :: FAST_STRING -> FAST_STRING
identFsToC fast_str
- | all isAlphanum str && not std = fast_str
+ | all ISALPHANUM str && not std = fast_str
| std = _PK_ ("Zs" ++ encode str)
| otherwise = _PK_ (encode str)
where
@@ -577,7 +579,7 @@ encode [] = []
encode (c:cs) = encode_ch c ++ encode cs
encode_ch :: Char -> String
-encode_ch c | isAlphanum c = [c]
+encode_ch c | ISALPHANUM c = [c]
-- Common case first
encode_ch 'Z' = "ZZ"
encode_ch '&' = "Za"
--
GitLab