From 46d0b2ed7e4e795bba7b66b59df5a918fa3cf78b Mon Sep 17 00:00:00 2001 From: krasimir Date: Tue, 8 Jun 2010 15:40:47 +0000 Subject: [PATCH] bugfix for flag -no-recomp --- src/compiler/GF/Compile/ReadFiles.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/compiler/GF/Compile/ReadFiles.hs b/src/compiler/GF/Compile/ReadFiles.hs index b96d3127b..acab012cf 100644 --- a/src/compiler/GF/Compile/ReadFiles.hs +++ b/src/compiler/GF/Compile/ReadFiles.hs @@ -60,7 +60,7 @@ getAllFiles opts ps env file = do -- construct list of paths to read paths ds = concatMap mkFile ds where - mkFile (f,st,gfTime,gfoTime,p) = + mkFile (f,st,gfTime,imps,p) = case st of CSComp -> [p gfFile f] CSRead | isJust gfTime -> [gf2gfo opts (p gfFile f)] @@ -80,7 +80,8 @@ getAllFiles opts ps env file = do | otherwise = do (name,st0,t0,imps,p) <- findModule name 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) | otherwise = (st0,t0) return ((name,st,t,imps,p):ds)