X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=29de2ac1674cb1d2405c1850e164d636a6072206;hb=18b24e64d6a9e3011a2437cec87ef09ad3e6f900;hp=77872b6a4b8bc3e1bcedb0b59013b12949d19fcd;hpb=3afd81eaaafcbaf831056d56ad3043e653fa5979;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index 77872b6..29de2ac 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -4,50 +4,54 @@ \section[GHC_Main]{Main driver for Glasgow Haskell compiler} \begin{code} -module HscMain ( HscResult(..), hscMain, hscExpr, hscTypeExpr, +module HscMain ( HscResult(..), hscMain, +#ifdef GHCI + hscStmt, +#endif initPersistentCompilerState ) where #include "HsVersions.h" #ifdef GHCI -import RdrHsSyn ( RdrNameHsExpr ) -import CoreToStg ( coreToStgExpr ) -import StringBuffer ( stringToStringBuffer, freeStringBuffer ) +import RdrHsSyn ( RdrNameStmt ) +import Rename ( renameStmt ) +import ByteCodeGen ( byteCodeGen ) +import Id ( Id, idName, idFlavour, modifyIdInfo ) +import IdInfo ( setFlavourInfo, makeConstantFlavour ) +import HscTypes ( InteractiveContext(..), TyThing(..) ) #endif import HsSyn -import StringBuffer ( hGetStringBuffer ) +import StringBuffer ( hGetStringBuffer, + stringToStringBuffer, freeStringBuffer ) import Parser import Lex ( PState(..), ParseResult(..) ) import SrcLoc ( mkSrcLoc ) -import Rename +import Rename ( checkOldIface, renameModule, closeIfaceDecls ) import Rules ( emptyRuleBase ) import PrelInfo ( wiredInThingEnv, wiredInThings ) -import PrelNames ( knownKeyNames ) +import PrelNames ( vanillaSyntaxMap, knownKeyNames, iNTERACTIVE ) import MkIface ( completeIface, mkModDetailsFromIface, mkModDetails, writeIface, pprIface ) import TcModule -import Type -import TcHsSyn import InstEnv ( emptyInstEnv ) import Desugar import SimplCore -import OccurAnal ( occurAnalyseBinds ) 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, mkHomeModule ) +import Module ( ModuleName, moduleName, mkHomeModule, + moduleUserString ) import CmdLineOpts import ErrUtils ( dumpIfSet_dyn, showPass ) import Util ( unJust ) -import Unique ( Uniquable(..) ) -import PrelNames ( ioTyConKey ) import UniqSupply ( mkSplitUniqSupply ) import Bag ( emptyBag ) @@ -58,18 +62,19 @@ import HscStats ( ppSourceStats ) import HscTypes ( ModDetails, ModIface(..), PersistentCompilerState(..), PersistentRenamerState(..), ModuleLocation(..), HomeSymbolTable, - OrigNameEnv(..), PackageRuleBase, HomeIfaceTable, - typeEnvClasses, typeEnvTyCons, emptyIfaceTable ) -import Type ( splitTyConApp_maybe ) + NameSupply(..), PackageRuleBase, HomeIfaceTable, + typeEnvClasses, typeEnvTyCons, emptyIfaceTable + ) import FiniteMap ( FiniteMap, plusFM, emptyFM, addToFM ) import OccName ( OccName ) -import Name ( Name, nameModule, nameOccName, getName ) -import Name ( emptyNameEnv ) +import Name ( Name, nameModule, nameOccName, getName, isGlobalName, + emptyNameEnv + ) import Module ( Module, lookupModuleEnvByName ) import Monad ( when ) import Maybe ( isJust ) -import IO ( hPutStrLn, stderr ) +import IO \end{code} @@ -93,7 +98,7 @@ data HscResult 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 + (Maybe ([UnlinkedBCO],ItblEnv)) -- interpreted code, if any -- no errors or warnings; the individual passes @@ -102,22 +107,23 @@ data HscResult hscMain :: GhciMode -> DynFlags - -> Bool -- source unchanged? + -> 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 ghci_mode 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 { 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 + <- checkOldIface ghci_mode dflags hit hst pcs (unJust "hscMain" (ml_hi_file location)) source_unchanged maybe_old_iface; @@ -129,19 +135,23 @@ hscMain ghci_mode dflags source_unchanged location maybe_old_iface hst hit pcs what_next | recomp_reqd || no_old_iface = hscRecomp | otherwise = hscNoRecomp ; - what_next ghci_mode dflags location maybe_checked_iface + 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 location (Just old_iface) hst hit pcs_ch +hscNoRecomp ghci_mode dflags mod location (Just old_iface) hst hit pcs_ch | ghci_mode == OneShot - = let bomb = panic "hscNoRecomp:OneShot" - in return (HscNoRecomp pcs_ch bomb bomb) - | otherwise = 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) @@ -151,27 +161,29 @@ hscNoRecomp ghci_mode dflags location (Just old_iface) hst hit pcs_ch else do { -- TYPECHECK - maybe_tc_result <- typecheckModule dflags pcs_cl hst - old_iface alwaysQualify cl_hs_decls; + 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, tc_result) -> do { + Just (pcs_tc, env_tc, local_rules) -> do { - let 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 + let new_details = mkModDetailsFromIface env_tc local_rules ; 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 location maybe_checked_iface hst hit pcs_ch + +hscRecomp ghci_mode dflags mod location maybe_checked_iface hst hit pcs_ch = do { ; when (verbosity dflags >= 1) $ - hPutStrLn stderr "compilation IS required"; + hPutStrLn stderr ("Compiling " ++ compMsg mod location); -- what target are we shooting for? ; let toInterp = dopt_HscLang dflags == HscInterpreted @@ -189,60 +201,72 @@ hscRecomp ghci_mode dflags location maybe_checked_iface hst hit pcs_ch ------------------- -- RENAME ------------------- - ; (pcs_rn, maybe_rn_result) - <- renameModule dflags hit hst pcs_ch this_mod rdr_module + ; (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_rn); - Just (print_unqualified, (is_exported, new_iface, rn_hs_decls)) -> do { + 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 <- typecheckModule dflags pcs_rn hst new_iface - print_unqualified rn_hs_decls + ; 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_rn); + Nothing -> return (HscFail pcs_ch{-was: pcs_rn-}); Just (pcs_tc, tc_result) -> do { - ; let env_tc = tc_env tc_result - local_insts = tc_insts tc_result + ; let env_tc = tc_env tc_result ------------------- - -- DESUGAR, SIMPLIFY, TIDY-CORE + -- DESUGAR ------------------- - -- We grab the the unfoldings at this point. - ; simpl_result <- dsThenSimplThenTidy dflags pcs_tc hst this_mod - print_unqualified is_exported tc_result - ; let (tidy_binds, orphan_rules, foreign_stuff) = simpl_result - + ; (ds_binds, ds_rules, foreign_stuff) + <- _scc_ "DeSugar" + deSugar dflags pcs_tc hst this_mod print_unqualified tc_result + ------------------- - -- CONVERT TO STG + -- SIMPLIFY, TIDY-CORE ------------------- - ; (stg_binds, oa_tidy_binds, cost_centre_info, top_level_ids) - <- myCoreToStg dflags this_mod tidy_binds - - + -- We grab the the unfoldings at this point. + ; (pcs_simpl, tidy_binds, orphan_rules) + <- simplThenTidy dflags pcs_tc hst this_mod dont_discard ds_binds ds_rules + ------------------- -- BUILD THE NEW ModDetails AND ModIface ------------------- - ; let new_details = mkModDetails env_tc local_insts tidy_binds - top_level_ids orphan_rules - ; final_iface <- mkFinalIface ghci_mode dflags location + ; let new_details = mkModDetails env_tc tidy_binds orphan_rules + ; final_iface <- _scc_ "MkFinalIface" + mkFinalIface ghci_mode dflags location maybe_checked_iface new_iface new_details ------------------- - -- COMPLETE CODE GENERATION + -- CONVERT TO STG and COMPLETE CODE GENERATION ------------------- - ; (maybe_stub_h_filename, maybe_stub_c_filename, maybe_ibinds) + -- 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)) - cost_centre_info foreign_stuff env_tc stg_binds oa_tidy_binds - hit (pcs_PIT pcs_tc) + foreign_stuff env_tc saturated + hit (pcs_PIT pcs_simpl) -- and the answer is ... - ; return (HscRecomp pcs_tc new_details final_iface + ; return (HscRecomp pcs_simpl new_details final_iface maybe_stub_h_filename maybe_stub_c_filename - maybe_ibinds) + maybe_bcos) }}}}}}} @@ -270,21 +294,22 @@ mkFinalIface ghci_mode dflags location maybe_old_iface new_iface new_details myParseModule dflags src_filename = do -------------------------- Parser ---------------- showPass dflags "Parser" - -- _scc_ "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 _ (PModule rdr_module@(HsModule mod_name _ _ _ _ _ _)) -> do { + POk _ rdr_module@(HsModule mod_name _ _ _ _ _ _) -> do { dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr rdr_module) ; @@ -292,30 +317,48 @@ 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 +simplThenTidy dflags pcs hst this_mod dont_discard binds rules + = do -- Do main Core-language transformations --------- + -- _scc_ "Core2Core" + (simplified, orphan_rules) + <- core2core dflags pcs hst dont_discard binds rules + + -- Do the final tidy-up + (pcs', tidy_binds, tidy_orphan_rules) + <- tidyCorePgm dflags this_mod pcs simplified orphan_rules + + return (pcs', tidy_binds, tidy_orphan_rules) + + +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) - <- stgBindsToInterpSyn dflags (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 ------------------------------- - -- _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 stg_binds -------------------------- Code output ------------------------------- - -- _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) @@ -323,7 +366,7 @@ restOfCodeGeneration dflags toInterp this_mod imported_module_names cost_centre_ 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 @@ -337,186 +380,163 @@ restOfCodeGeneration dflags toInterp this_mod imported_module_names cost_centre_ (ppr nm) -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 pcs hst this_mod print_unqual tc_result - - -------------------------- Main Core-language transformations ---------------- - -- _scc_ "Core2Core" - (simplified, orphan_rules) - <- core2core dflags pcs hst is_exported desugared rules - - -- Do the final tidy-up - (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 - 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 - -- _scc_ "Core2Stg" - stg_binds <- topCoreBindsToStg dflags occ_anal_tidy_binds + --let bcos = byteCodeGen dflags tidy_binds local_tycons local_classes - showPass 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_binds <- _scc_ "Core2Stg" coreToStg dflags this_mod tidy_binds + + (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} %************************************************************************ %* * -\subsection{Compiling an expression} +\subsection{Compiling a do-statement} %* * %************************************************************************ \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 +#ifdef GHCI +hscStmt :: DynFlags -> HomeSymbolTable -> HomeIfaceTable -> PersistentCompilerState -- IN: persistent compiler state - -> Module -- Context for compiling - -> String -- The expression - -> IO ( PersistentCompilerState, Maybe UnlinkedIExpr ) - -hscExpr dflags hst hit pcs0 this_module expr - = do { - -- parse, rename & typecheck the expression - (pcs1, maybe_tc_result) - <- hscExprFrontEnd dflags hst hit pcs0 this_module expr; - - case maybe_tc_result of { - Nothing -> return (pcs1, Nothing); - Just (print_unqual, 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 hscExpr dflags hst hit pcs1 this_module - ("print (" ++ expr ++ ")") - else do + -> InteractiveContext -- Context for compiling + -> String -- The statement + -> IO ( PersistentCompilerState, + Maybe ( [Id], + UnlinkedBCOExpr) ) +\end{code} - -- Desugar it - ds_expr <- deSugarExpr dflags pcs1 hst this_module - print_unqual tc_expr; - - -- Simplify it - simpl_expr <- simplifyExpr dflags pcs1 hst ds_expr; +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. - -- Convert to STG - stg_expr <- coreToStgExpr dflags simpl_expr; +A naked expression returns a singleton Name [it]. - -- ToDo: need to do StgVarInfo? or SRTs? + 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,...] - -- Convert to InterpSyn - unlinked_iexpr <- stgExprToInterpSyn dflags stg_expr; + pat <- expr ==> expr >>= \ pat -> return [coerce HVal x, coerce HVal y, ...] + bindings: [x,y,...] - return (pcs1, Just unlinked_iexpr); - }}} + expr (of IO type) ==> expr >>= \ v -> return [v] + [NB: result not printed] bindings: [it] + -hscExprFrontEnd - :: DynFlags - -> HomeSymbolTable - -> HomeIfaceTable - -> PersistentCompilerState -- IN: persistent compiler state - -> Module -- Context for compiling - -> String -- The expression - -> IO ( PersistentCompilerState, - Maybe (PrintUnqualified,TypecheckedHsExpr,Type) - ) -hscExprFrontEnd dflags hst hit pcs0 this_module expr - = do { -- Parse it - maybe_parsed <- hscParseExpr dflags expr; - case maybe_parsed of + 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 + = 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_expr -> do { + Just parsed_stmt -> do { -- Rename it - (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 { + (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 - <- typecheckExpr dflags pcs1 hst print_unqual this_module rn_expr; - case maybe_tc_return of - Nothing -> return (pcs1, Nothing) - Just (pcs2, tc_expr, ty) -> - return (pcs2, Just (print_unqual, tc_expr, ty)) - }}} - -hscTypeExpr - :: DynFlags - -> HomeSymbolTable - -> HomeIfaceTable - -> PersistentCompilerState -- IN: persistent compiler state - -> Module -- Context for compiling - -> String -- The expression - -> IO (PersistentCompilerState, Maybe (PrintUnqualified, Type)) -hscTypeExpr dflags hst hit pcs0 this_module expr - = do (pcs1, maybe_tc_result) - <- hscExprFrontEnd dflags hst hit pcs0 this_module expr - case maybe_tc_result of - Nothing -> return (pcs1, Nothing) - Just (print_unqual,_,ty) -> return (pcs1, Just (print_unqual,ty)) - -hscParseExpr :: DynFlags -> String -> IO (Maybe RdrNameHsExpr) -hscParseExpr dflags str + maybe_tc_return + <- 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) -> 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 "constant" 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. + constant_bound_ids = map constantizeId bound_ids; + + constantizeId id + = modifyIdInfo (`setFlavourInfo` makeConstantFlavour + (idFlavour id)) id + + ; return (pcs2, Just (constant_bound_ids, bcos)) + }}}}} + +hscParseStmt :: DynFlags -> String -> IO (Maybe RdrNameStmt) +hscParseStmt dflags str = do -------------------------- Parser ---------------- showPass dflags "Parser" - -- _scc_ "Parser" + _scc_ "Parser" do - buf <- stringToStringBuffer ("__expr " ++ str) + buf <- stringToStringBuffer 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# + 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 { + case parseStmt buf PState{ bol = 0#, atbol = 1#, + context = [], glasgow_exts = glaexts, + loc = mkSrcLoc SLIT("") 0 } of { - PFailed err -> do { freeStringBuffer buf; - hPutStrLn stderr (showSDoc err); + PFailed err -> do { hPutStrLn stderr (showSDoc err); +-- Not yet implemented in <4.11 freeStringBuffer buf; return Nothing }; - POk _ (PExpr rdr_expr) -> do { + -- 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_expr); - return (Just rdr_expr) + dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr rdr_stmt); + return (Just rdr_stmt) }} #endif \end{code} @@ -541,14 +561,15 @@ initPersistentCompilerState ) initPersistentRenamerState :: IO PersistentRenamerState - = do ns <- mkSplitUniqSupply 'r' + = do us <- mkSplitUniqSupply 'r' return ( - PRS { prsOrig = Orig { origNames = initOrigNames, - origIParam = emptyFM }, - prsDecls = (emptyNameEnv, 0), - prsInsts = (emptyBag, 0), - prsRules = (emptyBag, 0), - prsNS = ns + PRS { prsOrig = NameSupply { nsUniqs = us, + nsNames = initOrigNames, + nsIPs = emptyFM }, + prsDecls = (emptyNameEnv, 0), + prsInsts = (emptyBag, 0), + prsRules = (emptyBag, 0), + prsImpMods = emptyFM } )