From b7e1e31909fe6e89887ade077c90c5fdb2081434 Mon Sep 17 00:00:00 2001
From: bringert <bringert@cs.chalmers.se>
Date: Sat, 20 May 2006 02:56:06 +0000
Subject: Changes to make GF compile with GHC 6.5 from CVS: remove inlines use
 of !, change all latin-1 characters in haskell code to escapes.

---
 src/GF/Data/Glue.hs    | 2 +-
 src/GF/Data/Map.hs     | 2 +-
 src/GF/Data/Parsers.hs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/GF/Data')

diff --git a/src/GF/Data/Glue.hs b/src/GF/Data/Glue.hs
index b3a766418..4f276222b 100644
--- a/src/GF/Data/Glue.hs
+++ b/src/GF/Data/Glue.hs
@@ -26,5 +26,5 @@ decomposeSimple t s = do
     else return $ concat [intersperse "&+" ws | ws <- ss]
 
 exTrie = tcompile (zip ws ws) where 
-  ws = words "ett två tre tjugo trettio hundra tusen"
+  ws = words "ett tv\229 tre tjugo trettio hundra tusen"
 
diff --git a/src/GF/Data/Map.hs b/src/GF/Data/Map.hs
index ea27826f6..c86c9ab55 100644
--- a/src/GF/Data/Map.hs
+++ b/src/GF/Data/Map.hs
@@ -39,7 +39,7 @@ empty = emptyTree
 
 -- | lookup operator.
 (!) :: Ord key => Map key el -> key -> Maybe el
-fm ! e = lookupTree e fm
+(!) fm e = lookupTree e fm
 
 -- | lookupMany operator.
 (!+) :: Ord key => Map key el -> [key] -> [Maybe el]
diff --git a/src/GF/Data/Parsers.hs b/src/GF/Data/Parsers.hs
index 7333510f8..d9920c3d2 100644
--- a/src/GF/Data/Parsers.hs
+++ b/src/GF/Data/Parsers.hs
@@ -170,7 +170,7 @@ pIdent = pLetter ... longestOfMany pAlphaPlusChar *** uncurry (:)
 
 pLetter, pDigit :: Parser Char Char
 pLetter = satisfy (`elem` (['A'..'Z'] ++ ['a'..'z'] ++ 
-                           ['À' .. 'Û'] ++ ['à' .. 'û'])) -- no such in Char
+                           ['\192' .. '\255'])) -- no such in Char
 pDigit  = satisfy isDigit
 
 pLetters :: Parser Char String
-- 
cgit v1.2.3