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

another bugfix in the module dependency checker

Browse Source
This commit is contained in:
krasimir
2009-02-01 21:32:46 +00:00
parent 75829ceab3
commit 7a882b5c36
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/GF/Compile/ReadFiles.hs
View File

@@ -78,7 +78,7 @@ getAllFiles opts ps env file = do
| otherwise = do | otherwise = do
(name,st0,t0,imps,p) <- findModule name (name,st0,t0,imps,p) <- findModule name
ds <- foldM (get (name:trc)) ds imps ds <- foldM (get (name:trc)) ds imps
let (st,t) | (not . null) [f | (f,CSComp,_,_,_) <- ds, elem f imps] let (st,t) | (not . null) [f | (f,_,t1,_,_) <- ds, elem f imps && liftM2 (>=) t0 t1 /= Just True]
= (CSComp,Nothing) = (CSComp,Nothing)
| otherwise = (st0,t0) | otherwise = (st0,t0)
return ((name,st,t,imps,p):ds) return ((name,st,t,imps,p):ds)
@@ -154,7 +154,7 @@ selectFormat opts mtenv mtgf mtgfo =
(Just tenv,_,Just tgf) | tenv > tgf -> (CSEnv, Just tenv) (Just tenv,_,Just tgf) | tenv > tgf -> (CSEnv, Just tenv)
(_,Just tgfo,Just tgf) | tgfo > tgf -> (CSRead,Just tgfo) (_,Just tgfo,Just tgf) | tgfo > tgf -> (CSRead,Just tgfo)
(Just tenv,_,Nothing) -> (CSEnv,Just tenv) -- source does not exist (Just tenv,_,Nothing) -> (CSEnv,Just tenv) -- source does not exist
(_,_, Nothing) -> (CSRead,Nothing) -- source does not exist (_,Just tgfo,Nothing) -> (CSRead,Just tgfo) -- source does not exist
_ -> (CSComp,Nothing) _ -> (CSComp,Nothing)
where where
fromComp = flag optRecomp opts == NeverRecomp fromComp = flag optRecomp opts == NeverRecomp