\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 Unique ( Uniquable(..) )
-import Type ( Type, splitTyConApp_maybe )
-import PrelNames ( ioTyConKey )
+import RdrHsSyn ( RdrNameStmt )
+import Rename ( renameStmt )
import ByteCodeGen ( byteCodeGen )
+import Id ( Id, idName )
+import IdInfo ( GlobalIdDetails(VanillaGlobal) )
+import HscTypes ( InteractiveContext(..), TyThing(..) )
#endif
import HsSyn
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, iNTERACTIVE )
+import MkIface ( completeIface, writeIface, pprIface )
+import Type ( Type )
import TcModule
import InstEnv ( emptyInstEnv )
import Desugar
import CoreUtils ( coreBindsSize )
import CoreTidy ( tidyCorePgm )
import CoreSat
+import CoreTidy ( tidyCoreExpr )
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 Util ( unJust )
PersistentRenamerState(..), ModuleLocation(..),
HomeSymbolTable,
NameSupply(..), PackageRuleBase, HomeIfaceTable,
- typeEnvClasses, typeEnvTyCons, emptyIfaceTable )
+ typeEnvClasses, typeEnvTyCons, emptyIfaceTable
+ )
import FiniteMap ( FiniteMap, plusFM, emptyFM, addToFM )
import OccName ( OccName )
-import Name ( Name, nameModule, nameOccName, getName, isGlobalName,
- emptyNameEnv )
+import Name ( Name, nameModule, nameOccName, getName, isGlobalName )
+import NameEnv ( emptyNameEnv )
import Module ( Module, lookupModuleEnvByName )
import Monad ( when )
| 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
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 {
- hPutStrLn stderr "compilation IS NOT required";
+ 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
- False{-don't check for Main.main-};
+ 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 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) $
- hPutStrLn stderr "compilation IS required";
+ hPutStrLn stderr ("Compiling " ++ compMsg mod location);
-- what target are we shooting for?
; let toInterp = dopt_HscLang dflags == HscInterpreted
-------------------
-- 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_ch{-was: pcs_rn-});
- Just (print_unqualified, (is_exported, new_iface, rn_hs_decls)) -> do {
+ 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
; maybe_tc_result
<- _scc_ "TypeCheck" typecheckModule dflags pcs_rn hst new_iface
print_unqualified rn_hs_decls
- True{-check for Main.main if necessary-}
; case maybe_tc_result of {
Nothing -> return (HscFail pcs_ch{-was: pcs_rn-});
Just (pcs_tc, tc_result) -> do {
- ; let env_tc = tc_env tc_result
+ ; let env_tc = tc_env tc_result
+ insts_tc = tc_insts tc_result
-------------------
-- DESUGAR
deSugar dflags pcs_tc hst this_mod print_unqualified tc_result
-------------------
- -- SIMPLIFY, TIDY-CORE
+ -- SIMPLIFY
+ -------------------
+ ; (simplified, orphan_rules)
+ <- _scc_ "Core2Core"
+ core2core dflags pcs_tc hst dont_discard ds_binds ds_rules
+
-------------------
- -- We grab the the unfoldings at this point.
- ; (pcs_simpl, tidy_binds, orphan_rules)
- <- simplThenTidy dflags pcs_tc hst this_mod dont_discard ds_binds ds_rules
-
+ -- TIDY
+ -------------------
+ ; (pcs_simpl, tidy_binds, new_details)
+ <- tidyCorePgm dflags this_mod pcs_tc env_tc insts_tc
+ simplified orphan_rules
+
-------------------
-- BUILD THE NEW ModDetails AND ModIface
-------------------
- ; 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
+ maybe_checked_iface new_iface new_details
-------------------
-- CONVERT TO STG and COMPLETE CODE GENERATION
-------------------
+ -- Do saturation and convert to A-normal form
+ ; saturated <- coreSatPgm dflags tidy_binds
+
; (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
+ foreign_stuff env_tc saturated
hit (pcs_PIT pcs_simpl)
-- and the answer is ...
}}
-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 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
%************************************************************************
%* *
-\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.
+
+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 wrap_io 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 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?
+ -- Saturate it
+ ; sat_expr <- coreSatExpr dflags tidy_expr
-- Convert to BCOs
- bcos <- coreExprToBCOs dflags sat_expr
+ ; bcos <- coreExprToBCOs dflags sat_expr
+
+ ; 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 = setIdGlobalDetails id VanillaGlobal
- return (pcs2, Just (bcos, print_unqual, ty));
- }}}}
+ ; return (pcs2, Just (global_bound_ids, ty, bcos))
-hscParseExpr :: DynFlags -> String -> IO (Maybe RdrNameHsExpr)
-hscParseExpr dflags str
+ }}}}}
+
+hscParseStmt :: DynFlags -> String -> IO (Maybe RdrNameStmt)
+hscParseStmt dflags str
= do -------------------------- Parser ----------------
showPass dflags "Parser"
_scc_ "Parser" do
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("<no file>") 0 } of {
PFailed err -> do { hPutStrLn stderr (showSDoc err);
--- Not yet implemented in <4.11 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}
projects / ghc-hetmet.git / blobdiff