From e620ffbd9432fc9ab4f3174ecf9c117db27af772 Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 23 Oct 2003 15:09:07 +0000 Subject: Working with interfaces and incomplete modules. --- src/GF/Canon/MkGFC.hs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/GF/Canon/MkGFC.hs') diff --git a/src/GF/Canon/MkGFC.hs b/src/GF/Canon/MkGFC.hs index d747634d2..7547280a9 100644 --- a/src/GF/Canon/MkGFC.hs +++ b/src/GF/Canon/MkGFC.hs @@ -21,29 +21,29 @@ canon2grammar (Gr modules) = M.MGrammar $ map mod2info modules where MTAbs a -> (a,M.MTAbstract) MTRes a -> (a,M.MTResource) MTCnc a x -> (a,M.MTConcrete x) - MTTrans a x y -> (a,M.MTTransfer (M.OSimple x) (M.OSimple y)) - in (a,M.ModMod (M.Module mt' flags (ee e) (oo os) defs')) + MTTrans a x y -> (a,M.MTTransfer (M.oSimple x) (M.oSimple y)) + in (a,M.ModMod (M.Module mt' M.MSComplete flags (ee e) (oo os) defs')) ee (Ext m) = Just m ee _ = Nothing - oo (Opens ms) = map M.OSimple ms + oo (Opens ms) = map M.oSimple ms oo _ = [] grammar2canon :: CanonGrammar -> Canon grammar2canon (M.MGrammar modules) = Gr $ map info2mod modules info2mod m = case m of - (a, M.ModMod (M.Module mt flags me os defs)) -> + (a, M.ModMod (M.Module mt _ flags me os defs)) -> let defs' = map info2def $ tree2list defs mt' = case mt of M.MTAbstract -> MTAbs a M.MTResource -> MTRes a M.MTConcrete x -> MTCnc a x - M.MTTransfer (M.OSimple x) (M.OSimple y) -> MTTrans a x y + M.MTTransfer (M.OSimple _ x) (M.OSimple _ y) -> MTTrans a x y in Mod mt' (gfcE me) (gfcO os) flags defs' where gfcE = maybe NoExt Ext - gfcO os = if null os then NoOpens else Opens [m | M.OSimple m <- os] + gfcO os = if null os then NoOpens else Opens [m | M.OSimple _ m <- os] -- these translations are meant to be trivial -- cgit v1.2.3