diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2015-05-31 00:06:13 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2015-06-02 00:50:43 +0100 |
| commit | 2f0011aca137055f139bed484302679c10238d55 (patch) | |
| tree | 53a0126d59b95b819781628c5ddb3b6632883288 /compiler/main | |
| parent | 34dcf8a0939c813a861bed9fa01c05ec7fe7decd (diff) | |
| download | haskell-2f0011aca137055f139bed484302679c10238d55.tar.gz | |
White space only
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/InteractiveEval.hs | 9 | ||||
| -rw-r--r-- | compiler/main/TidyPgm.hs | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/compiler/main/InteractiveEval.hs b/compiler/main/InteractiveEval.hs index 5458368ebe..59224e8195 100644 --- a/compiler/main/InteractiveEval.hs +++ b/compiler/main/InteractiveEval.hs @@ -334,14 +334,14 @@ handleRunStatus step expr bindings final_ids , resumeSpan = span, resumeHistory = toListBL history , resumeHistoryIx = 0 } hsc_env2 = pushResume hsc_env1 resume - + modifySession (\_ -> hsc_env2) return (ExecBreak tid names mb_info) - + -- Completed with an exception | Complete (Left e) alloc <- status = return (ExecComplete (Left e) alloc) - + -- Completed successfully | Complete (Right hvals) allocs <- status = do hsc_env <- getSession @@ -351,7 +351,7 @@ handleRunStatus step expr bindings final_ids hsc_env' <- liftIO $ rttiEnvironment hsc_env{hsc_IC=final_ic} modifySession (\_ -> hsc_env') return (ExecComplete (Right final_names) allocs) - + | otherwise = panic "handleRunStatus" -- The above cases are in fact exhaustive @@ -1104,4 +1104,3 @@ reconstructType hsc_env bound id = do mkRuntimeUnkTyVar :: Name -> Kind -> TyVar mkRuntimeUnkTyVar name kind = mkTcTyVar name kind RuntimeUnk #endif /* GHCI */ - diff --git a/compiler/main/TidyPgm.hs b/compiler/main/TidyPgm.hs index e9dd8d1c4a..91aaaee6aa 100644 --- a/compiler/main/TidyPgm.hs +++ b/compiler/main/TidyPgm.hs @@ -144,9 +144,9 @@ mkBootModDetailsTc hsc_env ; showPassIO dflags CoreTidy ; let { insts' = map (tidyClsInstDFun globaliseAndTidyId) insts + ; pat_syns' = map (tidyPatSynIds globaliseAndTidyId) pat_syns ; type_env1 = mkBootTypeEnv (availsToNameSet exports) (typeEnvIds type_env) tcs fam_insts - ; pat_syns' = map (tidyPatSynIds globaliseAndTidyId) pat_syns ; type_env2 = extendTypeEnvWithPatSyns pat_syns' type_env1 ; dfun_ids = map instanceDFunId insts' ; type_env' = extendTypeEnvWithIds type_env2 dfun_ids |