GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-22 19:22:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

error recovery in rename and check grammar: report all errors in a module before terminating

Browse Source
This commit is contained in:
aarne
2008-05-30 16:45:48 +00:00
parent c0ba151aa9
commit 3a20b4883d
3 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src-3.0/GF/Compile/CheckGrammar.hs
View File

@@ -56,6 +56,11 @@ showCheckModule mos m = do
(st,(_,msg)) <- checkStart $ checkModule mos m
return (st, unlines $ reverse msg)
mapsCheckTree ::
(Ord a) => ((a,b) -> Check (a,c)) -> BinTree a b -> Check (BinTree a c)
mapsCheckTree f = checkErr . mapsErrTree (\t -> checkStart (f t) >>= return . fst)
-- | checking is performed in the dependency order of modules
checkModule :: [SourceModule] -> SourceModule -> Check [SourceModule]
checkModule ms (name,mod) = checkIn ("checking module" +++ prt name) $ case mod of
@@ -63,24 +68,24 @@ checkModule ms (name,mod) = checkIn ("checking module" +++ prt name) $ case mod
ModMod mo@(Module mt st fs me ops js) -> do
checkRestrictedInheritance ms (name, mo)
js' <- case mt of
MTAbstract -> mapMTree (checkAbsInfo gr name) js
MTAbstract -> mapsCheckTree (checkAbsInfo gr name) js
MTTransfer a b -> mapMTree (checkAbsInfo gr name) js
MTTransfer a b -> mapsCheckTree (checkAbsInfo gr name) js
MTResource -> mapMTree (checkResInfo gr name) js
MTResource -> mapsCheckTree (checkResInfo gr name) js
MTConcrete a -> do
checkErr $ topoSortOpers $ allOperDependencies name js
ModMod abs <- checkErr $ lookupModule gr a
js1 <- checkCompleteGrammar abs mo
mapMTree (checkCncInfo gr name (a,abs)) js1
mapsCheckTree (checkCncInfo gr name (a,abs)) js1
MTInterface -> mapMTree (checkResInfo gr name) js
MTInterface -> mapsCheckTree (checkResInfo gr name) js
MTInstance a -> do
ModMod abs <- checkErr $ lookupModule gr a
-- checkCompleteInstance abs mo -- this is done in Rebuild
mapMTree (checkResInfo gr name) js
mapsCheckTree (checkResInfo gr name) js
return $ (name, ModMod (Module mt st fs me ops js')) : ms

2
src-3.0/GF/Compile/Rename.hs
View File

@@ -58,7 +58,7 @@ renameModule ms (name,mod) = errIn ("renaming module" +++ prt name) $ case mod o
ModMod m@(Module mt st fs me ops js) -> do
let js1 = jments m
status <- buildStatus (MGrammar ms) name mod
js2 <- mapMTree (renameInfo status) js1
js2 <- mapsErrTree (renameInfo status) js1
let mod2 = ModMod $ Module mt st fs me (map forceQualif ops) js2
return $ (name,mod2) : ms