#ifdef GHCI
import RdrHsSyn ( RdrNameHsExpr )
+import Rename ( renameExpr )
import StringBuffer ( stringToStringBuffer, freeStringBuffer )
import Unique ( Uniquable(..) )
-import Type ( splitTyConApp_maybe )
+import Type ( Type, splitTyConApp_maybe )
import PrelNames ( ioTyConKey )
import ByteCodeGen ( byteCodeGen )
#endif
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 MkIface ( completeIface, mkModDetailsFromIface, mkModDetails,
writeIface, pprIface )
import TcModule
-import Type
import InstEnv ( emptyInstEnv )
import Desugar
import SimplCore
import CoreUtils ( coreBindsSize )
import CoreTidy ( tidyCorePgm )
import CoreSat
-import CoreToStg ( coreToStg, coreExprToStg )
-import StgSyn ( collectFinalStgBinders )
+import CoreToStg ( coreToStg )
import SimplStg ( stg2stg )
import CodeGen ( codeGen )
import CodeOutput ( codeOutput )
import HscTypes ( ModDetails, ModIface(..), PersistentCompilerState(..),
PersistentRenamerState(..), ModuleLocation(..),
HomeSymbolTable,
- OrigNameEnv(..), PackageRuleBase, HomeIfaceTable,
+ NameSupply(..), PackageRuleBase, HomeIfaceTable,
typeEnvClasses, typeEnvTyCons, emptyIfaceTable )
import FiniteMap ( FiniteMap, plusFM, emptyFM, addToFM )
import OccName ( OccName )
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
-- RENAME
-------------------
; (pcs_rn, maybe_rn_result)
- <- renameModule dflags hit hst pcs_ch this_mod rdr_module
+ <- _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 {
-------------------
-- TYPECHECK
-------------------
- ; maybe_tc_result <- typecheckModule dflags pcs_rn hst new_iface
+ ; 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);
; 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 (pcs_simpl, 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, 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 is_exported ds_binds ds_rules
+
-------------------
-- 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
+ ; 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)
+ ; (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 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)
+ 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);
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) ;
}}
-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 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)
- <- 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
- let final_ids = collectFinalStgBinders (map fst stg_binds2)
+ (stg_binds2, cost_centre_info)
+ <- _scc_ "Core2Stg" stg2stg dflags this_mod stg_binds
- return (stg_binds2, cost_centre_info, final_ids)
+ return (stg_binds2, cost_centre_info)
+ where
+ local_tycons = typeEnvTyCons env_tc
+ local_classes = typeEnvClasses env_tc
\end{code}
%************************************************************************
\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
-
+#ifdef GHCI
hscExpr
:: DynFlags
-> HomeSymbolTable
-> PersistentCompilerState -- IN: persistent compiler state
-> Module -- Context for compiling
-> String -- The expression
+ -> Bool -- Should we wrap print if not IO-typed?
-> IO ( PersistentCompilerState,
- Maybe (UnlinkedIExpr, PrintUnqualified, Type) )
+ Maybe (UnlinkedBCOExpr, PrintUnqualified, Type) )
-hscExpr dflags hst hit pcs0 this_module expr
+hscExpr dflags hst hit pcs0 this_module expr wrap_print
= do {
maybe_parsed <- hscParseExpr dflags expr;
case maybe_parsed of
(pcs1, maybe_renamed_expr) <-
renameExpr dflags hit hst pcs0 this_module parsed_expr;
case maybe_renamed_expr of
- Nothing -> return (pcs1, Nothing)
+ Nothing -> return ({-WAS:pcs1-} pcs0, 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);
+ Nothing -> return ({-WAS:pcs1-} pcs0, Nothing);
Just (pcs2, tc_expr, ty) -> do
-- if it isn't an IO-typed expression,
Nothing -> False }
};
- if (not is_IO_type)
+ if (wrap_print && not is_IO_type)
then do (new_pcs, maybe_stuff)
- <- hscExpr dflags hst hit pcs2 this_module
- ("print (" ++ expr ++ ")")
+ <- hscExpr dflags hst hit pcs2 this_module
+ ("PrelIO.print (" ++ expr ++ ")") False
case maybe_stuff of
Nothing -> return (new_pcs, maybe_stuff)
- Just (expr, _, _) ->
- return (new_pcs, Just (expr, print_unqual, ty))
+ Just (bcos, _, _) ->
+ return (new_pcs, Just (bcos, print_unqual, ty))
else do
-- Desugar it
-- 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;
+ -- Convert to BCOs
+ bcos <- coreExprToBCOs dflags sat_expr
- return (pcs2, Just (unlinked_iexpr, print_unqual, ty));
+ return (pcs2, Just (bcos, print_unqual, ty));
}}}}
hscParseExpr :: DynFlags -> String -> IO (Maybe RdrNameHsExpr)
hscParseExpr 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 parseExpr 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);
+ freeStringBuffer buf;
return Nothing };
- POk _ (PExpr rdr_expr) -> do {
+ POk _ rdr_expr -> do {
--ToDo: can't free the string buffer until we've finished this
-- compilation sweep and all the identifiers have gone away.
)
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
}
)
projects / ghc-hetmet.git / blobdiff