aboutsummaryrefslogtreecommitdiffstats
path: root/Combo.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Combo.hs')
-rw-r--r--Combo.hs8
1 files changed, 4 insertions, 4 deletions
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