\begin{code}
module HscMain ( HscResult(..), hscMain,
#ifdef GHCI
- hscExpr,
+ hscStmt,
#endif
initPersistentCompilerState ) where
#include "HsVersions.h"
#ifdef GHCI
-import RdrHsSyn ( RdrNameHsExpr )
-import StringBuffer ( stringToStringBuffer, freeStringBuffer )
-import Unique ( Uniquable(..) )
-import Type ( splitTyConApp_maybe )
-import PrelNames ( ioTyConKey )
+import RdrHsSyn ( RdrNameStmt )
+import Rename ( renameStmt )
import ByteCodeGen ( byteCodeGen )
#endif
import HsSyn
-import StringBuffer ( hGetStringBuffer )
+import StringBuffer ( hGetStringBuffer,
+ stringToStringBuffer, freeStringBuffer )
import Parser
import Lex ( PState(..), ParseResult(..) )
import SrcLoc ( mkSrcLoc )
-import Rename ( checkOldIface, renameModule, renameExpr, closeIfaceDecls )
+import Rename ( checkOldIface, renameModule, closeIfaceDecls )
import Rules ( emptyRuleBase )
import PrelInfo ( wiredInThingEnv, wiredInThings )
-import PrelNames ( knownKeyNames )
+import PrelNames ( vanillaSyntaxMap, knownKeyNames )
import MkIface ( completeIface, mkModDetailsFromIface, mkModDetails,
writeIface, pprIface )
import TcModule
-import Type
import InstEnv ( emptyInstEnv )
import Desugar
import SimplCore
-import CoreSyn ( bindersOfBinds )
import CoreUtils ( coreBindsSize )
import CoreTidy ( tidyCorePgm )
import CoreSat
-import CoreToStg ( coreToStg, coreExprToStg )
+import CoreToStg ( coreToStg )
import SimplStg ( stg2stg )
import CodeGen ( codeGen )
import CodeOutput ( codeOutput )
-import Module ( ModuleName, moduleName, mkHomeModule )
+import Id ( Id, idName, idFlavour, modifyIdInfo )
+import IdInfo ( setFlavourInfo, makeConstantFlavour )
+import Module ( ModuleName, moduleName, mkHomeModule,
+ moduleUserString )
import CmdLineOpts
import ErrUtils ( dumpIfSet_dyn, showPass )
import Util ( unJust )
import HscStats ( ppSourceStats )
import HscTypes ( ModDetails, ModIface(..), PersistentCompilerState(..),
PersistentRenamerState(..), ModuleLocation(..),
- HomeSymbolTable,
- OrigNameEnv(..), PackageRuleBase, HomeIfaceTable,
- typeEnvClasses, typeEnvTyCons, emptyIfaceTable )
+ HomeSymbolTable, InteractiveContext(..), TyThing(..),
+ NameSupply(..), PackageRuleBase, HomeIfaceTable,
+ typeEnvClasses, typeEnvTyCons, emptyIfaceTable,
+ extendLocalRdrEnv
+ )
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, extendNameEnvList
+ )
import Module ( Module, lookupModuleEnvByName )
import Monad ( when )
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
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)
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
= do {
hPutStrLn stderr "compilation IS NOT required";
}
| otherwise
= do {
- hPutStr stderr "compilation IS NOT required";
- when (verbosity dflags /= 1) $ hPutStrLn stderr "";
+ when (verbosity dflags >= 1) $
+ hPutStrLn stderr ("Skipping " ++ compMsg mod location);
-- CLOSURE
(pcs_cl, closure_errs, cl_hs_decls)
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_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 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) $
- hPutStr stderr "compilation IS required";
- -- mode -v1 tries to keep everything on one line
- when (verbosity dflags > 1) $
- hPutStrLn stderr "";
+ hPutStrLn stderr ("Compiling " ++ compMsg mod location);
-- what target are we shooting for?
; let toInterp = dopt_HscLang dflags == HscInterpreted
-------------------
-- 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
-------------------
- -- DESUGAR, SIMPLIFY, TIDY-CORE
+ -- DESUGAR
+ -------------------
+ ; (ds_binds, ds_rules, foreign_stuff)
+ <- _scc_ "DeSugar"
+ 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, foreign_stuff)
- <- dsThenSimplThenTidy dflags pcs_tc hst this_mod
- print_unqualified is_exported tc_result
+ ; (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 tidy_binds 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
-------------------
- -- CONVERT TO STG
+ -- CONVERT TO STG and COMPLETE CODE GENERATION
-------------------
- ; (stg_binds, cost_centre_info)
- <- myCoreToStg dflags this_mod tidy_binds
-
+ -- Do saturation and convert to A-normal form
+ ; saturated <- coreSatPgm dflags tidy_binds
- -------------------
- -- COMPLETE CODE GENERATION
- -------------------
- ; (maybe_stub_h_filename, maybe_stub_c_filename, maybe_ibinds)
+ ; (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 tidy_binds
+ foreign_stuff env_tc saturated
hit (pcs_PIT pcs_simpl)
-- and the answer is ...
; return (HscRecomp pcs_simpl new_details final_iface
maybe_stub_h_filename maybe_stub_c_filename
- maybe_ibinds)
+ maybe_bcos)
}}}}}}}
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#
- 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) ;
(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 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
tidy_binds stg_binds
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
(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 saturation and convert to A-normal form
- -- NOTE: future passes cannot 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, (fe_binders,h_code,c_code))
-
-
-myCoreToStg dflags this_mod tidy_binds
+myCoreToStg dflags this_mod tidy_binds env_tc
= 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 tidy_binds
- --putStrLn (showSDoc (vcat (map ppr bcos)))
+ --let bcos = byteCodeGen dflags tidy_binds local_tycons local_classes
- -- _scc_ "Core2Stg"
- stg_binds <- coreToStg dflags this_mod tidy_binds
+
+ stg_binds <- _scc_ "Core2Stg" coreToStg dflags this_mod tidy_binds
- -- _scc_ "Stg2Stg"
- (stg_binds2, cost_centre_info) <- stg2stg dflags this_mod stg_binds
+ (stg_binds2, cost_centre_info)
+ <- _scc_ "Core2Stg" stg2stg dflags this_mod stg_binds
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
+ -> InteractiveContext -- Context for compiling
+ -> String -- The statement
-> IO ( PersistentCompilerState,
- Maybe (UnlinkedIExpr, PrintUnqualified, Type) )
+ Maybe (InteractiveContext,
+ [Id],
+ UnlinkedBCOExpr) )
+\end{code}
+
+When the UnlinkedBCOExpr is linked you get an HValue of type
+ IO [HValue]
+When you run it you get a list of HValues that should be
+the same length as the list of names; add them to the ClosureEnv.
+
+A naked expression returns a singleton Name [it].
+
+ What you type The IO [HValue] that hscStmt returns
+ ------------- ------------------------------------
+ let pat = expr ==> let pat = expr in return [coerce HVal x, coerce HVal y, ...]
+ bindings: [x,y,...]
+
+ pat <- expr ==> expr >>= \ pat -> return [coerce HVal x, coerce HVal y, ...]
+ bindings: [x,y,...]
-hscExpr dflags hst hit pcs0 this_module expr
- = do {
- maybe_parsed <- hscParseExpr dflags expr;
- case maybe_parsed of
+ 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
+ = let
+ InteractiveContext {
+ ic_rn_env = rn_env,
+ ic_type_env = type_env,
+ ic_module = this_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 this_mod 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) -> 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 (expr, _, _) ->
- return (new_pcs, Just (expr, print_unqual, ty))
- else do
+ maybe_tc_return <- typecheckStmt dflags pcs1 hst type_env
+ print_unqual this_mod 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 this_module
- print_unqual tc_expr;
+ ds_expr <- deSugarExpr dflags pcs2 hst this_mod 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;
-
- -- Convert to STG
- let stg_expr = coreExprToStg sat_expr;
-
- -- ToDo: need to do SRTs?
-
- -- Convert to InterpSyn
- unlinked_iexpr <- stgExprToInterpSyn dflags stg_expr;
-
- return (pcs2, Just (unlinked_iexpr, print_unqual, ty));
- }}}}
-
-hscParseExpr :: DynFlags -> String -> IO (Maybe RdrNameHsExpr)
-hscParseExpr dflags str
+ ; sat_expr <- coreSatExpr dflags simpl_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
+
+ new_rn_env = extendLocalRdrEnv rn_env
+ (map idName constant_bound_ids)
+ -- Extend the renamer-env from bound_ids, not bound_names,
+ -- because the latter may contain [it] when the former is empty
+
+ new_type_env = extendNameEnvList type_env
+ [(getName id, AnId id) | id <- constant_bound_ids]
+
+ new_icontext = icontext { ic_rn_env = new_rn_env,
+ ic_type_env = new_type_env }
+ ; return (pcs2, Just (new_icontext, 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("<no file>") 0 } of {
+ case parseStmt buf PState{ bol = 0#, atbol = 1#,
+ context = [], glasgow_exts = glaexts,
+ loc = mkSrcLoc SLIT("<no file>") 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}
)
initPersistentRenamerState :: IO PersistentRenamerState
- = do ns <- mkSplitUniqSupply 'r'
+ = do us <- mkSplitUniqSupply 'r'
return (
- PRS { prsOrig = Orig { origNS = ns,
- origNames = initOrigNames,
- origIParam = emptyFM },
- prsDecls = (emptyNameEnv, 0),
- prsInsts = (emptyBag, 0),
- prsRules = (emptyBag, 0)
+ PRS { prsOrig = NameSupply { nsUniqs = us,
+ nsNames = initOrigNames,
+ nsIPs = emptyFM },
+ prsDecls = (emptyNameEnv, 0),
+ prsInsts = (emptyBag, 0),
+ prsRules = (emptyBag, 0),
+ prsImpMods = emptyFM
}
)
projects / ghc-hetmet.git / blobdiff