From 54c72f5ab023c0cdac83eb28dd1f81d4cd35aeae Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 11 Nov 2003 15:44:24 +0000 Subject: Working with interfaces. Working with interfaces. Created new place for grammar parsers. Created new script jgf2+. --- src/GF/Compile/Rename.hs | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) (limited to 'src/GF/Compile/Rename.hs') diff --git a/src/GF/Compile/Rename.hs b/src/GF/Compile/Rename.hs index 3a0bf5c52..20914ecc1 100644 --- a/src/GF/Compile/Rename.hs +++ b/src/GF/Compile/Rename.hs @@ -33,39 +33,13 @@ renameSourceTerm g m t = do renameModule :: [SourceModule] -> SourceModule -> Err [SourceModule] renameModule ms (name,mod) = errIn ("renaming module" +++ prt name) $ case mod of - ModMod (Module mt st fs me ops js) -> do - (_,mod1@(ModMod m)) <- extendModule ms (name,mod) + ModMod m@(Module mt st fs me ops js) -> do let js1 = jments m - status <- buildStatus (MGrammar ms) name mod1 + status <- buildStatus (MGrammar ms) name mod js2 <- mapMTree (renameInfo status) js1 let mod2 = ModMod $ Module mt st fs me (map forceQualif ops) js2 return $ (name,mod2) : ms -extendModule :: [SourceModule] -> SourceModule -> Err SourceModule -extendModule ms (name,mod) = case mod of - ModMod (Module mt st fs me ops js0) -> do - js <- case mt of -{- --- building the {s : Str} lincat - MTConcrete a -> do - ModMod ma <- lookupModule (MGrammar ms) a - let cats = [c | (c,AbsCat _ _) <- tree2list $ jments ma] - jscs = [(c,CncCat (yes defLinType) nope nope) | c <- cats] - return $ updatesTreeNondestr jscs js0 --} - _ -> return js0 - js1 <- case me of - Just n -> do - m0 <- case lookup n ms of - Just (ModMod m) -> do - testErr (sameMType (mtype m) mt) - ("illegal extension type to module" +++ prt name) - return m - _ -> Bad $ "cannot find extended module" +++ prt n - extendMod n (jments m0) js - _ -> return js - return $ (name,ModMod (Module mt st fs me ops js1)) - - type Status = (StatusTree, [(OpenSpec Ident, StatusTree)]) type StatusTree = BinTree (Ident,StatusInfo) -- cgit v1.2.3