X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=8f695f62e54feef477db0208ccf6bef158b1679d;hb=50027272414438955dbc41696541cbd25da55883;hp=a49bf4540b4fbf5bb2ae5ae15a6a186bf93d5cb2;hpb=ab7fb945890d4a6895d83d60d44260772d3160d4;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index a49bf45..8f695f6 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -1,54 +1,62 @@ % % (c) The GRASP/AQUA Project, Glasgow University, 1993-2000 % + \section[GHC_Main]{Main driver for Glasgow Haskell compiler} \begin{code} module HscMain ( HscResult(..), hscMain, #ifdef GHCI - hscExpr, + hscStmt, #endif initPersistentCompilerState ) where #include "HsVersions.h" #ifdef GHCI -import RdrHsSyn ( RdrNameHsExpr ) -import Rename ( renameExpr ) -import StringBuffer ( stringToStringBuffer, freeStringBuffer ) -import Unique ( Uniquable(..) ) -import Type ( Type, splitTyConApp_maybe ) -import PrelNames ( ioTyConKey ) import ByteCodeGen ( byteCodeGen ) +import CoreTidy ( tidyCoreExpr ) +import CorePrep ( corePrepExpr ) +import Rename ( renameStmt ) +import RdrHsSyn ( RdrNameStmt ) +import Type ( Type ) +import Id ( Id, idName, setGlobalIdDetails ) +import IdInfo ( GlobalIdDetails(VanillaGlobal) ) +import HscTypes ( InteractiveContext(..), TyThing(..) ) +import PrelNames ( iNTERACTIVE ) +import StringBuffer ( stringToStringBuffer ) #endif import HsSyn -import StringBuffer ( hGetStringBuffer ) +import Id ( idName ) +import IdInfo ( CafInfo(..), CgInfoEnv, CgInfo(..) ) +import StringBuffer ( hGetStringBuffer, freeStringBuffer ) import Parser import Lex ( PState(..), ParseResult(..) ) import SrcLoc ( mkSrcLoc ) import Rename ( checkOldIface, renameModule, closeIfaceDecls ) import Rules ( emptyRuleBase ) import PrelInfo ( wiredInThingEnv, wiredInThings ) -import PrelNames ( knownKeyNames ) -import MkIface ( completeIface, mkModDetailsFromIface, mkModDetails, - writeIface, pprIface ) +import PrelNames ( vanillaSyntaxMap, knownKeyNames ) +import MkIface ( mkFinalIface ) import TcModule import InstEnv ( emptyInstEnv ) import Desugar import SimplCore import CoreUtils ( coreBindsSize ) import CoreTidy ( tidyCorePgm ) -import CoreSat +import CorePrep ( corePrepPgm ) +import StgSyn 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 ErrUtils ( dumpIfSet_dyn, showPass, printError ) import Util ( unJust ) import UniqSupply ( mkSplitUniqSupply ) @@ -57,16 +65,15 @@ import Outputable import Interpreter import CmStaticInfo ( GhciMode(..) ) import HscStats ( ppSourceStats ) -import HscTypes ( ModDetails, ModIface(..), PersistentCompilerState(..), - PersistentRenamerState(..), ModuleLocation(..), - HomeSymbolTable, - NameSupply(..), PackageRuleBase, HomeIfaceTable, - typeEnvClasses, typeEnvTyCons, emptyIfaceTable ) +import HscTypes 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 ) +import NameEnv ( emptyNameEnv, mkNameEnv ) import Module ( Module, lookupModuleEnvByName ) +import Maybes ( orElse ) + +import IOExts ( newIORef, readIORef, writeIORef, unsafePerformIO ) import Monad ( when ) import Maybe ( isJust ) @@ -92,8 +99,8 @@ data HscResult | 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 String) -- generated stub_h filename (in TMPDIR) + (Maybe String) -- generated stub_c filename (in TMPDIR) (Maybe ([UnlinkedBCO],ItblEnv)) -- interpreted code, if any @@ -103,15 +110,18 @@ data HscResult hscMain :: GhciMode -> DynFlags - -> Bool -- source unchanged? + -> Module -> ModuleLocation -- location info + -> Bool -- True <=> source unchanged + -> Bool -- True <=> have an object file (for msgs only) -> 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 have_object + maybe_old_iface hst hit pcs = do { showPass dflags ("Checking old interface for hs = " ++ show (ml_hs_file location) @@ -130,13 +140,14 @@ 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 - hst hit pcs_ch + what_next ghci_mode dflags have_object 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 have_object + mod location (Just old_iface) hst hit pcs_ch | ghci_mode == OneShot = do { hPutStrLn stderr "compilation IS NOT required"; @@ -145,8 +156,9 @@ hscNoRecomp ghci_mode dflags location (Just old_iface) hst hit pcs_ch } | otherwise = do { - hPutStr stderr "compilation IS NOT required"; - when (verbosity dflags /= 1) $ hPutStrLn stderr ""; + when (verbosity dflags >= 1) $ + hPutStrLn stderr ("Skipping " ++ + compMsg have_object mod location); -- CLOSURE (pcs_cl, closure_errs, cl_hs_decls) @@ -156,33 +168,36 @@ 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, new_details) -> - 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_rules - ; return (HscNoRecomp pcs_tc new_details old_iface) - }}}} + }}} +compMsg use_object mod location = + mod_str ++ take (max 0 (16 - length mod_str)) (repeat ' ') + ++" ( " ++ unJust "hscRecomp" (ml_hs_file location) ++ ", " + ++ (if use_object + then unJust "hscRecomp" (ml_obj_file location) + else "interpreted") + ++ " )" + where mod_str = moduleUserString mod -hscRecomp ghci_mode dflags location maybe_checked_iface hst hit pcs_ch - = do { - ; when (verbosity dflags >= 1) $ - hPutStr stderr "compilation IS required"; - -- mode -v1 tries to keep everything on one line - when (verbosity dflags > 1) $ - hPutStrLn stderr ""; +hscRecomp ghci_mode dflags have_object + mod location maybe_checked_iface hst hit pcs_ch + = do { -- what target are we shooting for? ; let toInterp = dopt_HscLang dflags == HscInterpreted + ; when (verbosity dflags >= 1) $ + hPutStrLn stderr ("Compiling " ++ + compMsg (not toInterp) mod location); + ------------------- -- PARSE ------------------- @@ -196,83 +211,151 @@ hscRecomp ghci_mode dflags location maybe_checked_iface hst hit pcs_ch ------------------- -- RENAME ------------------- - ; (pcs_rn, maybe_rn_result) + ; (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 <- _scc_ "TypeCheck" typecheckModule dflags pcs_rn hst new_iface - print_unqualified rn_hs_decls + 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 - ------------------- -- DESUGAR ------------------- - ; (ds_binds, ds_rules, foreign_stuff) + ; (ds_details, foreign_stuff) <- _scc_ "DeSugar" deSugar dflags pcs_tc hst this_mod print_unqualified tc_result ------------------- - -- SIMPLIFY, TIDY-CORE + -- SIMPLIFY ------------------- - -- We grab the the unfoldings at this point. - ; (pcs_simpl, tidy_binds, orphan_rules) - <- simplThenTidy dflags pcs_tc hst this_mod is_exported ds_binds ds_rules - + ; simpl_details + <- _scc_ "Core2Core" + core2core dflags pcs_tc hst dont_discard ds_details + ------------------- - -- BUILD THE NEW ModDetails AND ModIface + -- TIDY ------------------- - ; 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 + ; cg_info_ref <- newIORef Nothing ; + ; let cg_info :: CgInfoEnv + cg_info = unsafePerformIO $ do { + maybe_cg_env <- readIORef cg_info_ref ; + case maybe_cg_env of + Just env -> return env + Nothing -> do { printError "Urk! Looked at CgInfo too early!"; + return emptyNameEnv } } + -- cg_info_ref will be filled in just after restOfCodeGeneration + -- Meanwhile, tidyCorePgm is careful not to look at cg_info! + + ; (pcs_simpl, tidy_details) + <- tidyCorePgm dflags this_mod pcs_tc cg_info simpl_details + + ------------------- + -- PREPARE FOR CODE GENERATION + ------------------- + -- Do saturation and convert to A-normal form + ; prepd_details <- corePrepPgm dflags tidy_details ------------------- -- CONVERT TO STG and COMPLETE CODE GENERATION ------------------- - ; (maybe_stub_h_filename, maybe_stub_c_filename, maybe_bcos) - <- restOfCodeGeneration dflags toInterp this_mod - (map ideclName (hsModuleImports rdr_module)) - foreign_stuff env_tc tidy_binds - hit (pcs_PIT pcs_simpl) + ; let + ModDetails{md_binds=binds, md_types=env_tc} = prepd_details - -- and the answer is ... - ; return (HscRecomp pcs_simpl new_details final_iface - maybe_stub_h_filename maybe_stub_c_filename - maybe_bcos) - }}}}}}} + local_tycons = typeEnvTyCons env_tc + local_classes = typeEnvClasses env_tc + imported_module_names = map ideclName (hsModuleImports rdr_module) + imported_modules = map mod_name_to_Module imported_module_names + (h_code,c_code,fe_binders) = foreign_stuff + + pit = pcs_PIT pcs_simpl + + mod_name_to_Module :: ModuleName -> Module + mod_name_to_Module nm + = let str_mi = lookupModuleEnvByName hit nm `orElse` + lookupModuleEnvByName pit nm `orElse` + pprPanic "mod_name_to_Module: no hst or pst mapping for" + (ppr nm) + in mi_module str_mi + + ; (maybe_stub_h_filename, maybe_stub_c_filename, + maybe_bcos, final_iface ) + <- if toInterp + then do + ----------------- Generate byte code ------------------ + (bcos,itbl_env) <- byteCodeGen dflags binds + local_tycons local_classes + + -- Fill in the code-gen info + writeIORef cg_info_ref (Just emptyNameEnv) + + ------------------ BUILD THE NEW ModIface ------------ + final_iface <- _scc_ "MkFinalIface" + mkFinalIface ghci_mode dflags location + maybe_checked_iface new_iface tidy_details + + return ( Nothing, Nothing, + Just (bcos,itbl_env), final_iface ) + + else do + ----------------- Convert to STG ------------------ + (stg_binds, cost_centre_info, stg_back_end_info) + <- _scc_ "CoreToStg" + myCoreToStg dflags this_mod binds + + -- Fill in the code-gen info for the earlier tidyCorePgm + writeIORef cg_info_ref (Just stg_back_end_info) + + ------------------ BUILD THE NEW ModIface ------------ + final_iface <- _scc_ "MkFinalIface" + mkFinalIface ghci_mode dflags location + maybe_checked_iface new_iface tidy_details + + ------------------ Code generation ------------------ + abstractC <- _scc_ "CodeGen" + codeGen dflags this_mod imported_modules + cost_centre_info fe_binders + local_tycons stg_binds + + ------------------ Code output ----------------------- + (maybe_stub_h_name, maybe_stub_c_name) + <- codeOutput dflags this_mod local_tycons + binds stg_binds + c_code h_code abstractC + + return ( maybe_stub_h_name, maybe_stub_c_name, + Nothing, final_iface ) + + ; let final_details = tidy_details {md_binds = []} -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 + -- and the answer is ... + ; return (HscRecomp pcs_simpl + final_details + final_iface + maybe_stub_h_filename maybe_stub_c_filename + maybe_bcos) + }}}}}}} myParseModule dflags src_filename = do -------------------------- Parser ---------------- @@ -289,6 +372,7 @@ myParseModule dflags src_filename 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 { @@ -299,154 +383,159 @@ myParseModule dflags src_filename (ppSourceStats False rdr_module) ; return (Just rdr_module) + -- ToDo: free the string buffer later. }} -simplThenTidy dflags pcs hst this_mod is_exported binds rules - = do -- Do main Core-language transformations --------- - -- _scc_ "Core2Core" - (simplified, orphan_rules) - <- core2core dflags pcs hst is_exported binds rules - - -- Do saturation and convert to A-normal form - -- NOTE: subsequent passes may not transform the syntax, only annotate it - saturated <- coreSatPgm dflags simplified - - -- Do the final tidy-up - (pcs', tidy_binds, tidy_orphan_rules) - <- tidyCorePgm dflags this_mod pcs saturated 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 (bcos,itbl_env) - <- byteCodeGen dflags tidy_binds local_tycons local_classes - return (Nothing, Nothing, Just (bcos,itbl_env)) - - | 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 stg_binds - - -------------------------- Code output ------------------------------- - (maybe_stub_h_name, maybe_stub_c_name) - <- 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 +myCoreToStg dflags this_mod tidy_binds = 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 - --let bcos = byteCodeGen dflags tidy_binds local_tycons local_classes - - - stg_binds <- _scc_ "Core2Stg" coreToStg dflags this_mod tidy_binds + stg_binds <- _scc_ "Core2Stg" coreToStg dflags tidy_binds (stg_binds2, cost_centre_info) <- _scc_ "Core2Stg" stg2stg dflags this_mod stg_binds - return (stg_binds2, cost_centre_info) + let env_rhs :: CgInfoEnv + env_rhs = mkNameEnv [ (idName bndr, CgInfo (stgRhsArity rhs) caf_info) + | (bind,_) <- stg_binds2, + let caf_info + | stgBindHasCafRefs bind = MayHaveCafRefs + | otherwise = NoCafRefs, + (bndr,rhs) <- stgBindPairs bind ] + + return (stg_binds2, cost_centre_info, env_rhs) where - local_tycons = typeEnvTyCons env_tc - local_classes = typeEnvClasses env_tc + stgBindPairs (StgNonRec _ b r) = [(b,r)] + stgBindPairs (StgRec _ prs) = prs \end{code} %************************************************************************ %* * -\subsection{Compiling an expression} +\subsection{Compiling a do-statement} %* * %************************************************************************ \begin{code} #ifdef GHCI -hscExpr +hscStmt :: DynFlags - -> Bool -- True <=> wrap in 'print' to get a result of IO type -> HomeSymbolTable -> HomeIfaceTable -> PersistentCompilerState -- IN: persistent compiler state - -> Module -- Context for compiling - -> String -- The expression + -> InteractiveContext -- Context for compiling + -> String -- The statement + -> Bool -- just treat it as an expression -> IO ( PersistentCompilerState, - Maybe (UnlinkedBCOExpr, PrintUnqualified, Type) ) + 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. -hscExpr dflags wrap_io hst hit pcs0 this_module expr - = do { - maybe_parsed <- hscParseExpr dflags expr; - case maybe_parsed of +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_expr -> do { + 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, maybe_renamed_expr) <- - renameExpr dflags hit hst pcs0 this_module parsed_expr; - case maybe_renamed_expr of - Nothing -> return ({-WAS:pcs1-} pcs0, 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 wrap_io pcs1 hst print_unqual this_module rn_expr; - case maybe_tc_return of { - Nothing -> return ({-WAS:pcs1-} pcs0, Nothing); - Just (pcs2, tc_expr, ty) -> do + 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 this_module - print_unqual tc_expr; + ds_expr <- deSugarExpr dflags pcs2 hst iNTERACTIVE print_unqual tc_expr -- Simplify it - simpl_expr <- simplifyExpr dflags pcs2 hst ds_expr; + ; simpl_expr <- simplifyExpr dflags pcs2 hst ds_expr - -- Saturate it - sat_expr <- coreSatExpr dflags simpl_expr; + -- Tidy it (temporary, until coreSat does cloning) + ; tidy_expr <- tidyCoreExpr simpl_expr - -- ToDo: need to do SRTs? + -- Prepare for codegen + ; prepd_expr <- corePrepExpr dflags tidy_expr -- Convert to BCOs - bcos <- coreExprToBCOs dflags sat_expr + ; bcos <- coreExprToBCOs dflags prepd_expr - return (pcs2, Just (bcos, print_unqual, ty)); - }}}} + ; 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 = setGlobalIdDetails id VanillaGlobal -hscParseExpr :: DynFlags -> String -> IO (Maybe RdrNameHsExpr) -hscParseExpr dflags str + ; 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 @@ -454,23 +543,26 @@ hscParseExpr dflags str buf <- stringToStringBuffer str let glaexts | dopt Opt_GlasgowExts dflags = 1# - | otherwise = 0# + | otherwise = 0# - case parseExpr buf PState{ bol = 0#, atbol = 1#, + case parseStmt buf PState{ bol = 0#, atbol = 1#, context = [], glasgow_exts = glaexts, loc = mkSrcLoc SLIT("") 0 } of { PFailed err -> do { hPutStrLn stderr (showSDoc err); - freeStringBuffer buf; +-- Not yet implemented in <4.11 freeStringBuffer buf; return Nothing }; - POk _ 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}