X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=c8c5bddbfa3c14f59a07d80aa0c8c198cbf8fec5;hb=51a571c0f5b0201ea53bec60fcaafb78c01c017e;hp=49e5297825ddf431ef3ba967040ffa00c47c74dc;hpb=0075a4cd7eb75a28b4978255e696a9a583172355;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index 49e5297..c8c5bdd 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -5,61 +5,75 @@ \begin{code} module HscMain ( HscResult(..), hscMain, +#ifdef GHCI + hscStmt, +#endif initPersistentCompilerState ) where #include "HsVersions.h" -import Maybe ( isJust ) -import IO ( hPutStr, hPutStrLn, 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 StringBuffer ( hGetStringBuffer ) -import Parser ( parse ) +import StringBuffer ( hGetStringBuffer, + stringToStringBuffer, freeStringBuffer ) +import Parser import Lex ( PState(..), ParseResult(..) ) import SrcLoc ( mkSrcLoc ) - -import Rename ( renameModule, checkOldIface, closeIfaceDecls ) +import Rename ( checkOldIface, renameModule, closeIfaceDecls ) import Rules ( emptyRuleBase ) -import PrelInfo ( wiredInThings ) -import PrelNames ( knownKeyNames ) -import PrelRules ( builtinRules ) -import MkIface ( completeIface, mkModDetailsFromIface, mkModDetails, - writeIface ) -import TcModule ( TcResults(..), typecheckModule ) +import PrelInfo ( wiredInThingEnv, wiredInThings ) +import PrelNames ( vanillaSyntaxMap, knownKeyNames, iNTERACTIVE ) +import MkIface ( completeIface, writeIface, pprIface ) +import Type ( Type ) +import TcModule 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 StgSyn ( collectFinalStgBinders ) +import CoreSat +import CoreTidy ( tidyCoreExpr ) +import CoreToStg ( coreToStg ) import SimplStg ( stg2stg ) import CodeGen ( codeGen ) import CodeOutput ( codeOutput ) -import Module ( ModuleName, moduleName, emptyModuleEnv, mkModuleInThisPackage ) +import Module ( ModuleName, moduleName, mkHomeModule, + moduleUserString ) import CmdLineOpts -import ErrUtils ( dumpIfSet_dyn ) +import ErrUtils ( dumpIfSet_dyn, showPass ) +import Util ( unJust ) import UniqSupply ( mkSplitUniqSupply ) import Bag ( emptyBag ) import Outputable -import StgInterp ( stgToInterpSyn ) +import Interpreter +import CmStaticInfo ( GhciMode(..) ) import HscStats ( ppSourceStats ) import HscTypes ( ModDetails, ModIface(..), PersistentCompilerState(..), PersistentRenamerState(..), ModuleLocation(..), - HomeSymbolTable, PackageSymbolTable, - OrigNameEnv(..), PackageRuleBase, HomeIfaceTable, - extendTypeEnv, groupTyThings, - typeEnvClasses, typeEnvTyCons, emptyIfaceTable ) -import InterpSyn ( UnlinkedIBind ) -import StgInterp ( ItblEnv ) + HomeSymbolTable, + NameSupply(..), PackageRuleBase, HomeIfaceTable, + typeEnvClasses, typeEnvTyCons, emptyIfaceTable + ) import FiniteMap ( FiniteMap, plusFM, emptyFM, addToFM ) import OccName ( OccName ) -import Name ( Name, nameModule, emptyNameEnv, nameOccName, getName ) +import Name ( Name, nameModule, nameOccName, getName, isGlobalName ) +import NameEnv ( emptyNameEnv ) import Module ( Module, lookupModuleEnvByName ) +import Monad ( when ) +import Maybe ( isJust ) +import IO \end{code} @@ -71,34 +85,48 @@ import Module ( Module, lookupModuleEnvByName ) \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 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 - -> Bool -- source unchanged? + :: 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 source_unchanged location maybe_old_iface hst hit pcs +hscMain ghci_mode dflags mod location source_unchanged maybe_old_iface hst hit pcs = do { - putStrLn "checking old iface ..."; - (pcs_ch, check_errs, (recomp_reqd, maybe_checked_iface)) - <- checkOldIface dflags hit hst pcs (hi_file location) - source_unchanged maybe_old_iface; - if check_errs then + 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 { @@ -106,20 +134,24 @@ hscMain dflags source_unchanged location maybe_old_iface hst hit pcs what_next | recomp_reqd || no_old_iface = hscRecomp | otherwise = hscNoRecomp ; - putStrLn "doing what_next ..."; - what_next dflags location maybe_checked_iface + what_next ghci_mode dflags mod 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 mod location (Just old_iface) hst hit pcs_ch + | ghci_mode == OneShot = do { - -- 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 { + 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 ; @@ -128,116 +160,158 @@ hscNoRecomp dflags location maybe_checked_iface hst hit pcs_ch else do { -- TYPECHECK - maybe_tc_result - <- typecheckModule dflags this_mod pcs_cl hst hit cl_hs_decls; - case maybe_tc_result of { - Nothing -> return (HscFail pcs_cl); - Just tc_result -> do { - - let pcs_tc = tc_pcs tc_result - env_tc = tc_env tc_result - local_insts = tc_insts 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 - ; - return (HscOK new_details - Nothing -- tells CM to use old iface and linkables - Nothing Nothing -- foreign export stuff - Nothing -- ibinds - pcs_tc) - }}}} + maybe_tc_result + <- typecheckIface dflags pcs_cl hst old_iface (vanillaSyntaxMap, cl_hs_decls); - -hscRecomp dflags location maybe_checked_iface hst hit pcs_ch - = do { - -- what target are we shooting for? - let toInterp = dopt_HscLang dflags == HscInterpreted - ; --- putStrLn ("toInterp = " ++ show toInterp); - -- PARSE - maybe_parsed <- myParseModule dflags (hs_preprocd_file location); - case maybe_parsed of { - Nothing -> return (HscFail pcs_ch); - Just rdr_module -> do { - - -- RENAME - let this_mod = mkModuleInThisPackage (hsModuleName rdr_module) - ; - show_pass dflags "Renamer"; - (pcs_rn, maybe_rn_result) - <- renameModule dflags hit hst pcs_ch this_mod rdr_module; - case maybe_rn_result of { - Nothing -> return (HscFail pcs_rn); - Just (new_iface, rn_hs_decls) -> do { - - -- TYPECHECK - show_pass dflags "Typechecker"; - maybe_tc_result - <- typecheckModule dflags this_mod pcs_rn hst hit rn_hs_decls; case maybe_tc_result of { - Nothing -> do { hPutStrLn stderr "Typechecked failed" - ; return (HscFail pcs_rn) } ; - Just tc_result -> do { - - let pcs_tc = tc_pcs tc_result - env_tc = tc_env tc_result - local_insts = tc_insts tc_result - ; - -- DESUGAR, SIMPLIFY, TIDY-CORE - -- We grab the the unfoldings at this point. - (tidy_binds, orphan_rules, foreign_stuff) - <- dsThenSimplThenTidy dflags (pcs_rules pcs_tc) this_mod tc_result hst - ; - -- CONVERT TO STG - (stg_binds, oa_tidy_binds, cost_centre_info, top_level_ids) - <- myCoreToStg dflags this_mod tidy_binds - ; - -- cook up a new ModDetails now we (finally) have all the bits - let new_details = mkModDetails env_tc local_insts tidy_binds - top_level_ids orphan_rules - ; - -- and possibly create a new ModIface - let maybe_final_iface_and_sdoc - = completeIface maybe_checked_iface new_iface new_details - maybe_final_iface - = case maybe_final_iface_and_sdoc of - Just (fif, sdoc) -> Just fif; Nothing -> Nothing - ; - -- Write the interface file - writeIface maybe_final_iface - ; - -- do the rest of code generation/emission - (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) - ; - -- and the answer is ... - return (HscOK new_details maybe_final_iface - maybe_stub_h_filename maybe_stub_c_filename - maybe_ibinds pcs_tc) - }}}}}}} + 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 ---------------- - show_pass dflags "Parser" - -- _scc_ "Parser" + showPass dflags "Parser" + _scc_ "Parser" do 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, - loc = mkSrcLoc (_PK_ src_filename) 1 } of { + 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) ; @@ -246,39 +320,43 @@ myParseModule dflags src_filename (ppSourceStats False rdr_module) ; return (Just rdr_module) + -- ToDo: free the string buffer later. }} -restOfCodeGeneration dflags toInterp this_mod imported_module_names cost_centre_info - foreign_stuff env_tc stg_binds oa_tidy_binds +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 (ibinds,itbl_env) - <- stgToInterpSyn (map fst stg_binds) local_tycons local_classes - return (Nothing, Nothing, Just (ibinds,itbl_env)) + = do (bcos,itbl_env) + <- byteCodeGen dflags tidy_binds local_tycons local_classes + return (Nothing, Nothing, Just (bcos,itbl_env)) + | otherwise - = do -------------------------- Code generation ------------------------------- - show_pass dflags "CodeGen" - -- _scc_ "CodeGen" - abstractC <- codeGen dflags this_mod imported_modules + = 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 dflags "CodeOutput" - -- _scc_ "CodeOutput" - ncg_uniqs <- mkSplitUniqSupply 'n' (maybe_stub_h_name, maybe_stub_c_name) - <- codeOutput dflags this_mod local_tycons local_classes - oa_tidy_binds stg_binds - c_code h_code abstractC ncg_uniqs + <- 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 - (fe_binders,h_code,c_code) = foreign_stuff + (h_code,c_code,fe_binders) = foreign_stuff mod_name_to_Module :: ModuleName -> Module mod_name_to_Module nm @@ -292,57 +370,180 @@ restOfCodeGeneration dflags toInterp this_mod imported_module_names cost_centre_ (ppr nm) -dsThenSimplThenTidy dflags rule_base this_mod tc_result hst - = do -------------------------- Desugaring ---------------- - -- _scc_ "DeSugar" - show_pass dflags "DeSugar" - ds_uniqs <- mkSplitUniqSupply 'd' - (desugared, rules, h_code, c_code, fe_binders) - <- deSugar dflags this_mod ds_uniqs hst tc_result - - -------------------------- Main Core-language transformations ---------------- - -- _scc_ "Core2Core" - show_pass dflags "Core2Core" - (simplified, orphan_rules) - <- core2core dflags rule_base hst desugared rules - - -- Do the final tidy-up - show_pass dflags "CoreTidy" - (tidy_binds, tidy_orphan_rules) - <- tidyCorePgm dflags this_mod simplified orphan_rules - - return (tidy_binds, tidy_orphan_rules, (fe_binders,h_code,c_code)) - - -myCoreToStg dflags this_mod tidy_binds +myCoreToStg dflags this_mod tidy_binds env_tc = 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 - show_pass dflags "Core2Stg" - -- _scc_ "Core2Stg" - let stg_binds = topCoreBindsToStg c2s_uniqs occ_anal_tidy_binds + --let bcos = byteCodeGen dflags tidy_binds local_tycons local_classes + + + stg_binds <- _scc_ "Core2Stg" coreToStg dflags this_mod tidy_binds - show_pass dflags "Stg2Stg" - -- _scc_ "Stg2Stg" - (stg_binds2, cost_centre_info) <- stg2stg dflags this_mod st_uniqs stg_binds - let final_ids = collectFinalStgBinders (map fst stg_binds2) + (stg_binds2, cost_centre_info) + <- _scc_ "Core2Stg" stg2stg dflags this_mod stg_binds - return (stg_binds2, occ_anal_tidy_binds, cost_centre_info, final_ids) + return (stg_binds2, cost_centre_info) + where + local_tycons = typeEnvTyCons env_tc + local_classes = typeEnvClasses env_tc +\end{code} -show_pass dflags what - = if dopt Opt_D_show_passes dflags - then hPutStr stderr ("*** "++what++":\n") - else return () +%************************************************************************ +%* * +\subsection{Compiling a do-statement} +%* * +%************************************************************************ + +\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} +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. + +A naked expression returns a singleton Name [it]. + + 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,...] + + pat <- expr ==> expr >>= \ pat -> return [coerce HVal x, coerce HVal y, ...] + bindings: [x,y,...] + + expr (of IO type) ==> expr >>= \ v -> return [v] + [NB: result not printed] bindings: [it] + + + expr (of non-IO type, + result showable) ==> let v = expr in print v >> return [v] + bindings: [it] + + expr (of non-IO type, + result not showable) ==> error + +\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 + + -- Simplify it + ; simpl_expr <- simplifyExpr dflags pcs2 hst ds_expr + + -- Tidy it (temporary, until coreSat does cloning) + ; tidy_expr <- tidyCoreExpr simpl_expr + + -- Saturate it + ; sat_expr <- coreSatExpr dflags tidy_expr + + -- 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 + + ; return (pcs2, Just (global_bound_ids, ty, bcos)) + + }}}}} + +hscParseStmt :: DynFlags -> String -> IO (Maybe RdrNameStmt) +hscParseStmt dflags str + = do -------------------------- Parser ---------------- + showPass dflags "Parser" + _scc_ "Parser" do + + buf <- stringToStringBuffer str + + let glaexts | dopt Opt_GlasgowExts dflags = 1# + | otherwise = 0# + + 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; + + POk _ (Just rdr_stmt) -> 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_stmt); + return (Just rdr_stmt) + }} +#endif +\end{code} %************************************************************************ %* * @@ -356,27 +557,23 @@ initPersistentCompilerState = do prs <- initPersistentRenamerState return ( PCS { pcs_PIT = emptyIfaceTable, - pcs_PST = initPackageDetails, + pcs_PTE = wiredInThingEnv, pcs_insts = emptyInstEnv, pcs_rules = emptyRuleBase, pcs_PRS = prs } ) -initPackageDetails :: PackageSymbolTable -initPackageDetails = extendTypeEnv emptyModuleEnv (groupTyThings wiredInThings) - ---initPackageDetails = panic "initPackageDetails" - 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 } )