diff options
| author | bringert <bringert@cs.chalmers.se> | 2006-05-20 02:56:06 +0000 |
|---|---|---|
| committer | bringert <bringert@cs.chalmers.se> | 2006-05-20 02:56:06 +0000 |
| commit | b7e1e31909fe6e89887ade077c90c5fdb2081434 (patch) | |
| tree | 0a51c14881df222ac5799330a7abddd66eb968b5 /src/GF/Data | |
| parent | 49849d7fe381bdf20e66e5255ee7d27a8dc300f9 (diff) | |
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.
Diffstat (limited to 'src/GF/Data')
| -rw-r--r-- | src/GF/Data/Glue.hs | 2 | ||||
| -rw-r--r-- | src/GF/Data/Map.hs | 2 | ||||
| -rw-r--r-- | src/GF/Data/Parsers.hs | 2 |
3 files changed, 3 insertions, 3 deletions
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 |