X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=c8c5bddbfa3c14f59a07d80aa0c8c198cbf8fec5;hb=51a571c0f5b0201ea53bec60fcaafb78c01c017e;hp=1f5931530d2207da6945ed4a8d47155a4fa8f52e;hpb=ae54717718aefc3a9f246bb09c0bab66a8062a63;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index 1f59315..c8c5bdd 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -4,46 +4,76 @@ \section[GHC_Main]{Main driver for Glasgow Haskell compiler} \begin{code} -module HscMain ( hscMain ) where +module HscMain ( HscResult(..), hscMain, +#ifdef GHCI + hscStmt, +#endif + initPersistentCompilerState ) where #include "HsVersions.h" -import IO ( hPutStr, stderr ) +#ifdef GHCI +import RdrHsSyn ( RdrNameStmt ) +import Rename ( renameStmt ) +import ByteCodeGen ( byteCodeGen ) +import Id ( Id, idName ) +import IdInfo ( GlobalIdDetails(VanillaGlobal) ) +import HscTypes ( InteractiveContext(..), TyThing(..) ) +#endif + import HsSyn -import RdrHsSyn ( RdrNameHsModule ) -import FastString ( unpackFS ) -import StringBuffer ( hGetStringBuffer ) -import Parser ( parse ) +import StringBuffer ( hGetStringBuffer, + stringToStringBuffer, freeStringBuffer ) +import Parser import Lex ( PState(..), ParseResult(..) ) import SrcLoc ( mkSrcLoc ) - -import Rename ( renameModule ) - -import PrelInfo ( wiredInThings ) -import PrelRules ( builtinRules ) -import MkIface ( writeIface ) -import TcModule ( TcResults(..), typecheckModule ) -import Desugar ( deSugar ) -import SimplCore ( core2core ) -import OccurAnal ( occurAnalyseBinds ) +import Rename ( checkOldIface, renameModule, closeIfaceDecls ) +import Rules ( emptyRuleBase ) +import PrelInfo ( wiredInThingEnv, wiredInThings ) +import PrelNames ( vanillaSyntaxMap, knownKeyNames, iNTERACTIVE ) +import MkIface ( completeIface, writeIface, pprIface ) +import Type ( Type ) +import TcModule +import InstEnv ( emptyInstEnv ) +import Desugar +import SimplCore import CoreUtils ( coreBindsSize ) import CoreTidy ( tidyCorePgm ) -import CoreToStg ( topCoreBindsToStg ) -import StgSyn ( collectFinalStgBinders ) +import CoreSat +import CoreTidy ( tidyCoreExpr ) +import CoreToStg ( coreToStg ) import SimplStg ( stg2stg ) import CodeGen ( codeGen ) import CodeOutput ( codeOutput ) -import Module ( ModuleName, moduleNameUserString ) +import Module ( ModuleName, moduleName, mkHomeModule, + moduleUserString ) import CmdLineOpts -import ErrUtils ( ghcExit, doIfSet, dumpIfSet ) +import ErrUtils ( dumpIfSet_dyn, showPass ) +import Util ( unJust ) import UniqSupply ( mkSplitUniqSupply ) +import Bag ( emptyBag ) import Outputable -import Char ( isSpace ) -import StgInterp ( runStgI ) +import Interpreter +import CmStaticInfo ( GhciMode(..) ) import HscStats ( ppSourceStats ) +import HscTypes ( ModDetails, ModIface(..), PersistentCompilerState(..), + PersistentRenamerState(..), ModuleLocation(..), + HomeSymbolTable, + NameSupply(..), PackageRuleBase, HomeIfaceTable, + typeEnvClasses, typeEnvTyCons, emptyIfaceTable + ) +import FiniteMap ( FiniteMap, plusFM, emptyFM, addToFM ) +import OccName ( OccName ) +import Name ( Name, nameModule, nameOccName, getName, isGlobalName ) +import NameEnv ( emptyNameEnv ) +import Module ( Module, lookupModuleEnvByName ) + +import Monad ( when ) +import Maybe ( isJust ) +import IO \end{code} @@ -55,322 +85,466 @@ import HscStats ( ppSourceStats ) \begin{code} data HscResult - = HscOK ModDetails -- new details (HomeSymbolTable additions) - (Maybe ModIface) -- new iface (if any compilation was done) - (Maybe String) -- generated stub_h filename (in /tmp) - (Maybe String) -- generated stub_c filename (in /tmp) - (Maybe [UnlinkedIBind]) -- interpreted code, if any - PersistentCompilerState -- updated PCS - (Bag WarnMsg) -- warnings - - | HscErrs PersistentCompilerState -- updated PCS - (Bag ErrMsg) -- errors - (Bag WarnMsg) -- warnings + -- compilation failed + = HscFail PersistentCompilerState -- updated PCS + -- concluded that it wasn't necessary + | HscNoRecomp PersistentCompilerState -- updated PCS + ModDetails -- new details (HomeSymbolTable additions) + ModIface -- new iface (if any compilation was done) + -- did recompilation + | HscRecomp PersistentCompilerState -- updated PCS + ModDetails -- new details (HomeSymbolTable additions) + ModIface -- new iface (if any compilation was done) + (Maybe String) -- generated stub_h filename (in TMPDIR) + (Maybe String) -- generated stub_c filename (in TMPDIR) + (Maybe ([UnlinkedBCO],ItblEnv)) -- interpreted code, if any + + + -- no errors or warnings; the individual passes + -- (parse/rename/typecheck) print messages themselves hscMain - :: DynFlags - -> ModSummary -- summary, including source filename - -> Maybe ModIFace -- old interface, if available - -> String -- file in which to put the output (.s, .hc, .java etc.) + :: GhciMode + -> DynFlags + -> Module + -> ModuleLocation -- location info + -> Bool -- source unchanged? + -> Maybe ModIface -- old interface, if available -> HomeSymbolTable -- for home module ModDetails + -> HomeIfaceTable -> PersistentCompilerState -- IN: persistent compiler state -> IO HscResult -hscMain dflags core_cmds stg_cmds summary maybe_old_iface - output_filename mod_details pcs1 - = do - source_unchanged :: Bool -- extracted from summary? - - (pcs2, check_errs, (recomp_reqd, maybe_checked_iface)) - <- checkOldIface dflags finder hit hst pcs1 mod source_unchanged - maybe_old_iface - - -- test check_errs and give up if a problem happened - what_next = if recomp_reqd then hscRecomp else hscNoRecomp - - return $ - what_next dflags core_cmds stg_cmds summary hit hst - pcs2 maybe_checked_iface - -hscNoRecomp = panic "hscNoRecomp" - -hscRecomp dflags core_cmds stg_cmds summary hit hst pcs maybe_old_iface - = do - -- parsed :: RdrNameHsModule - parsed <- parseModule summary - -- check for parse errors - - (pcs_rn, maybe_rn_result) - <- renameModule dflags finder hit hst pcs mod parsed - - -- check maybe_rn_result for failure - - (new_iface, rn_hs_decls) = unJust maybe_rn_result - - maybe_tc_result - <- typecheckModule dflags mod pcs hst hit pit rn_hs_decls - - -- check maybe_tc_result for failure - let tc_result = unJust maybe_tc_result - let tc_pcs = tc_pcs tc_result - let tc_env = tc_env tc_result - let tc_binds = tc_binds tc_result - let local_tycons = tc_tycons tc_result - let local_classes = tc_classes tc_result - - -- desugar, simplify and tidy, to create the unfoldings - -- why is this IO-typed? - (tidy_binds, orphan_rules, fe_binders, h_code, c_code) -- return modDetails? - <- dsThenSimplThenTidy dflags mod tc_result rule_base ds_uniqs - - -- convert to Stg; needed for binders - (stg_binds, cost_centre_info, top_level_ids) - <- myCoreToStg c2s_uniqs st_uniqs this_mod tidy_binds - - -- cook up a new ModDetails now we (finally) have all the bits - let new_details = completeModDetails tc_env tidy_binds top_level_ids orphan_rules - - -- and possibly create a new ModIface - let maybe_final_iface = completeIface maybe_old_iface new_iface new_details - - -- do the rest of code generation/emission - -- this is obviously nonsensical: FIX - (unlinkeds, stub_h_filename, stub_c_filename) - <- restOfCodeGeneration this_mod imported_modules cost_centre_info - fe_binders local_tycons local_classes stg_binds +hscMain ghci_mode dflags mod location source_unchanged maybe_old_iface hst hit pcs + = do { + showPass dflags ("Checking old interface for hs = " + ++ show (ml_hs_file location) + ++ ", hspp = " ++ show (ml_hspp_file location)); + + (pcs_ch, errs_found, (recomp_reqd, maybe_checked_iface)) + <- checkOldIface ghci_mode dflags hit hst pcs + (unJust "hscMain" (ml_hi_file location)) + source_unchanged maybe_old_iface; + + if errs_found then + return (HscFail pcs_ch) + else do { + + let no_old_iface = not (isJust maybe_checked_iface) + what_next | recomp_reqd || no_old_iface = hscRecomp + | otherwise = hscNoRecomp + ; + what_next ghci_mode dflags mod location maybe_checked_iface + hst hit pcs_ch + }} + + +-- we definitely expect to have the old interface available +hscNoRecomp ghci_mode dflags mod location (Just old_iface) hst hit pcs_ch + | ghci_mode == OneShot + = do { + hPutStrLn stderr "compilation IS NOT required"; + let { bomb = panic "hscNoRecomp:OneShot" }; + return (HscNoRecomp pcs_ch bomb bomb) + } + | otherwise + = do { + when (verbosity dflags >= 1) $ + hPutStrLn stderr ("Skipping " ++ compMsg mod location); + + -- CLOSURE + (pcs_cl, closure_errs, cl_hs_decls) + <- closeIfaceDecls dflags hit hst pcs_ch old_iface ; + if closure_errs then + return (HscFail pcs_cl) + else do { + + -- TYPECHECK + maybe_tc_result + <- typecheckIface dflags pcs_cl hst old_iface (vanillaSyntaxMap, cl_hs_decls); + + case maybe_tc_result of { + Nothing -> return (HscFail pcs_cl); + Just (pcs_tc, new_details) -> + + return (HscNoRecomp pcs_tc new_details old_iface) + }}} + +compMsg mod location = + mod_str ++ take (12 - length mod_str) (repeat ' ') + ++ " (" ++ unJust "hscRecomp" (ml_hs_file location) ++ ")" + where mod_str = moduleUserString mod + + +hscRecomp ghci_mode dflags mod location maybe_checked_iface hst hit pcs_ch + = do { + ; when (verbosity dflags >= 1) $ + hPutStrLn stderr ("Compiling " ++ compMsg mod location); + + -- what target are we shooting for? + ; let toInterp = dopt_HscLang dflags == HscInterpreted + + ------------------- + -- PARSE + ------------------- + ; maybe_parsed <- myParseModule dflags + (unJust "hscRecomp:hspp" (ml_hspp_file location)) + ; case maybe_parsed of { + Nothing -> return (HscFail pcs_ch); + Just rdr_module -> do { + ; let this_mod = mkHomeModule (hsModuleName rdr_module) + + ------------------- + -- RENAME + ------------------- + ; (pcs_rn, print_unqualified, maybe_rn_result) + <- _scc_ "Rename" + renameModule dflags hit hst pcs_ch this_mod rdr_module + ; case maybe_rn_result of { + Nothing -> return (HscFail pcs_ch{-was: pcs_rn-}); + Just (is_exported, new_iface, rn_hs_decls) -> do { + + -- In interactive mode, we don't want to discard any top-level entities at + -- all (eg. do not inline them away during simplification), and retain them + -- all in the TypeEnv so they are available from the command line. + -- + -- isGlobalName separates the user-defined top-level names from those + -- introduced by the type checker. + ; let dont_discard | ghci_mode == Interactive = isGlobalName + | otherwise = is_exported + + ------------------- + -- TYPECHECK + ------------------- + ; maybe_tc_result + <- _scc_ "TypeCheck" typecheckModule dflags pcs_rn hst new_iface + print_unqualified rn_hs_decls + ; case maybe_tc_result of { + Nothing -> return (HscFail pcs_ch{-was: pcs_rn-}); + Just (pcs_tc, tc_result) -> do { + + ; let env_tc = tc_env tc_result + insts_tc = tc_insts tc_result + + ------------------- + -- DESUGAR + ------------------- + ; (ds_binds, ds_rules, foreign_stuff) + <- _scc_ "DeSugar" + deSugar dflags pcs_tc hst this_mod print_unqualified tc_result + + ------------------- + -- SIMPLIFY + ------------------- + ; (simplified, orphan_rules) + <- _scc_ "Core2Core" + core2core dflags pcs_tc hst dont_discard ds_binds ds_rules + + ------------------- + -- TIDY + ------------------- + ; (pcs_simpl, tidy_binds, new_details) + <- tidyCorePgm dflags this_mod pcs_tc env_tc insts_tc + simplified orphan_rules + + ------------------- + -- BUILD THE NEW ModDetails AND ModIface + ------------------- + ; final_iface <- _scc_ "MkFinalIface" + mkFinalIface ghci_mode dflags location + maybe_checked_iface new_iface new_details + + ------------------- + -- CONVERT TO STG and COMPLETE CODE GENERATION + ------------------- + -- Do saturation and convert to A-normal form + ; saturated <- coreSatPgm dflags tidy_binds + + ; (maybe_stub_h_filename, maybe_stub_c_filename, maybe_bcos) + <- restOfCodeGeneration dflags toInterp this_mod + (map ideclName (hsModuleImports rdr_module)) + foreign_stuff env_tc saturated + hit (pcs_PIT pcs_simpl) + + -- and the answer is ... + ; return (HscRecomp pcs_simpl new_details final_iface + maybe_stub_h_filename maybe_stub_c_filename + maybe_bcos) + }}}}}}} + + + +mkFinalIface ghci_mode dflags location maybe_old_iface new_iface new_details + = case completeIface maybe_old_iface new_iface new_details of + (new_iface, Nothing) -- no change in the interfacfe + -> do when (dopt Opt_D_dump_hi_diffs dflags) + (printDump (text "INTERFACE UNCHANGED")) + dumpIfSet_dyn dflags Opt_D_dump_hi + "UNCHANGED FINAL INTERFACE" (pprIface new_iface) + return new_iface + (new_iface, Just sdoc_diffs) + -> do dumpIfSet_dyn dflags Opt_D_dump_hi_diffs "INTERFACE HAS CHANGED" + sdoc_diffs + dumpIfSet_dyn dflags Opt_D_dump_hi "NEW FINAL INTERFACE" + (pprIface new_iface) + -- Write the interface file + when (ghci_mode /= Interactive) + (writeIface (unJust "hscRecomp:hi" (ml_hi_file location)) + new_iface) + return new_iface + + +myParseModule dflags src_filename + = do -------------------------- Parser ---------------- + showPass dflags "Parser" + _scc_ "Parser" do + + buf <- hGetStringBuffer True{-expand tabs-} src_filename + + let glaexts | dopt Opt_GlasgowExts dflags = 1# + | otherwise = 0# + + case parseModule buf PState{ bol = 0#, atbol = 1#, + context = [], glasgow_exts = glaexts, + loc = mkSrcLoc (_PK_ src_filename) 1 } of { + + PFailed err -> do { hPutStrLn stderr (showSDoc err); + freeStringBuffer buf; + return Nothing }; + + POk _ rdr_module@(HsModule mod_name _ _ _ _ _ _) -> do { + + dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr rdr_module) ; + + dumpIfSet_dyn dflags Opt_D_source_stats "Source Statistics" + (ppSourceStats False rdr_module) ; + + return (Just rdr_module) + -- ToDo: free the string buffer later. + }} - -- and the answer is ... - return (HscOK new_details maybe_final_iface stub_h_filename stub_c_filename - unlinkeds tc_pcs (unionBags rn_warns tc_warns)) +restOfCodeGeneration dflags toInterp this_mod imported_module_names + foreign_stuff env_tc tidy_binds + hit pit -- these last two for mapping ModNames to Modules + | toInterp + = do (bcos,itbl_env) + <- byteCodeGen dflags tidy_binds local_tycons local_classes + return (Nothing, Nothing, Just (bcos,itbl_env)) -restOfCodeGeneration this_mod imported_modules cost_centre_info - fe_binders local_tycons local_classes stg_binds - = do -------------------------- Code generation ------------------------------- - show_pass "CodeGen" - -- _scc_ "CodeGen" - abstractC <- codeGen this_mod imported_modules + | otherwise + = do + -------------------------- Convert to STG ------------------------------- + (stg_binds, cost_centre_info) + <- _scc_ "CoreToStg" + myCoreToStg dflags this_mod tidy_binds env_tc + + -------------------------- Code generation ------------------------------ + abstractC <- _scc_ "CodeGen" + codeGen dflags this_mod imported_modules cost_centre_info fe_binders - local_tycons local_classes stg_binds + local_tycons stg_binds -------------------------- Code output ------------------------------- - show_pass "CodeOutput" - -- _scc_ "CodeOutput" (maybe_stub_h_name, maybe_stub_c_name) - <- codeOutput this_mod local_tycons local_classes - occ_anal_tidy_binds stg_binds2 - c_code h_code abstractC ncg_uniqs - - -- this is obviously nonsensical: FIX - return (maybe_stub_h_name, maybe_stub_c_name, []) - - -dsThenSimplThenTidy dflags mod tc_result rule_base ds_uniqs - = do -------------------------- Desugaring ---------------- - -- _scc_ "DeSugar" - (desugared, rules, h_code, c_code, fe_binders) - <- deSugar this_mod ds_uniqs tc_results - - -------------------------- Main Core-language transformations ---------------- - -- _scc_ "Core2Core" - (simplified, orphan_rules) <- core2core core_cmds desugared rules - - -- Do the final tidy-up - (tidy_binds, tidy_orphan_rules) - <- tidyCorePgm this_mod simplified orphan_rules - - return (tidy_binds, tidy_orphan_rules, fe_binders, h_code, c_code) - - - -myCoreToStg c2s_uniqs st_uniqs this_mod tidy_binds - = do let occ_anal_tidy_binds = occurAnalyseBinds tidy_binds - - () <- coreBindsSize occ_anal_tidy_binds `seq` return () + <- codeOutput dflags this_mod local_tycons + tidy_binds stg_binds + c_code h_code abstractC + + return (maybe_stub_h_name, maybe_stub_c_name, Nothing) + where + local_tycons = typeEnvTyCons env_tc + local_classes = typeEnvClasses env_tc + imported_modules = map mod_name_to_Module imported_module_names + (h_code,c_code,fe_binders) = foreign_stuff + + mod_name_to_Module :: ModuleName -> Module + mod_name_to_Module nm + = let str_mi = case lookupModuleEnvByName hit nm of + Just mi -> mi + Nothing -> case lookupModuleEnvByName pit nm of + Just mi -> mi + Nothing -> barf nm + in mi_module str_mi + barf nm = pprPanic "mod_name_to_Module: no hst or pst mapping for" + (ppr nm) + + +myCoreToStg dflags this_mod tidy_binds env_tc + = do + () <- coreBindsSize tidy_binds `seq` return () -- TEMP: the above call zaps some space usage allocated by the -- simplifier, which for reasons I don't understand, persists -- thoroughout code generation - show_pass "Core2Stg" - -- _scc_ "Core2Stg" - let stg_binds = topCoreBindsToStg c2s_uniqs occ_anal_tidy_binds + --let bcos = byteCodeGen dflags tidy_binds local_tycons local_classes - show_pass "Stg2Stg" - -- _scc_ "Stg2Stg" - (stg_binds2, cost_centre_info) <- stg2stg stg_cmds this_mod st_uniqs stg_binds - let final_ids = collectFinalStgBinders (map fst stg_binds2) + + stg_binds <- _scc_ "Core2Stg" coreToStg dflags this_mod tidy_binds - return (stg_binds2, cost_centre_info, final_ids) + (stg_binds2, cost_centre_info) + <- _scc_ "Core2Stg" stg2stg dflags this_mod stg_binds -#if 0 --- BEGIN old stuff - -------------------------- Reader ---------------- - show_pass "Parser" >> - _scc_ "Parser" + return (stg_binds2, cost_centre_info) + where + local_tycons = typeEnvTyCons env_tc + local_classes = typeEnvClasses env_tc +\end{code} - let src_filename -- name of the preprocessed source file - = case ms_ppsource summary of - Just (filename, fingerprint) -> filename - Nothing -> pprPanic "hscMain:summary is not of a source module" - (ppr summary) - buf <- hGetStringBuffer True{-expand tabs-} src_filename +%************************************************************************ +%* * +\subsection{Compiling a do-statement} +%* * +%************************************************************************ - let glaexts | dopt Opt_GlasgowExts dflags = 1# - | otherwise = 0# +\begin{code} +#ifdef GHCI +hscStmt + :: DynFlags + -> HomeSymbolTable + -> HomeIfaceTable + -> PersistentCompilerState -- IN: persistent compiler state + -> InteractiveContext -- Context for compiling + -> String -- The statement + -> Bool -- just treat it as an expression + -> IO ( PersistentCompilerState, + Maybe ( [Id], + Type, + UnlinkedBCOExpr) ) +\end{code} - case parse buf PState{ bol = 0#, atbol = 1#, - context = [], glasgow_exts = glaexts, - loc = mkSrcLoc src_filename 1 } of { +When the UnlinkedBCOExpr is linked you get an HValue of type + IO [HValue] +When you run it you get a list of HValues that should be +the same length as the list of names; add them to the ClosureEnv. - PFailed err -> return (HscErrs pcs (unitBag err) emptyBag) +A naked expression returns a singleton Name [it]. - POk _ rdr_module@(HsModule mod_name _ _ _ _ _ _) -> + What you type The IO [HValue] that hscStmt returns + ------------- ------------------------------------ + let pat = expr ==> let pat = expr in return [coerce HVal x, coerce HVal y, ...] + bindings: [x,y,...] - dumpIfSet (dopt_D_dump_parsed flags) "Parser" (ppr rdr_module) >> + pat <- expr ==> expr >>= \ pat -> return [coerce HVal x, coerce HVal y, ...] + bindings: [x,y,...] - dumpIfSet (dopt_D_source_stats flags) "Source Statistics" - (ppSourceStats False rdr_module) >> + expr (of IO type) ==> expr >>= \ v -> return [v] + [NB: result not printed] bindings: [it] + - -- UniqueSupplies for later use (these are the only lower case uniques) - mkSplitUniqSupply 'd' >>= \ ds_uniqs -> -- desugarer - mkSplitUniqSupply 'r' >>= \ ru_uniqs -> -- rules - mkSplitUniqSupply 'c' >>= \ c2s_uniqs -> -- core-to-stg - mkSplitUniqSupply 'g' >>= \ st_uniqs -> -- stg-to-stg passes - mkSplitUniqSupply 'n' >>= \ ncg_uniqs -> -- native-code generator + expr (of non-IO type, + result showable) ==> let v = expr in print v >> return [v] + bindings: [it] - -------------------------- Rename ---------------- - show_pass "Renamer" >> - _scc_ "Renamer" + expr (of non-IO type, + result not showable) ==> error - renameModule dflags finder pcs hst rdr_module - >>= \ (pcs_rn, maybe_rn_stuff) -> - case maybe_rn_stuff of { - Nothing -> -- Hurrah! Renamer reckons that there's no need to - -- go any further - reportCompile mod_name "Compilation NOT required!" >> - return (); +\begin{code} +hscStmt dflags hst hit pcs0 icontext stmt just_expr + = let + InteractiveContext { + ic_rn_env = rn_env, + ic_type_env = type_env, + ic_module = scope_mod } = icontext + in + do { maybe_stmt <- hscParseStmt dflags stmt + ; case maybe_stmt of + Nothing -> return (pcs0, Nothing) + Just parsed_stmt -> do { + + let { notExprStmt (ExprStmt _ _) = False; + notExprStmt _ = True + }; + + if (just_expr && notExprStmt parsed_stmt) + then do hPutStrLn stderr ("not an expression: `" ++ stmt ++ "'") + return (pcs0, Nothing) + else do { + + -- Rename it + (pcs1, print_unqual, maybe_renamed_stmt) + <- renameStmt dflags hit hst pcs0 scope_mod + iNTERACTIVE rn_env parsed_stmt + + ; case maybe_renamed_stmt of + Nothing -> return (pcs0, Nothing) + Just (bound_names, rn_stmt) -> do { + + -- Typecheck it + maybe_tc_return <- + if just_expr + then case rn_stmt of { (syn, ExprStmt e _, decls) -> + typecheckExpr dflags pcs1 hst type_env + print_unqual iNTERACTIVE (syn,e,decls) } + else typecheckStmt dflags pcs1 hst type_env + print_unqual iNTERACTIVE bound_names rn_stmt + + ; case maybe_tc_return of + Nothing -> return (pcs0, Nothing) + Just (pcs2, tc_expr, bound_ids, ty) -> do { + + -- Desugar it + ds_expr <- deSugarExpr dflags pcs2 hst iNTERACTIVE print_unqual tc_expr - Just (this_mod, rn_mod, - old_iface, new_iface, - rn_name_supply, fixity_env, - imported_modules) -> - -- Oh well, we've got to recompile for real + -- Simplify it + ; simpl_expr <- simplifyExpr dflags pcs2 hst ds_expr + -- Tidy it (temporary, until coreSat does cloning) + ; tidy_expr <- tidyCoreExpr simpl_expr - -------------------------- Typechecking ---------------- - show_pass "TypeCheck" >> - _scc_ "TypeCheck" - typecheckModule dflags mod pcs hst hit pit rn_mod - -- tc_uniqs rn_name_supply - -- fixity_env rn_mod - >>= \ maybe_tc_stuff -> - case maybe_tc_stuff of { - Nothing -> ghcExit 1; -- Type checker failed + -- Saturate it + ; sat_expr <- coreSatExpr dflags tidy_expr - Just (tc_results@(TcResults {tc_tycons = local_tycons, - tc_classes = local_classes, - tc_insts = inst_info })) -> + -- Convert to BCOs + ; bcos <- coreExprToBCOs dflags sat_expr + ; let + -- Make all the bound ids "global" ids, now that + -- they're notionally top-level bindings. This is + -- important: otherwise when we come to compile an expression + -- using these ids later, the byte code generator will consider + -- the occurrences to be free rather than global. + global_bound_ids = map globaliseId bound_ids; + globaliseId id = setIdGlobalDetails id VanillaGlobal - -------------------------- Desugaring ---------------- - _scc_ "DeSugar" - deSugar this_mod ds_uniqs tc_results >>= \ (desugared, rules, h_code, c_code, fe_binders) -> + ; return (pcs2, Just (global_bound_ids, ty, bcos)) + }}}}} - -------------------------- Main Core-language transformations ---------------- - _scc_ "Core2Core" - core2core core_cmds desugared rules >>= \ (simplified, orphan_rules) -> +hscParseStmt :: DynFlags -> String -> IO (Maybe RdrNameStmt) +hscParseStmt dflags str + = do -------------------------- Parser ---------------- + showPass dflags "Parser" + _scc_ "Parser" do - -- Do the final tidy-up - tidyCorePgm this_mod - simplified orphan_rules >>= \ (tidy_binds, tidy_orphan_rules) -> + buf <- stringToStringBuffer str - -- Run the occurrence analyser one last time, so that - -- dead binders get dead-binder info. This is exploited by - -- code generators to avoid spitting out redundant bindings. - -- The occurrence-zapping in Simplify.simplCaseBinder means - -- that the Simplifier nukes useful dead-var stuff especially - -- in case patterns. - let occ_anal_tidy_binds = occurAnalyseBinds tidy_binds in + let glaexts | dopt Opt_GlasgowExts dflags = 1# + | otherwise = 0# - coreBindsSize occ_anal_tidy_binds `seq` --- TEMP: the above call zaps some space usage allocated by the --- simplifier, which for reasons I don't understand, persists --- thoroughout code generation + case parseStmt buf PState{ bol = 0#, atbol = 1#, + context = [], glasgow_exts = glaexts, + loc = mkSrcLoc SLIT("") 0 } of { + PFailed err -> do { hPutStrLn stderr (showSDoc err); +-- Not yet implemented in <4.11 freeStringBuffer buf; + return Nothing }; + -- no stmt: the line consisted of just space or comments + POk _ Nothing -> return Nothing; - -------------------------- Convert to STG code ------------------------------- - show_pass "Core2Stg" >> - _scc_ "Core2Stg" - let - stg_binds = topCoreBindsToStg c2s_uniqs occ_anal_tidy_binds - in - - -------------------------- Simplify STG code ------------------------------- - show_pass "Stg2Stg" >> - _scc_ "Stg2Stg" - stg2stg stg_cmds this_mod st_uniqs stg_binds >>= \ (stg_binds2, cost_centre_info) -> - -#ifdef GHCI - runStgI local_tycons local_classes - (map fst stg_binds2) >>= \ i_result -> - putStr ("\nANSWER = " ++ show i_result ++ "\n\n") - >> - -#else - -------------------------- Interface file ------------------------------- - -- Dump instance decls and type signatures into the interface file - _scc_ "Interface" - let - final_ids = collectFinalStgBinders (map fst stg_binds2) - in - writeIface this_mod old_iface new_iface - local_tycons local_classes inst_info - final_ids occ_anal_tidy_binds tidy_orphan_rules >> - - - -------------------------- Code generation ------------------------------- - show_pass "CodeGen" >> - _scc_ "CodeGen" - codeGen this_mod imported_modules - cost_centre_info - fe_binders - local_tycons local_classes - stg_binds2 >>= \ abstractC -> - - - -------------------------- Code output ------------------------------- - show_pass "CodeOutput" >> - _scc_ "CodeOutput" - codeOutput this_mod local_tycons local_classes - occ_anal_tidy_binds stg_binds2 - c_code h_code abstractC - ncg_uniqs >> - - - -------------------------- Final report ------------------------------- - reportCompile mod_name (showSDoc (ppSourceStats True rdr_module)) >> + POk _ (Just rdr_stmt) -> do { -#endif - - - ghcExit 0 - } } - where - ------------------------------------------------------------- - -- ****** help functions: - - show_pass - = if opt_D_show_passes - then \ what -> hPutStr stderr ("*** "++what++":\n") - else \ what -> return () --- END old stuff + --ToDo: can't free the string buffer until we've finished this + -- compilation sweep and all the identifiers have gone away. + --freeStringBuffer buf; + dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr rdr_stmt); + return (Just rdr_stmt) + }} #endif \end{code} - %************************************************************************ %* * \subsection{Initial persistent state} @@ -380,189 +554,44 @@ myCoreToStg c2s_uniqs st_uniqs this_mod tidy_binds \begin{code} initPersistentCompilerState :: IO PersistentCompilerState initPersistentCompilerState -<<<<<<< HscMain.lhs = do prs <- initPersistentRenamerState return ( - PCS { pcs_PST = initPackageDetails, + PCS { pcs_PIT = emptyIfaceTable, + pcs_PTE = wiredInThingEnv, pcs_insts = emptyInstEnv, - pcs_rules = emptyRuleEnv, - pcs_PRS = initPersistentRenamerState + pcs_rules = emptyRuleBase, + pcs_PRS = prs } ) -======= - = PCS { pcs_PST = initPackageDetails, - pcs_insts = emptyInstEnv, - pcs_rules = initRules, - pcs_PRS = initPersistentRenamerState } ->>>>>>> 1.12 - -initPackageDetails :: PackageSymbolTable -initPackageDetails = extendTypeEnv emptyModuleEnv wiredInThings initPersistentRenamerState :: IO PersistentRenamerState - = do ns <- mkSplitUniqSupply 'r' + = do us <- mkSplitUniqSupply 'r' return ( - PRS { prsOrig = Orig { origNames = initOrigNames, - origIParam = emptyFM }, - prsDecls = emptyNameEnv, - prsInsts = emptyBag, - prsRules = emptyBag, - prsNS = ns + PRS { prsOrig = NameSupply { nsUniqs = us, + nsNames = initOrigNames, + nsIPs = emptyFM }, + prsDecls = (emptyNameEnv, 0), + prsInsts = (emptyBag, 0), + prsRules = (emptyBag, 0), + prsImpMods = emptyFM } ) initOrigNames :: FiniteMap (ModuleName,OccName) Name -initOrigNames = grab knownKeyNames `plusFM` grab (map getName wiredInThings) - where - grab names = foldl add emptyFM names - add env name = addToFM env (moduleName (nameModule name), nameOccName name) name - - -initRules :: RuleEnv -initRules = foldl add emptyVarEnv builtinRules +initOrigNames + = grab knownKeyNames `plusFM` grab (map getName wiredInThings) + where + grab names = foldl add emptyFM names + add env name + = addToFM env (moduleName (nameModule name), nameOccName name) name + + +initRules :: PackageRuleBase +initRules = emptyRuleBase +{- SHOULD BE (ish) + foldl add emptyVarEnv builtinRules where - add env (name,rule) = extendNameEnv_C add1 env name [rule] - add1 rules _ = rule : rules -\end{code} - - - -\begin{code} -writeIface this_mod old_iface new_iface - local_tycons local_classes inst_info - final_ids tidy_binds tidy_orphan_rules - = - if isNothing opt_HiDir && isNothing opt_HiFile - then return () -- not producing any .hi file - else - - let - hi_suf = case opt_HiSuf of { Nothing -> "hi"; Just suf -> suf } - filename = case opt_HiFile of { - Just f -> f; - Nothing -> - case opt_HiDir of { - Just dir -> dir ++ '/':moduleUserString this_mod - ++ '.':hi_suf; - Nothing -> panic "writeIface" - }} - in - - do maybe_final_iface <- checkIface old_iface full_new_iface - case maybe_final_iface of { - Nothing -> when opt_D_dump_rn_trace $ - putStrLn "Interface file unchanged" ; -- No need to update .hi file - - Just final_iface -> - - do let mod_vers_unchanged = case old_iface of - Just iface -> pi_vers iface == pi_vers final_iface - Nothing -> False - when (mod_vers_unchanged && opt_D_dump_rn_trace) $ - putStrLn "Module version unchanged, but usages differ; hence need new hi file" - - if_hdl <- openFile filename WriteMode - printForIface if_hdl (pprIface final_iface) - hClose if_hdl - } - where - full_new_iface = completeIface new_iface local_tycons local_classes - inst_info final_ids tidy_binds - tidy_orphan_rules -\end{code} - - -%************************************************************************ -%* * -\subsection{Printing the interface} -%* * -%************************************************************************ - -\begin{code} -pprIface (ParsedIface { pi_mod = mod, pi_vers = mod_vers, pi_orphan = orphan, - pi_usages = usages, pi_exports = exports, - pi_fixity = (fix_vers, fixities), - pi_insts = insts, pi_decls = decls, - pi_rules = (rule_vers, rules), pi_deprecs = deprecs }) - = vcat [ ptext SLIT("__interface") - <+> doubleQuotes (ptext opt_InPackage) - <+> ppr mod <+> ppr mod_vers <+> pp_sub_vers - <+> (if orphan then char '!' else empty) - <+> int opt_HiVersion - <+> ptext SLIT("where") - , vcat (map pprExport exports) - , vcat (map pprUsage usages) - , pprFixities fixities - , vcat [ppr i <+> semi | i <- insts] - , vcat [ppr_vers v <+> ppr d <> semi | (v,d) <- decls] - , pprRules rules - , pprDeprecs deprecs - ] - where - ppr_vers v | v == initialVersion = empty - | otherwise = int v - pp_sub_vers - | fix_vers == initialVersion && rule_vers == initialVersion = empty - | otherwise = brackets (ppr fix_vers <+> ppr rule_vers) + add env (name,rule) + = extendRuleBase env name rule +-} \end{code} - -When printing export lists, we print like this: - Avail f f - AvailTC C [C, x, y] C(x,y) - AvailTC C [x, y] C!(x,y) -- Exporting x, y but not C - -\begin{code} -pprExport :: ExportItem -> SDoc -pprExport (mod, items) - = hsep [ ptext SLIT("__export "), ppr mod, hsep (map upp_avail items) ] <> semi - where - upp_avail :: RdrAvailInfo -> SDoc - upp_avail (Avail name) = pprOccName name - upp_avail (AvailTC name []) = empty - upp_avail (AvailTC name ns) = hcat [pprOccName name, bang, upp_export ns'] - where - bang | name `elem` ns = empty - | otherwise = char '|' - ns' = filter (/= name) ns - - upp_export [] = empty - upp_export names = braces (hsep (map pprOccName names)) -\end{code} - - -\begin{code} -pprUsage :: ImportVersion OccName -> SDoc -pprUsage (m, has_orphans, is_boot, whats_imported) - = hsep [ptext SLIT("import"), pprModuleName m, - pp_orphan, pp_boot, - upp_import_versions whats_imported - ] <> semi - where - pp_orphan | has_orphans = char '!' - | otherwise = empty - pp_boot | is_boot = char '@' - | otherwise = empty - - -- Importing the whole module is indicated by an empty list - upp_import_versions NothingAtAll = empty - upp_import_versions (Everything v) = dcolon <+> int v - upp_import_versions (Specifically vm vf vr nvs) - = dcolon <+> int vm <+> int vf <+> int vr <+> hsep [ ppr n <+> int v | (n,v) <- nvs ] -\end{code} - - -\begin{code} -pprFixities [] = empty -pprFixities fixes = hsep (map ppr fixes) <> semi - -pprRules [] = empty -pprRules rules = hsep [ptext SLIT("{-## __R"), hsep (map ppr rules), ptext SLIT("##-}")] - -pprDeprecs [] = empty -pprDeprecs deps = hsep [ ptext SLIT("{-## __D"), guts, ptext SLIT("##-}")] - where - guts = hsep [ ppr ie <+> doubleQuotes (ppr txt) <> semi - | Deprecation ie txt _ <- deps ] -\end{code} - -