diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/GF/Compile/Rebuild.hs | 5 | ||||
| -rw-r--r-- | src/GF/Infra/ReadFiles.hs | 18 |
2 files changed, 16 insertions, 7 deletions
diff --git a/src/GF/Compile/Rebuild.hs b/src/GF/Compile/Rebuild.hs index b00397eb9..7404ac0bf 100644 --- a/src/GF/Compile/Rebuild.hs +++ b/src/GF/Compile/Rebuild.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/03/08 18:08:58 $ +-- > CVS $Date: 2005/03/15 17:18:51 $ -- > CVS $Author: aarne $ --- > CVS $Revision: 1.10 $ +-- > CVS $Revision: 1.11 $ -- -- Rebuild a source module from incomplete and its with-instance. ----------------------------------------------------------------------------- @@ -71,6 +71,7 @@ rebuildModule ms mo@(i,mi) = do let ops1 = ops ++ [o | o <- ops0, notElem (openedModule o) infs] ++ [oQualif i i | i <- map snd insts] ---- ++ [oSimple i | i <- map snd insts] ---- + ---- ++ [oSimple ext] ---- to encode dependence --- check if me is incomplete return $ ModMod $ Module mt0 stat' fs me ops1 js ---- (mapTree (qualifInstanceInfo insts) js) -- not needed diff --git a/src/GF/Infra/ReadFiles.hs b/src/GF/Infra/ReadFiles.hs index 9315633b3..414df59bb 100644 --- a/src/GF/Infra/ReadFiles.hs +++ b/src/GF/Infra/ReadFiles.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/03/08 18:08:58 $ +-- > CVS $Date: 2005/03/15 17:18:52 $ -- > CVS $Author: aarne $ --- > CVS $Revision: 1.20 $ +-- > CVS $Revision: 1.21 $ -- -- Decide what files to read as function of dependencies and time stamps. -- @@ -135,19 +135,27 @@ needCompile opts headers sfiles0 = paths $ res $ mark $ iter changed where (f,(path,st0)) <- sfiles, let st = if (elem f cs) then CSComp else st0] + -- if a compilable file depends on a resource, read gfr instead of gfc/env -- but don't read gfr if already in env (by CSEnvR) -- Also read res if the option "retain" is present + -- Also, if a "with" file has to be compiled, read its mother file from source + res cs = map mkRes cs where mkRes x@(f,(path,st)) | elem st [CSRead,CSEnv] = case typ f of - t | elem t [MTyResource,MTyIncResource] && - (not (null [m | (m,(_,CSComp)) <- cs, + t | (not (null [m | (m,(_,CSComp)) <- cs, Just ms <- [lookup m allDeps], elem f ms]) || oElem retainOpers opts) - -> (f,(path,CSRes)) + -> if elem t [MTyResource,MTyIncResource] + then (f,(path,CSRes)) else + if t == MTyIncomplete + then (f,(path,CSComp)) else + x _ -> x mkRes x = x + + -- construct list of paths to read paths cs = [mkName f p st | (f,(p,st)) <- cs, elem st [CSComp, CSRead,CSRes]] |