From 01fef5109c2920d13004ae5b94d192fa5fba205f Mon Sep 17 00:00:00 2001 From: krasimir Date: Mon, 23 Feb 2009 12:42:44 +0000 Subject: Perhaps -> Maybe refactoring and better error message for conflicts during module update --- src/GF/Compile/Refresh.hs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/GF/Compile/Refresh.hs') diff --git a/src/GF/Compile/Refresh.hs b/src/GF/Compile/Refresh.hs index d446008d0..ba6142ddd 100644 --- a/src/GF/Compile/Refresh.hs +++ b/src/GF/Compile/Refresh.hs @@ -116,18 +116,18 @@ refreshModule (k,ms) mi@(i,mo) | otherwise = return (k, mi:ms) where refreshRes (k,cs) ci@(c,info) = case info of - ResOper ptyp (Yes trm) -> do ---- refresh ptyp + ResOper ptyp (Just trm) -> do ---- refresh ptyp (k',trm') <- refreshTermKN k trm - return $ (k', (c, ResOper ptyp (Yes trm')):cs) + return $ (k', (c, ResOper ptyp (Just trm')):cs) ResOverload os tyts -> do (k',tyts') <- liftM (\ (t,(_,i)) -> (i,t)) $ appSTM (mapPairsM refresh tyts) (initIdStateN k) return $ (k', (c, ResOverload os tyts'):cs) - CncCat mt (Yes trm) pn -> do ---- refresh mt, pn + CncCat mt (Just trm) pn -> do ---- refresh mt, pn (k',trm') <- refreshTermKN k trm - return $ (k', (c, CncCat mt (Yes trm') pn):cs) - CncFun mt (Yes trm) pn -> do ---- refresh pn + return $ (k', (c, CncCat mt (Just trm') pn):cs) + CncFun mt (Just trm) pn -> do ---- refresh pn (k',trm') <- refreshTermKN k trm - return $ (k', (c, CncFun mt (Yes trm') pn):cs) + return $ (k', (c, CncFun mt (Just trm') pn):cs) _ -> return (k, ci:cs) -- cgit v1.2.3