X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=aa407b115c2998c6076013c39e497058c00627ad;hb=9fc29e6eedbb0cee53960a0664d99c0b2c33f3d7;hp=d6ae43cf649426ea39e680b1ada71914888d8910;hpb=8b653a82cdad2eef86395616256304ae4cb18b2b;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index d6ae43c..aa407b1 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -5,39 +5,49 @@ \begin{code} module HscMain ( HscResult(..), hscMain, +#ifdef GHCI + hscExpr, +#endif initPersistentCompilerState ) where #include "HsVersions.h" -import Maybe ( isJust ) -import IO ( hPutStrLn, stderr ) +#ifdef GHCI +import RdrHsSyn ( RdrNameHsExpr ) +import StringBuffer ( stringToStringBuffer, freeStringBuffer ) +import Unique ( Uniquable(..) ) +import Type ( splitTyConApp_maybe ) +import PrelNames ( ioTyConKey ) +import ByteCodeGen ( byteCodeGen ) +#endif + import HsSyn import StringBuffer ( hGetStringBuffer ) -import Parser ( parse ) +import Parser import Lex ( PState(..), ParseResult(..) ) import SrcLoc ( mkSrcLoc ) - -import Rename ( renameModule, checkOldIface, closeIfaceDecls ) +import Rename ( checkOldIface, renameModule, renameExpr, closeIfaceDecls ) import Rules ( emptyRuleBase ) import PrelInfo ( wiredInThingEnv, wiredInThings ) import PrelNames ( knownKeyNames ) import MkIface ( completeIface, mkModDetailsFromIface, mkModDetails, writeIface, pprIface ) -import TcModule ( TcResults(..), typecheckModule ) +import TcModule +import Type import InstEnv ( emptyInstEnv ) -import Desugar ( deSugar ) -import SimplCore ( core2core ) -import OccurAnal ( occurAnalyseBinds ) +import Desugar +import SimplCore import CoreUtils ( coreBindsSize ) import CoreTidy ( tidyCorePgm ) -import CoreToStg ( topCoreBindsToStg ) +import CoreSat +import CoreToStg ( coreToStg, coreExprToStg ) import StgSyn ( collectFinalStgBinders ) import SimplStg ( stg2stg ) import CodeGen ( codeGen ) import CodeOutput ( codeOutput ) -import Module ( ModuleName, moduleName, mkModuleInThisPackage ) +import Module ( ModuleName, moduleName, mkHomeModule ) import CmdLineOpts import ErrUtils ( dumpIfSet_dyn, showPass ) import Util ( unJust ) @@ -45,7 +55,8 @@ import UniqSupply ( mkSplitUniqSupply ) import Bag ( emptyBag ) import Outputable -import Interpreter ( UnlinkedIBind, ItblEnv, stgToInterpSyn ) +import Interpreter +import CmStaticInfo ( GhciMode(..) ) import HscStats ( ppSourceStats ) import HscTypes ( ModDetails, ModIface(..), PersistentCompilerState(..), PersistentRenamerState(..), ModuleLocation(..), @@ -59,6 +70,8 @@ import Name ( emptyNameEnv ) import Module ( Module, lookupModuleEnvByName ) import Monad ( when ) +import Maybe ( isJust ) +import IO \end{code} @@ -70,19 +83,27 @@ import Monad ( when ) \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],ItblEnv)) -- interpreted code, if any - PersistentCompilerState -- updated PCS - - | HscFail PersistentCompilerState -- updated PCS + -- 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 /tmp) + (Maybe String) -- generated stub_c filename (in /tmp) + (Maybe ([UnlinkedIBind],ItblEnv)) -- interpreted code, if any + + -- no errors or warnings; the individual passes -- (parse/rename/typecheck) print messages themselves hscMain - :: DynFlags + :: GhciMode + -> DynFlags -> Bool -- source unchanged? -> ModuleLocation -- location info -> Maybe ModIface -- old interface, if available @@ -91,14 +112,16 @@ hscMain -> PersistentCompilerState -- IN: persistent compiler state -> IO HscResult -hscMain dflags source_unchanged location maybe_old_iface hst hit pcs +hscMain ghci_mode dflags source_unchanged location maybe_old_iface hst hit pcs = do { - putStrLn ("CHECKING OLD IFACE for hs = " ++ show (ml_hs_file location) - ++ ", hspp = " ++ show (ml_hspp_file location)); + 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 dflags hit hst pcs (unJust (ml_hi_file location) "hscMain") - source_unchanged maybe_old_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) @@ -108,20 +131,24 @@ hscMain dflags source_unchanged location maybe_old_iface hst hit pcs what_next | recomp_reqd || no_old_iface = hscRecomp | otherwise = hscNoRecomp ; - what_next dflags location maybe_checked_iface + what_next ghci_mode dflags location maybe_checked_iface hst hit pcs_ch }} -hscNoRecomp dflags location maybe_checked_iface hst hit pcs_ch +-- we definitely expect to have the old interface available +hscNoRecomp ghci_mode dflags location (Just old_iface) hst hit pcs_ch + | ghci_mode == OneShot = do { - hPutStrLn stderr "COMPILATION NOT REQUIRED"; - -- we definitely expect to have the old interface available - let old_iface = case maybe_checked_iface of - Just old_if -> old_if - Nothing -> panic "hscNoRecomp:old_iface" - this_mod = mi_module old_iface - ; + hPutStrLn stderr "compilation IS NOT required"; + let { bomb = panic "hscNoRecomp:OneShot" }; + return (HscNoRecomp pcs_ch bomb bomb) + } + | otherwise + = do { + hPutStr stderr "compilation IS NOT required"; + when (verbosity dflags /= 1) $ hPutStrLn stderr ""; + -- CLOSURE (pcs_cl, closure_errs, cl_hs_decls) <- closeIfaceDecls dflags hit hst pcs_ch old_iface ; @@ -130,31 +157,29 @@ hscNoRecomp dflags location maybe_checked_iface hst hit pcs_ch else do { -- TYPECHECK - maybe_tc_result <- typecheckModule dflags this_mod pcs_cl hst + maybe_tc_result <- typecheckModule dflags pcs_cl hst old_iface alwaysQualify cl_hs_decls; case maybe_tc_result of { Nothing -> return (HscFail pcs_cl); - Just tc_result -> do { + Just (pcs_tc, tc_result) -> do { - let pcs_tc = tc_pcs tc_result - env_tc = tc_env tc_result - local_insts = tc_insts tc_result + let env_tc = tc_env tc_result local_rules = tc_rules tc_result ; -- create a new details from the closed, typechecked, old iface - let new_details = mkModDetailsFromIface env_tc local_insts local_rules + let new_details = mkModDetailsFromIface env_tc local_rules ; - return (HscOK new_details - Nothing -- tells CM to use old iface and linkables - Nothing Nothing -- foreign export stuff - Nothing -- ibinds - pcs_tc) + return (HscNoRecomp pcs_tc new_details old_iface) }}}} -hscRecomp dflags location maybe_checked_iface hst hit pcs_ch +hscRecomp ghci_mode dflags location maybe_checked_iface hst hit pcs_ch = do { - ; hPutStrLn stderr "COMPILATION IS REQUIRED"; + ; when (verbosity dflags >= 1) $ + hPutStr stderr "compilation IS required"; + -- mode -v1 tries to keep everything on one line + when (verbosity dflags > 1) $ + hPutStrLn stderr ""; -- what target are we shooting for? ; let toInterp = dopt_HscLang dflags == HscInterpreted @@ -162,11 +187,12 @@ hscRecomp dflags location maybe_checked_iface hst hit pcs_ch ------------------- -- PARSE ------------------- - ; maybe_parsed <- myParseModule dflags (unJust (ml_hspp_file location) "hscRecomp:hspp") + ; 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 = mkModuleInThisPackage (hsModuleName rdr_module) + ; let this_mod = mkHomeModule (hsModuleName rdr_module) ------------------- -- RENAME @@ -175,44 +201,41 @@ hscRecomp dflags location maybe_checked_iface hst hit pcs_ch <- renameModule dflags hit hst pcs_ch this_mod rdr_module ; case maybe_rn_result of { Nothing -> return (HscFail pcs_rn); - Just (print_unqualified, is_exported, new_iface, rn_hs_decls) -> do { + Just (print_unqualified, (is_exported, new_iface, rn_hs_decls)) -> do { ------------------- -- TYPECHECK ------------------- - ; maybe_tc_result <- typecheckModule dflags this_mod pcs_rn hst new_iface + ; maybe_tc_result <- typecheckModule dflags pcs_rn hst new_iface print_unqualified rn_hs_decls ; case maybe_tc_result of { - Nothing -> do { hPutStrLn stderr "Typecheck failed" - ; return (HscFail pcs_rn) } ; - Just tc_result -> do { + Nothing -> return (HscFail pcs_rn); + Just (pcs_tc, tc_result) -> do { - ; let pcs_tc = tc_pcs tc_result - env_tc = tc_env tc_result - local_insts = tc_insts tc_result + ; let env_tc = tc_env tc_result ------------------- -- DESUGAR, SIMPLIFY, TIDY-CORE ------------------- -- We grab the the unfoldings at this point. - ; simpl_result <- dsThenSimplThenTidy dflags (pcs_rules pcs_tc) this_mod - print_unqualified is_exported tc_result hst - ; let (tidy_binds, orphan_rules, foreign_stuff) = simpl_result + ; simpl_result <- dsThenSimplThenTidy dflags pcs_tc hst this_mod + print_unqualified is_exported tc_result + ; let (pcs_simpl, tidy_binds, orphan_rules, foreign_stuff) = simpl_result ------------------- -- CONVERT TO STG ------------------- - ; (stg_binds, oa_tidy_binds, cost_centre_info, top_level_ids) + ; (stg_binds, cost_centre_info, top_level_ids) <- myCoreToStg dflags this_mod tidy_binds ------------------- -- BUILD THE NEW ModDetails AND ModIface ------------------- - ; let new_details = mkModDetails env_tc local_insts tidy_binds + ; let new_details = mkModDetails env_tc tidy_binds top_level_ids orphan_rules - ; final_iface <- mkFinalIface dflags location maybe_checked_iface - new_iface new_details + ; final_iface <- mkFinalIface ghci_mode dflags location + maybe_checked_iface new_iface new_details ------------------- -- COMPLETE CODE GENERATION @@ -220,18 +243,18 @@ hscRecomp dflags location maybe_checked_iface hst hit pcs_ch ; (maybe_stub_h_filename, maybe_stub_c_filename, maybe_ibinds) <- restOfCodeGeneration dflags toInterp this_mod (map ideclName (hsModuleImports rdr_module)) - cost_centre_info foreign_stuff env_tc stg_binds oa_tidy_binds - hit (pcs_PIT pcs_tc) + cost_centre_info foreign_stuff env_tc stg_binds tidy_binds + hit (pcs_PIT pcs_simpl) -- and the answer is ... - ; return (HscOK new_details (Just final_iface) - maybe_stub_h_filename maybe_stub_c_filename - maybe_ibinds pcs_tc) + ; return (HscRecomp pcs_simpl new_details final_iface + maybe_stub_h_filename maybe_stub_c_filename + maybe_ibinds) }}}}}}} -mkFinalIface dflags location maybe_old_iface new_iface new_details +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) @@ -240,10 +263,14 @@ mkFinalIface dflags location maybe_old_iface new_iface new_details "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) + -> 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 - writeIface (unJust (ml_hi_file location) "hscRecomp:hi") new_iface + when (ghci_mode /= Interactive) + (writeIface (unJust "hscRecomp:hi" (ml_hi_file location)) + new_iface) return new_iface @@ -255,7 +282,7 @@ myParseModule dflags src_filename buf <- hGetStringBuffer True{-expand tabs-} src_filename let glaexts | dopt Opt_GlasgowExts dflags = 1# - | otherwise = 0# + | otherwise = 0# case parse buf PState{ bol = 0#, atbol = 1#, context = [], glasgow_exts = glaexts, @@ -263,7 +290,8 @@ myParseModule dflags src_filename PFailed err -> do { hPutStrLn stderr (showSDoc err); return Nothing }; - POk _ rdr_module@(HsModule mod_name _ _ _ _ _ _) -> do { + + POk _ (PModule rdr_module@(HsModule mod_name _ _ _ _ _ _)) -> do { dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr rdr_module) ; @@ -275,11 +303,12 @@ myParseModule dflags src_filename restOfCodeGeneration dflags toInterp this_mod imported_module_names cost_centre_info - foreign_stuff env_tc stg_binds oa_tidy_binds + foreign_stuff env_tc stg_binds tidy_binds hit pit -- these last two for mapping ModNames to Modules | toInterp = do (ibinds,itbl_env) - <- stgToInterpSyn (map fst stg_binds) local_tycons local_classes + <- stgBindsToInterpSyn dflags (map fst stg_binds) + local_tycons local_classes return (Nothing, Nothing, Just (ibinds,itbl_env)) | otherwise @@ -293,7 +322,7 @@ restOfCodeGeneration dflags toInterp this_mod imported_module_names cost_centre_ -- _scc_ "CodeOutput" (maybe_stub_h_name, maybe_stub_c_name) <- codeOutput dflags this_mod local_tycons - oa_tidy_binds stg_binds + tidy_binds stg_binds c_code h_code abstractC return (maybe_stub_h_name, maybe_stub_c_name, Nothing) @@ -315,45 +344,46 @@ restOfCodeGeneration dflags toInterp this_mod imported_module_names cost_centre_ (ppr nm) -dsThenSimplThenTidy dflags rule_base this_mod print_unqual is_exported tc_result hst - = do -------------------------- Desugaring ---------------- +dsThenSimplThenTidy dflags pcs hst this_mod print_unqual is_exported tc_result + = do ------------------ Desugaring --------------------------------- -- _scc_ "DeSugar" (desugared, rules, h_code, c_code, fe_binders) - <- deSugar dflags this_mod print_unqual hst tc_result + <- deSugar dflags pcs hst this_mod print_unqual tc_result - -------------------------- Main Core-language transformations ---------------- + ------------------ Main Core-language transformations --------- -- _scc_ "Core2Core" (simplified, orphan_rules) - <- core2core dflags rule_base hst is_exported desugared rules + <- core2core dflags pcs hst is_exported desugared rules + + -- Do saturation and convert to A-normal form + -- NOTE: future passes cannot transform the syntax, only annotate it + saturated <- coreSatPgm dflags simplified -- Do the final tidy-up - (tidy_binds, tidy_orphan_rules) - <- tidyCorePgm dflags this_mod simplified orphan_rules + (pcs', tidy_binds, tidy_orphan_rules) + <- tidyCorePgm dflags this_mod pcs saturated orphan_rules - return (tidy_binds, tidy_orphan_rules, (fe_binders,h_code,c_code)) + return (pcs', tidy_binds, tidy_orphan_rules, (fe_binders,h_code,c_code)) myCoreToStg dflags this_mod tidy_binds = do - c2s_uniqs <- mkSplitUniqSupply 'c' - st_uniqs <- mkSplitUniqSupply 'g' - let occ_anal_tidy_binds = occurAnalyseBinds tidy_binds - - () <- coreBindsSize occ_anal_tidy_binds `seq` return () + () <- 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 - showPass dflags "Core2Stg" + --let bcos = byteCodeGen tidy_binds + --putStrLn (showSDoc (vcat (map ppr bcos))) + -- _scc_ "Core2Stg" - let stg_binds = topCoreBindsToStg c2s_uniqs occ_anal_tidy_binds + stg_binds <- coreToStg dflags this_mod tidy_binds - showPass dflags "Stg2Stg" -- _scc_ "Stg2Stg" - (stg_binds2, cost_centre_info) <- stg2stg dflags this_mod st_uniqs stg_binds + (stg_binds2, cost_centre_info) <- stg2stg dflags this_mod stg_binds let final_ids = collectFinalStgBinders (map fst stg_binds2) - return (stg_binds2, occ_anal_tidy_binds, cost_centre_info, final_ids) + return (stg_binds2, cost_centre_info, final_ids) \end{code} @@ -363,6 +393,14 @@ myCoreToStg dflags this_mod tidy_binds %* * %************************************************************************ +\begin{code} +#ifndef GHCI +hscExpr dflags hst hit pcs this_module expr + = panic "hscExpr: non-interactive build" +hscTypeExpr dflags hst hit pcs0 this_module expr + = panic "hscTypeExpr: non-interactive build" +#else + hscExpr :: DynFlags -> HomeSymbolTable @@ -370,20 +408,100 @@ hscExpr -> PersistentCompilerState -- IN: persistent compiler state -> Module -- Context for compiling -> String -- The expression - -> IO HscResult - -hscExpr dflags hst hit pcs this_module expr - = do { -- Parse it - ; maybe_parsed <- myParseExpr dflags expr - ; case maybe_parsed of { - Nothing -> return (HscFail pcs_ch); + -> IO ( PersistentCompilerState, + Maybe (UnlinkedIExpr, PrintUnqualified, Type) ) + +hscExpr dflags hst hit pcs0 this_module expr + = do { + maybe_parsed <- hscParseExpr dflags expr; + case maybe_parsed of + Nothing -> return (pcs0, Nothing) Just parsed_expr -> do { -- Rename it - (new_pcs, maybe_renamed_expr) <- renameExpr dflags hit hst pcs this_module parsed_expr ; - case maybe_renamed_expr of { - Nothing -> + (pcs1, maybe_renamed_expr) <- + renameExpr dflags hit hst pcs0 this_module parsed_expr; + case maybe_renamed_expr of + Nothing -> return (pcs1, Nothing) + Just (print_unqual, rn_expr) -> do { + + -- Typecheck it + maybe_tc_return + <- typecheckExpr dflags pcs1 hst print_unqual this_module rn_expr; + case maybe_tc_return of { + Nothing -> return (pcs1, Nothing); + Just (pcs2, tc_expr, ty) -> do + + -- if it isn't an IO-typed expression, + -- wrap "print" around it & recompile... + let { is_IO_type = case splitTyConApp_maybe ty of { + Just (tycon, _) -> getUnique tycon == ioTyConKey; + Nothing -> False } + }; + + if (not is_IO_type) + then do (new_pcs, maybe_stuff) + <- hscExpr dflags hst hit pcs2 this_module + ("print (" ++ expr ++ ")") + case maybe_stuff of + Nothing -> return (new_pcs, maybe_stuff) + Just (expr, _, _) -> + return (new_pcs, Just (expr, print_unqual, ty)) + else do + + -- Desugar it + ds_expr <- deSugarExpr dflags pcs2 hst this_module + print_unqual tc_expr; + + -- Simplify it + simpl_expr <- simplifyExpr dflags pcs2 hst ds_expr; + + -- Saturate it + sat_expr <- coreSatExpr dflags simpl_expr; + + -- Convert to STG + let stg_expr = coreExprToStg sat_expr; + + -- ToDo: need to do SRTs? + + -- Convert to InterpSyn + unlinked_iexpr <- stgExprToInterpSyn dflags stg_expr; + + return (pcs2, Just (unlinked_iexpr, print_unqual, ty)); + }}}} + +hscParseExpr :: DynFlags -> String -> IO (Maybe RdrNameHsExpr) +hscParseExpr dflags str + = do -------------------------- Parser ---------------- + showPass dflags "Parser" + -- _scc_ "Parser" + + buf <- stringToStringBuffer ("__expr " ++ str) + -- glaexts is True for now (because of the daft __expr at the front + -- of the string...) + let glaexts = 1# + --let glaexts | dopt Opt_GlasgowExts dflags = 1# + -- | otherwise = 0# + + case parse buf PState{ bol = 0#, atbol = 1#, + context = [], glasgow_exts = glaexts, + loc = mkSrcLoc SLIT("") 0 } of { + + PFailed err -> do { freeStringBuffer buf; + hPutStrLn stderr (showSDoc err); + return Nothing }; + + POk _ (PExpr rdr_expr) -> do { + + --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_expr); + return (Just rdr_expr) + }} +#endif +\end{code} %************************************************************************ %* * @@ -407,12 +525,12 @@ initPersistentCompilerState initPersistentRenamerState :: IO PersistentRenamerState = do ns <- mkSplitUniqSupply 'r' return ( - PRS { prsOrig = Orig { origNames = initOrigNames, + PRS { prsOrig = Orig { origNS = ns, + origNames = initOrigNames, origIParam = emptyFM }, prsDecls = (emptyNameEnv, 0), prsInsts = (emptyBag, 0), - prsRules = (emptyBag, 0), - prsNS = ns + prsRules = (emptyBag, 0) } )