Changeset 22988 for src

Timestamp:

11/12/08 09:59:51 (8 weeks ago)

Author:

audreyt

Message:

* GHC 6.10 support, part 1 of 3: Adjust for Map.lookup's new signature.

Location:

src

Files:

• Paths_Pugs.hs (modified) (1 diff)
• Pugs/CodeGen.hs (modified) (1 diff)
• Pugs/Prim/Yaml.hs (modified) (1 diff)

src/Paths_Pugs.hs

@@ -8 +8 @@
 getDataFileName :: FilePath -> IO FilePath
 getDataFileName fn = do
-    dir <- Map.lookup "sourcedir" config
+    dir <- case Map.lookup "sourcedir" config of
+       Just rv -> return rv
+       _       -> fail "Cannot find 'sourcedir' in config!"
     rvf <- doesFileExist $ dir </> fn
     rvd <- doesDirectoryExist $ dir </> fn

src/Pugs/CodeGen.hs

@@ -88 +88 @@
             hPutStrLn stderr $ "*** The backend '" ++ s ++ "' is deprecated."
             hPutStrLn stderr $ "    Please use '" ++ key ++ "' instead."
-            Map.lookup key generators
-        key -> Map.lookup key generators
+            lookupGenerator key
+        key -> lookupGenerator key
+    where
+    lookupGenerator :: String -> IO Generator
+    lookupGenerator k = case Map.lookup k generators of
+        Just g -> return g
+        _      -> fail $ "Cannot find generator: " ++ k
 
 codeGen :: String -> FilePath -> Env -> IO String

src/Pugs/Prim/Yaml.hs

@@ -54 +54 @@
             spec'   <- io . newTVarIO $ Map.fromList (vals :: [(String, Val)])
             spec    <- stm . readTVar $ spec'
-            rule    <- fromVal =<< Map.lookup "rule" spec
-            global  <- fromVal =<< Map.lookup "global" spec
-            stringify <- fromVal =<< Map.lookup "stringify" spec
-            adverbs <- Map.lookup "adverbs" spec
+            rule    <- case Map.lookup "rule" spec of
+                Just v -> fromVal v 
+                _      -> fail "Cannot find the 'rule' spec"
+            global  <- case Map.lookup "global" spec of
+                Just v -> fromVal v 
+                _      -> fail "Cannot find the 'global' spec"
+            stringify <- case Map.lookup "stringify" spec of
+                Just v -> fromVal v 
+                _      -> fail "Cannot find the 'stringify' spec"
+            adverbs <- case Map.lookup "adverbs" spec of
+                Just v -> fromVal v 
+                _      -> fail "Cannot find the 'adverbs' spec"
             return $ VRule MkRulePGE{rxRule=rule, rxGlobal=global, rxStringify=stringify, rxAdverbs=adverbs}
         Just x   -> error ("can't deserialize: " ++ unpackBuf x)