msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

bugfix for flag -no-recomp

Browse Source
This commit is contained in:
krasimir
2010-06-08 15:40:47 +00:00
parent 142cdc306d
commit 46d0b2ed7e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/compiler/GF/Compile/ReadFiles.hs
View File

@@ -60,7 +60,7 @@ getAllFiles opts ps env file = do
-- construct list of paths to read -- construct list of paths to read
paths ds = concatMap mkFile ds paths ds = concatMap mkFile ds
where where
mkFile (f,st,gfTime,gfoTime,p) = mkFile (f,st,gfTime,imps,p) =
case st of case st of
CSComp -> [p </> gfFile f] CSComp -> [p </> gfFile f]
CSRead | isJust gfTime -> [gf2gfo opts (p </> gfFile f)] CSRead | isJust gfTime -> [gf2gfo opts (p </> gfFile f)]
@@ -80,7 +80,8 @@ 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,_,t1,_,_) <- ds, elem f imps && liftM2 (>=) t0 t1 /= Just True] let (st,t) | (not . null) [f | (f,_,t1,_,_) <- ds, elem f imps && liftM2 (>=) t0 t1 /= Just True] &&
flag optRecomp opts == RecompIfNewer
= (CSComp,Nothing) = (CSComp,Nothing)
| otherwise = (st0,t0) | otherwise = (st0,t0)
return ((name,st,t,imps,p):ds) return ((name,st,t,imps,p):ds)