X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=6b961227877f8400d19637ec066bc1388f800b49;hb=943fd134e2c2f2d59c36cdc88799301c4a18575c;hp=7612f78f4c9a63653353a2edaad412b8a5f43907;hpb=156d91339295539a2b3461efc1ac8c83f29d83f0;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index 7612f78..6b96122 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -5,61 +5,72 @@ \begin{code} module HscMain ( HscResult(..), hscMain, +#ifdef GHCI + hscExpr, +#endif initPersistentCompilerState ) where #include "HsVersions.h" -import Maybe ( isJust ) -import IO ( hPutStr, hPutStrLn, stderr ) +#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 ) +#endif + import HsSyn import StringBuffer ( hGetStringBuffer ) -import Parser ( parse ) +import Parser import Lex ( PState(..), ParseResult(..) ) import SrcLoc ( mkSrcLoc ) - -import Rename ( renameModule, checkOldIface, closeIfaceDecls ) +import Rename ( checkOldIface, renameModule, closeIfaceDecls ) import Rules ( emptyRuleBase ) import PrelInfo ( wiredInThingEnv, wiredInThings ) import PrelNames ( knownKeyNames ) -import PrelRules ( builtinRules ) import MkIface ( completeIface, mkModDetailsFromIface, mkModDetails, - writeIface ) -import TcModule ( TcResults(..), typecheckModule ) + writeIface, pprIface ) +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 CoreToStg ( coreToStg ) import SimplStg ( stg2stg ) import CodeGen ( codeGen ) import CodeOutput ( codeOutput ) -import Module ( ModuleName, moduleName, mkModuleInThisPackage ) +import Module ( ModuleName, moduleName, mkHomeModule ) import CmdLineOpts -import ErrUtils ( dumpIfSet_dyn ) +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, - OrigNameEnv(..), PackageRuleBase, HomeIfaceTable, + NameSupply(..), PackageRuleBase, HomeIfaceTable, typeEnvClasses, typeEnvTyCons, emptyIfaceTable ) -import InterpSyn ( UnlinkedIBind ) -import StgInterp ( ItblEnv ) import FiniteMap ( FiniteMap, plusFM, emptyFM, addToFM ) import OccName ( OccName ) -import Name ( Name, nameModule, emptyNameEnv, nameOccName, getName ) +import Name ( Name, nameModule, nameOccName, getName ) +import Name ( emptyNameEnv ) import Module ( Module, lookupModuleEnvByName ) +import Monad ( when ) +import Maybe ( isJust ) +import IO \end{code} @@ -71,19 +82,27 @@ 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 /tmp) + (Maybe String) -- generated stub_c filename (in /tmp) + (Maybe ([UnlinkedBCO],ItblEnv)) -- interpreted code, if any + + -- no errors or warnings; the individual passes -- (parse/rename/typecheck) print messages themselves hscMain - :: DynFlags + :: GhciMode + -> DynFlags -> Bool -- source unchanged? -> ModuleLocation -- location info -> Maybe ModIface -- old interface, if available @@ -92,14 +111,18 @@ hscMain -> PersistentCompilerState -- IN: persistent compiler state -> IO HscResult -hscMain dflags source_unchanged location maybe_old_iface hst hit pcs +hscMain ghci_mode dflags source_unchanged location maybe_old_iface hst hit pcs = do { - putStrLn ( "hscMain: location =\n" ++ show location); - putStrLn "checking old iface ..."; - (pcs_ch, check_errs, (recomp_reqd, maybe_checked_iface)) - <- checkOldIface dflags hit hst pcs (unJust (ml_hi_file location) "hscMain") - 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 { @@ -107,20 +130,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 location maybe_checked_iface hst hit pcs_ch }} -hscNoRecomp dflags location maybe_checked_iface hst hit pcs_ch +-- we definitely expect to have the old interface available +hscNoRecomp ghci_mode dflags location (Just old_iface) hst hit pcs_ch + | ghci_mode == OneShot = do { - -- we definitely expect to have the old interface available - let old_iface = case maybe_checked_iface of - Just old_if -> old_if - Nothing -> panic "hscNoRecomp:old_iface" - this_mod = mi_module old_iface - ; + hPutStrLn stderr "compilation IS NOT required"; + let { bomb = panic "hscNoRecomp:OneShot" }; + return (HscNoRecomp pcs_ch bomb bomb) + } + | otherwise + = do { + hPutStr stderr "compilation IS NOT required"; + when (verbosity dflags /= 1) $ hPutStrLn stderr ""; + -- CLOSURE (pcs_cl, closure_errs, cl_hs_decls) <- closeIfaceDecls dflags hit hst pcs_ch old_iface ; @@ -129,110 +156,129 @@ 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; + maybe_tc_result <- typecheckModule dflags pcs_cl hst + old_iface alwaysQualify cl_hs_decls; case maybe_tc_result of { Nothing -> return (HscFail pcs_cl); - Just tc_result -> do { + Just (pcs_tc, tc_result) -> do { - let pcs_tc = tc_pcs tc_result - env_tc = tc_env tc_result - local_insts = tc_insts tc_result + let env_tc = tc_env tc_result local_rules = tc_rules tc_result ; -- create a new details from the closed, typechecked, old iface - let new_details = mkModDetailsFromIface env_tc local_insts local_rules + let new_details = mkModDetailsFromIface env_tc local_rules ; - return (HscOK new_details - Nothing -- tells CM to use old iface and linkables - Nothing Nothing -- foreign export stuff - Nothing -- ibinds - pcs_tc) + return (HscNoRecomp pcs_tc new_details old_iface) }}}} -hscRecomp dflags location maybe_checked_iface hst hit pcs_ch - = do { - -- what target are we shooting for? - let toInterp = dopt_HscLang dflags == HscInterpreted - ; --- putStrLn ("toInterp = " ++ show toInterp); - -- PARSE - maybe_parsed - <- myParseModule dflags (unJust (ml_hspp_file location) "hscRecomp:hspp"); - 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 (unJust (ml_hi_file location) "hscRecomp:hi") 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) - }}}}}}} +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 ""; + + -- 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 + ------------------- + ; (ds_binds, ds_rules, foreign_stuff) + <- deSugar dflags pcs_tc hst this_mod print_unqualified tc_result + + ------------------- + -- SIMPLIFY, TIDY-CORE + ------------------- + -- 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 + + ------------------- + -- BUILD THE NEW ModDetails AND ModIface + ------------------- + ; let new_details = mkModDetails env_tc tidy_binds orphan_rules + ; final_iface <- mkFinalIface ghci_mode dflags location + maybe_checked_iface new_iface new_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) + + -- 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" + showPass dflags "Parser" -- _scc_ "Parser" 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, @@ -240,7 +286,8 @@ myParseModule dflags src_filename PFailed err -> do { hPutStrLn stderr (showSDoc err); return Nothing }; - POk _ rdr_module@(HsModule mod_name _ _ _ _ _ _) -> do { + + POk _ (PModule rdr_module@(HsModule mod_name _ _ _ _ _ _)) -> do { dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr rdr_module) ; @@ -251,36 +298,56 @@ myParseModule dflags src_filename }} -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 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 (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" + = do + -------------------------- Convert to STG ------------------------------- + (stg_binds, cost_centre_info) + <- myCoreToStg dflags this_mod tidy_binds env_tc + + -------------------------- Code generation ------------------------------- -- _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 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 @@ -294,57 +361,134 @@ 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" + --let bcos = byteCodeGen dflags tidy_binds local_tycons local_classes + -- _scc_ "Core2Stg" - let stg_binds = topCoreBindsToStg c2s_uniqs occ_anal_tidy_binds + stg_binds <- 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) <- 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 () -\end{code} +%************************************************************************ +%* * +\subsection{Compiling an expression} +%* * +%************************************************************************ +\begin{code} +#ifdef GHCI +hscExpr + :: DynFlags + -> HomeSymbolTable + -> HomeIfaceTable + -> PersistentCompilerState -- IN: persistent compiler state + -> Module -- Context for compiling + -> String -- The expression + -> IO ( PersistentCompilerState, + Maybe (UnlinkedBCOExpr, PrintUnqualified, Type) ) + +hscExpr dflags hst hit pcs0 this_module expr + = do { + maybe_parsed <- hscParseExpr dflags expr; + case maybe_parsed of + Nothing -> return (pcs0, Nothing) + Just parsed_expr -> do { + + -- Rename it + (pcs1, maybe_renamed_expr) <- + renameExpr dflags hit hst pcs0 this_module parsed_expr; + case maybe_renamed_expr of + Nothing -> return (pcs1, Nothing) + Just (print_unqual, rn_expr) -> do { + + -- Typecheck it + maybe_tc_return + <- typecheckExpr dflags pcs1 hst print_unqual this_module rn_expr; + case maybe_tc_return of { + Nothing -> return (pcs1, Nothing); + Just (pcs2, tc_expr, ty) -> do + + -- if it isn't an IO-typed expression, + -- wrap "print" around it & recompile... + let { is_IO_type = case splitTyConApp_maybe ty of { + Just (tycon, _) -> getUnique tycon == ioTyConKey; + Nothing -> False } + }; + + if (not is_IO_type) + then do (new_pcs, maybe_stuff) + <- hscExpr dflags hst hit pcs2 this_module + ("print (" ++ expr ++ ")") + case maybe_stuff of + Nothing -> return (new_pcs, maybe_stuff) + Just (bcos, _, _) -> + return (new_pcs, Just (bcos, print_unqual, ty)) + else do + + -- Desugar it + ds_expr <- deSugarExpr dflags pcs2 hst this_module + print_unqual tc_expr; + + -- Simplify it + simpl_expr <- simplifyExpr dflags pcs2 hst ds_expr; + + -- Saturate it + sat_expr <- coreSatExpr dflags simpl_expr; + + -- ToDo: need to do SRTs? + + -- Convert to BCOs + bcos <- coreExprToBCOs dflags sat_expr + + return (pcs2, Just (bcos, 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} %************************************************************************ %* * @@ -366,14 +510,15 @@ initPersistentCompilerState ) 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 } )