From 1af7582b30d70ded97db92a69673849372c98fb9 Mon Sep 17 00:00:00 2001 From: David Roundy Date: Tue, 12 Jun 2007 17:12:09 +0200 Subject: changes to work with Stacks that can't be empty. darcs-hash:20070612151209-72aca-62307f8565fc32ca80be8daf2c30fe414d49111e.gz --- Combo.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Combo.hs') diff --git a/Combo.hs b/Combo.hs index fa9c6c6..449a837 100644 --- a/Combo.hs +++ b/Combo.hs @@ -13,14 +13,14 @@ combo origls super = Layout { doLayout = \r s -> arrange r (integrate s), modify where arrange _ [] = return [] arrange r [w] = return [(w,r)] arrange rinput origws = - do rs <- map snd `fmap` doLayout super rinput (differentiate $ take (length origls) origws) + do rs <- map snd `fmap` runLayout super rinput (differentiate $ take (length origls) origws) let wss [] _ = [] wss [_] ws = [ws] wss (n:ns) ws = take len1 ws : wss ns (drop len1 ws) where len1 = min n (length ws - length ns) - out <- sequence $ zipWith3 doLayout (map fst origls) rs - (map differentiate $ - wss (take (length rs) $ map snd origls) origws) + out <- sequence $ zipWith3 runLayout (map fst origls) rs + (map differentiate $ + wss (take (length rs) $ map snd origls) origws) return $ concat out message m = do msuper' <- modifyLayout super m case msuper' of -- cgit v1.2.3