From a25ee154e760a424ef4aef46a6e3d6fdf1079cf1 Mon Sep 17 00:00:00 2001 From: aarne Date: Wed, 15 Sep 2004 14:36:27 +0000 Subject: introducing multiple inheritance --- src/GF/Compile/ShellState.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/GF/Compile/ShellState.hs') diff --git a/src/GF/Compile/ShellState.hs b/src/GF/Compile/ShellState.hs index 8676a60b6..1c90d1369 100644 --- a/src/GF/Compile/ShellState.hs +++ b/src/GF/Compile/ShellState.hs @@ -181,11 +181,10 @@ filterAbstracts abstr cgr = M.MGrammar (nubBy (\x y -> fst x == fst y) [m | m <- Just a -> elem i $ needs a _ -> True needs a = [i | (i,M.ModMod m) <- ms, not (M.isModAbs m) || dep i a] - dep i a = elem i (ext a mse) + dep i a = elem i (ext mse a) mse = [(i,me) | (i,M.ModMod m) <- ms, M.isModAbs m, me <- [M.extends m]] - ext a es = case lookup a es of - Just (Just e) -> a : ext e es - Just _ -> a : [] + ext es a = case lookup a es of + Just e -> a : concatMap (ext es) e ---- FIX multiple exts _ -> [] -- cgit v1.2.3