diff options
| author | hallgren <hallgren@chalmers.se> | 2012-10-19 19:56:00 +0000 |
|---|---|---|
| committer | hallgren <hallgren@chalmers.se> | 2012-10-19 19:56:00 +0000 |
| commit | 1195db1da3f8e0c1b7edf39cac604b2bf8482aab (patch) | |
| tree | edc5401028e550e687fd101287790268bd95b5d5 /src/compiler/GF/Compile.hs | |
| parent | 921b37834c66eeaba18147c5ab027b1f062b8829 (diff) | |
Consistenly use SourceGrammar instead of [SourceModule] when calling compiler passes
Diffstat (limited to 'src/compiler/GF/Compile.hs')
| -rw-r--r-- | src/compiler/GF/Compile.hs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/compiler/GF/Compile.hs b/src/compiler/GF/Compile.hs index f5cbde7b7..9693150ff 100644 --- a/src/compiler/GF/Compile.hs +++ b/src/compiler/GF/Compile.hs @@ -203,25 +203,24 @@ compileSourceModule opts env@(k,gr,_) mb_gfFile mo@(i,mi) = do Nothing -> return () extendCompileEnvInt env k Nothing mo1b _ -> do - let mos = modules gr - (mo2,warnings) <- putpp " renaming " $ ioeErr $ runCheck (renameModule mos mo1b) + (mo2,warnings) <- putpp " renaming " $ ioeErr $ runCheck (renameModule gr mo1b) warnOut opts warnings intermOut opts DumpRename (ppModule Internal mo2) - (mo3,warnings) <- putpp " type checking" $ ioeErr $ runCheck (checkModule opts mos mo2) + (mo3,warnings) <- putpp " type checking" $ ioeErr $ runCheck (checkModule opts gr mo2) warnOut opts warnings intermOut opts DumpTypeCheck (ppModule Internal mo3) if not (flag optTagsOnly opts) - then do (k',mo3r:_) <- putpp " refreshing " $ ioeErr $ refreshModule (k,mos) mo3 + then do (k',mo3r:_) <- putpp " refreshing " $ ioeErr $ refreshModule (k,gr) mo3 intermOut opts DumpRefresh (ppModule Internal mo3r) - mo4 <- putpp " optimizing " $ ioeErr $ optimizeModule opts mos mo3r + mo4 <- putpp " optimizing " $ ioeErr $ optimizeModule opts gr mo3r intermOut opts DumpOptimize (ppModule Internal mo4) mo5 <- if isModCnc (snd mo4) && flag optPMCFG opts - then putpp " generating PMCFG " $ ioeIO $ generatePMCFG opts mos mo4 + then putpp " generating PMCFG " $ ioeIO $ generatePMCFG opts gr mo4 else return mo4 intermOut opts DumpCanon (ppModule Internal mo5) |