[project @ 2004-11-30 15:28:12 by simonmar]

Rename Maybe to avoid class with Haskell 98 module of the same name.

real/infer/Infer.hs

@@ -11,7 +11,7 @@ import  Environment           (Env, lookupEnv, extendLocal, extendGlobal,
                                domEnv, freeTVarEnv)
 import  InferMonad            (Infer, thenI, returnI, guardI, getSubI,
                                freshI, freshesI, unifyI, substituteI)
-import  Maybe
+import  MaybeM
 
 specialiseI                   :: PolyType -> Infer MonoType
 specialiseI (All xxs tt)      =  freshesI (length xxs) `thenI` (\yys ->

real/infer/InferMonad.hs

@@ -2,7 +2,7 @@ module InferMonad     (Infer, returnI, eachI, thenI, guardI, useI, getSubI,
                        substituteI, unifyI, freshI, freshesI)
                       where
 
-import Maybe          (Maybe, returnM, eachM, thenM, failM, guardM, theM, existsM, useM)
+import MaybeM         (Maybe, returnM, eachM, thenM, failM, guardM, theM, existsM, useM)
 import StateX         (StateX, returnSX, eachSX, thenSX, toSX, putSX, getSX, useSX)
 import Type           (TVarId, TConId, MonoType (TVar, TCon), freeTVarMono)
 import Substitution   (Sub, applySub, lookupSub, emptySub, extendSub, domSub, unifySub)

real/infer/Main.hs

@@ -7,7 +7,7 @@ import Type
 import Environment
 import InferMonad
 import Substitution	( Sub )
-import Maybe		( Maybe )
+import MaybeM		( Maybe )
 import Infer
 
 main          =  interact

real/infer/Maybe.hs → real/infer/MaybeM.hs

-module Maybe
+module MaybeM
       (Maybe, returnM, eachM, thenM,
        failM, orM, guardM, filterM, theM, existsM, useM)
       where

real/infer/Substitution.hs

@@ -5,7 +5,7 @@ module Substitution   (Sub, applySub, lookupSub, emptySub, extendSub,
 import Type           (TVarId, TConId, MonoType (TVar, TCon), freeTVarMono)
 import FiniteMap      (FM, emptyFM, lookupElseFM, makeFM, extendFM,
                        thenFM, mapFM, domFM, ranFM)
-import Maybe          (Maybe, thenM, returnM, failM, guardM)
+import MaybeM         (Maybe, thenM, returnM, failM, guardM)
 data  Sub  =  MkSub (FM TVarId MonoType)
 rep                           ::  Sub -> FM TVarId MonoType
 rep (MkSub f)                 =   f