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.

This commit is contained in:
bringert
2006-05-20 02:56:06 +00:00
parent 49849d7fe3
commit b7e1e31909
14 changed files with 36 additions and 24 deletions

View File

@@ -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"

View File

@@ -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]

View File

@@ -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