X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=a9b0223c23d11c52cd633fc732ba8b88d6bd6fed;hb=83eef621e4a4fbb6c1343304ec638cafd6c9dc09;hp=4d8a9e88522ec52af4a4cd4655d87796d071cfc8;hpb=d893f3809b61eca1b7a45f3eb63d39b25f757c40;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index 4d8a9e8..a9b0223 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -4,37 +4,40 @@ \section[GHC_Main]{Main driver for Glasgow Haskell compiler} \begin{code} -module HscMain ( hscMain ) where +module HscMain ( HscResult(..), hscMain, +#ifdef GHCI + hscExpr, hscTypeExpr, +#endif + initPersistentCompilerState ) where #include "HsVersions.h" -import Maybe ( isJust ) -import Monad ( when ) -import IO ( hPutStr, hPutStrLn, hClose, stderr, - openFile, IOMode(..) ) +#ifdef GHCI +import RdrHsSyn ( RdrNameHsExpr ) +import CoreToStg ( coreToStgExpr ) +import StringBuffer ( stringToStringBuffer, freeStringBuffer ) +import Unique ( Uniquable(..) ) +import Type ( splitTyConApp_maybe ) +import PrelNames ( ioTyConKey ) +#endif + import HsSyn -import RdrHsSyn ( RdrNameHsModule ) -import FastString ( unpackFS ) import StringBuffer ( hGetStringBuffer ) -import Parser ( parse ) +import Parser import Lex ( PState(..), ParseResult(..) ) import SrcLoc ( mkSrcLoc ) - -import Rename ( renameModule, checkOldIface, closeIfaceDecls ) - +import Rename import Rules ( emptyRuleBase ) -import PrelInfo ( wiredInThings ) +import PrelInfo ( wiredInThingEnv, wiredInThings ) import PrelNames ( knownKeyNames ) -import PrelRules ( builtinRules ) import MkIface ( completeIface, mkModDetailsFromIface, mkModDetails, - writeIface ) -import TcModule ( TcResults(..), typecheckModule ) -import TcEnv ( tcEnvTyCons, tcEnvClasses ) + writeIface, pprIface ) +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 ) @@ -43,38 +46,31 @@ import SimplStg ( stg2stg ) import CodeGen ( codeGen ) import CodeOutput ( codeOutput ) -import Module ( ModuleName, moduleNameUserString, - moduleUserString, moduleName, emptyModuleEnv, - extendModuleEnv ) +import Module ( ModuleName, moduleName, mkHomeModule ) import CmdLineOpts -import ErrUtils ( ghcExit, doIfSet, dumpIfSet_dyn ) +import ErrUtils ( dumpIfSet_dyn, showPass ) +import Util ( unJust ) import UniqSupply ( mkSplitUniqSupply ) import Bag ( emptyBag ) import Outputable -import Char ( isSpace ) -import StgInterp ( stgToInterpSyn ) +import Interpreter +import CmStaticInfo ( GhciMode(..) ) import HscStats ( ppSourceStats ) import HscTypes ( ModDetails, ModIface(..), PersistentCompilerState(..), - PersistentRenamerState(..), WhatsImported(..), - HomeSymbolTable, PackageSymbolTable, ImportVersion, - GenAvailInfo(..), RdrAvailInfo, OrigNameEnv(..), - PackageRuleBase, HomeIfaceTable, PackageIfaceTable, - extendTypeEnv, groupTyThings, TypeEnv, TyThing, - typeEnvClasses, typeEnvTyCons ) -import RnMonad ( ExportItem, ParsedIface(..) ) -import CmSummarise ( ModSummary(..), name_of_summary, ms_get_imports, - mimp_name ) -import Finder ( Finder ) -import InterpSyn ( UnlinkedIBind ) -import StgInterp ( ItblEnv ) + PersistentRenamerState(..), ModuleLocation(..), + HomeSymbolTable, + OrigNameEnv(..), PackageRuleBase, HomeIfaceTable, + typeEnvClasses, typeEnvTyCons, emptyIfaceTable ) import FiniteMap ( FiniteMap, plusFM, emptyFM, addToFM ) -import OccName ( OccName, pprOccName ) -import Name ( Name, nameModule, emptyNameEnv, nameOccName, - getName, extendNameEnv_C, nameEnvElts ) -import VarEnv ( emptyVarEnv ) -import Module ( Module, mkModuleName, lookupModuleEnvByName ) +import OccName ( OccName ) +import Name ( Name, nameModule, nameOccName, getName ) +import Name ( emptyNameEnv ) +import Module ( Module, lookupModuleEnvByName ) +import Monad ( when ) +import Maybe ( isJust ) +import IO ( hPutStrLn, stderr ) \end{code} @@ -86,37 +82,47 @@ import Module ( Module, mkModuleName, 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 /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 - -> Finder - -> ModSummary -- summary, including source filename - -> Maybe ModIface -- old interface, if available + :: GhciMode + -> DynFlags + -> Bool -- source unchanged? + -> ModuleLocation -- location info + -> Maybe ModIface -- old interface, if available -> HomeSymbolTable -- for home module ModDetails -> HomeIfaceTable - -> PackageIfaceTable -> PersistentCompilerState -- IN: persistent compiler state -> IO HscResult -hscMain dflags finder summary maybe_old_iface hst hit pit pcs +hscMain ghci_mode dflags source_unchanged location maybe_old_iface hst hit pcs = do { - -- ????? source_unchanged :: Bool -- extracted from summary? - let source_unchanged = trace "WARNING: source_unchanged?!" False - ; - (pcs_ch, check_errs, (recomp_reqd, maybe_checked_iface)) - <- checkOldIface dflags finder hit hst pcs (ms_mod summary) - 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 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 { @@ -124,131 +130,147 @@ hscMain dflags finder summary maybe_old_iface hst hit pit pcs what_next | recomp_reqd || no_old_iface = hscRecomp | otherwise = hscNoRecomp ; - what_next dflags finder summary maybe_checked_iface - hst hit pit pcs_ch + what_next ghci_mode dflags location maybe_checked_iface + hst hit pcs_ch }} -hscNoRecomp dflags finder summary maybe_checked_iface hst hit pit 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 + = let bomb = panic "hscNoRecomp:OneShot" + in return (HscNoRecomp pcs_ch bomb bomb) + | otherwise = 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" - ; + hPutStrLn stderr "compilation IS NOT required"; + -- CLOSURE (pcs_cl, closure_errs, cl_hs_decls) - <- closeIfaceDecls dflags finder hit hst pcs_ch old_iface ; + <- closeIfaceDecls dflags hit hst pcs_ch old_iface ; if closure_errs then return (HscFail pcs_cl) else do { -- TYPECHECK - maybe_tc_result - <- typecheckModule dflags (ms_mod summary) pcs_cl hst hit cl_hs_decls; + 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 - binds_tc = tc_binds tc_result - local_insts = tc_insts tc_result - local_rules = tc_rules 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 finder summary maybe_checked_iface hst hit pit pcs_ch - = do { - -- what target are we shooting for? - let toInterp = dopt_HscLang dflags == HscInterpreted - this_mod = ms_mod summary - ; - -- PARSE - maybe_parsed <- myParseModule dflags summary; - case maybe_parsed of { - Nothing -> return (HscFail pcs_ch); - Just rdr_module -> do { - - -- RENAME - show_pass dflags "Renamer"; - (pcs_rn, maybe_rn_result) - <- renameModule dflags finder 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 -> return (HscFail pcs_rn); - Just tc_result -> do { - - let pcs_tc = tc_pcs tc_result - env_tc = tc_env tc_result - binds_tc = tc_binds 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 - ; - -- SimonM does this, higher up - -- -- Write the interface file - -- writeIface finder maybe_final_iface - -- ; - -- do the rest of code generation/emission - (maybe_stub_h_filename, maybe_stub_c_filename, maybe_ibinds) - <- restOfCodeGeneration dflags toInterp summary - 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) - }}}}}}} - - -myParseModule dflags summary +hscRecomp ghci_mode dflags location maybe_checked_iface hst hit pcs_ch + = do { + ; when (verbosity dflags >= 1) $ + hPutStrLn stderr "compilation IS required"; + + -- 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, maybe_rn_result) + <- 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 { + + ------------------- + -- TYPECHECK + ------------------- + ; maybe_tc_result <- typecheckModule dflags pcs_rn hst new_iface + print_unqualified rn_hs_decls + ; case maybe_tc_result of { + Nothing -> return (HscFail pcs_rn); + Just (pcs_tc, tc_result) -> do { + + ; let env_tc = tc_env tc_result + + ------------------- + -- DESUGAR, SIMPLIFY, TIDY-CORE + ------------------- + -- We grab the the unfoldings at this point. + ; 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, cost_centre_info, top_level_ids) + <- myCoreToStg dflags this_mod tidy_binds + + + ------------------- + -- BUILD THE NEW ModDetails AND ModIface + ------------------- + ; let new_details = mkModDetails env_tc tidy_binds + top_level_ids orphan_rules + ; final_iface <- mkFinalIface ghci_mode dflags location + maybe_checked_iface new_iface new_details + + ------------------- + -- COMPLETE CODE GENERATION + ------------------- + ; (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 tidy_binds + 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_ibinds) + }}}}}}} + + + +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" + showPass dflags "Parser" -- _scc_ "Parser" - let src_filename -- name of the preprocessed source file - = case ms_ppsource summary of - Just (filename, fingerprint) -> filename - Nothing -> pprPanic - "myParseModule:summary is not of a source module" - (ppr summary) - buf <- hGetStringBuffer True{-expand tabs-} src_filename let glaexts | dopt Opt_GlasgowExts dflags = 1# @@ -260,7 +282,8 @@ myParseModule dflags summary 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) ; @@ -271,37 +294,34 @@ myParseModule dflags summary }} -restOfCodeGeneration dflags toInterp summary cost_centre_info - foreign_stuff env_tc stg_binds oa_tidy_binds +restOfCodeGeneration dflags toInterp this_mod imported_module_names cost_centre_info + 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 = do -------------------------- Code generation ------------------------------- - show_pass dflags "CodeGen" -- _scc_ "CodeGen" abstractC <- 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 - this_mod = ms_mod summary - imported_modules = map (mod_name_to_Module.mimp_name) - (ms_get_imports summary) + imported_modules = map mod_name_to_Module imported_module_names (fe_binders,h_code,c_code) = foreign_stuff mod_name_to_Module :: ModuleName -> Module @@ -316,57 +336,185 @@ restOfCodeGeneration dflags toInterp summary cost_centre_info (ppr nm) -dsThenSimplThenTidy dflags rule_base this_mod tc_result hst +dsThenSimplThenTidy dflags pcs hst this_mod print_unqual is_exported tc_result = 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 + <- deSugar dflags pcs hst this_mod print_unqual tc_result -------------------------- Main Core-language transformations ---------------- -- _scc_ "Core2Core" - show_pass dflags "Core2Core" (simplified, orphan_rules) - <- core2core dflags rule_base hst desugared rules + <- core2core dflags pcs hst is_exported desugared rules -- Do the final tidy-up - show_pass dflags "CoreTidy" - (tidy_binds, tidy_orphan_rules) - <- tidyCorePgm dflags this_mod simplified orphan_rules + (pcs', tidy_binds, tidy_orphan_rules) + <- tidyCorePgm dflags this_mod pcs simplified 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 - show_pass dflags "Core2Stg" -- _scc_ "Core2Stg" - let stg_binds = topCoreBindsToStg c2s_uniqs occ_anal_tidy_binds + stg_binds <- topCoreBindsToStg dflags this_mod tidy_binds - show_pass 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} -show_pass dflags what - = if dopt Opt_D_show_passes dflags - then hPutStr stderr ("*** "++what++":\n") - else return () -\end{code} +%************************************************************************ +%* * +\subsection{Compiling an expression} +%* * +%************************************************************************ + +\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 + -> 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 + + -- Desugar it + ds_expr <- deSugarExpr dflags pcs1 hst this_module + print_unqual tc_expr; + + -- Simplify it + simpl_expr <- simplifyExpr dflags pcs1 hst ds_expr; + + -- Convert to STG + stg_expr <- coreToStgExpr dflags simpl_expr; + + -- ToDo: need to do StgVarInfo? or SRTs? + + -- Convert to InterpSyn + unlinked_iexpr <- stgExprToInterpSyn dflags stg_expr; + + return (pcs1, Just unlinked_iexpr); + }}} + +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 + Nothing -> return (pcs0, Nothing) + Just parsed_expr -> 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 { + + -- 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 + = 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} %************************************************************************ %* * @@ -379,26 +527,22 @@ initPersistentCompilerState :: IO PersistentCompilerState initPersistentCompilerState = do prs <- initPersistentRenamerState return ( - PCS { pcs_PST = initPackageDetails, + PCS { pcs_PIT = emptyIfaceTable, + 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' return ( PRS { prsOrig = Orig { origNames = initOrigNames, origIParam = emptyFM }, - prsDecls = emptyNameEnv, - prsInsts = emptyBag, - prsRules = emptyBag, + prsDecls = (emptyNameEnv, 0), + prsInsts = (emptyBag, 0), + prsRules = (emptyBag, 0), prsNS = ns } )