X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=7b3e84b502a2ed39232b466636d629f0c79507e5;hb=d8e8d85db6bf2b1fa0c0219f558507031dd59c26;hp=c1fa0c44f962b1d343cca8cc7e2276602a39d381;hpb=948e7f388748078a8d9a324b284da7c4029f7060;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index c1fa0c4..7b3e84b 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -6,9 +6,12 @@ \begin{code} module HscMain ( - HscResult(..), hscMain, newHscEnv + HscResult(..), + hscMain, newHscEnv, hscCmmFile, + hscBufferCheck, hscFileCheck, #ifdef GHCI - , hscStmt, hscTcExpr, hscThing, + , hscStmt, hscTcExpr, hscKcType + , hscGetInfo, GetInfoResult , compileExpr #endif ) where @@ -16,33 +19,38 @@ module HscMain ( #include "HsVersions.h" #ifdef GHCI -import HsSyn ( Stmt(..) ) -import TcHsSyn ( TypecheckedHsExpr ) -import IfaceSyn ( IfaceDecl ) +import HsSyn ( Stmt(..), LStmt, LHsExpr, LHsType ) +import IfaceSyn ( IfaceDecl, IfaceInst ) +import Module ( Module ) import CodeOutput ( outputForeignStubs ) import ByteCodeGen ( byteCodeGen, coreExprToBCOs ) import Linker ( HValue, linkExpr ) import TidyPgm ( tidyCoreExpr ) import CorePrep ( corePrepExpr ) import Flattening ( flattenExpr ) -import TcRnDriver ( tcRnStmt, tcRnExpr, tcRnThing ) -import RdrHsSyn ( RdrNameStmt ) -import RdrName ( GlobalRdrEnv ) +import TcRnDriver ( tcRnStmt, tcRnExpr, tcRnGetInfo, tcRnType ) +import RdrName ( rdrNameOcc ) +import OccName ( occNameUserString ) import Type ( Type ) import PrelNames ( iNTERACTIVE ) import StringBuffer ( stringToStringBuffer ) -import SrcLoc ( noSrcLoc ) -import Name ( Name ) +import Kind ( Kind ) +import Var ( Id ) import CoreLint ( lintUnfolding ) import DsMeta ( templateHaskellNames ) import BasicTypes ( Fixity ) +import SrcLoc ( SrcLoc, noSrcLoc ) #endif +import RdrName ( RdrName ) +import HsSyn ( HsModule ) +import SrcLoc ( Located(..) ) import StringBuffer ( hGetStringBuffer ) import Parser -import Lexer ( P(..), ParseResult(..), mkPState, showPFailed ) +import Lexer ( P(..), ParseResult(..), mkPState ) import SrcLoc ( mkSrcLoc ) import TcRnDriver ( tcRnModule, tcRnExtCore ) +import TcRnTypes ( TcGblEnv ) import TcIface ( typecheckIface ) import IfaceEnv ( initNameCache ) import LoadIface ( ifaceStats, initExternalPackageState ) @@ -58,11 +66,12 @@ import CoreToStg ( coreToStg ) import Name ( Name, NamedThing(..) ) import SimplStg ( stg2stg ) import CodeGen ( codeGen ) +import CmmParse ( parseCmmFile ) import CodeOutput ( codeOutput ) import CmdLineOpts -import DriverPhases ( isExtCoreFilename ) -import ErrUtils ( dumpIfSet, dumpIfSet_dyn, showPass ) +import DriverPhases ( HscSource(..) ) +import ErrUtils import UniqSupply ( mkSplitUniqSupply ) import Outputable @@ -71,12 +80,13 @@ import HscTypes import MkExternalCore ( emitExternalCore ) import ParserCore import ParserCoreUtils -import Module ( Module, ModLocation(..), showModMsg ) import FastString import Maybes ( expectJust ) +import StringBuffer ( StringBuffer ) +import Bag ( unitBag, emptyBag ) import Monad ( when ) -import Maybe ( isJust, fromJust ) +import Maybe ( isJust ) import IO import DATA_IOREF ( newIORef, readIORef ) \end{code} @@ -120,7 +130,10 @@ knownKeyNames = map getName wiredInThings \begin{code} data HscResult -- Compilation failed - = HscFail + = HscFail + + -- In IDE mode: we just do the static/dynamic checks + | HscChecked (Located (HsModule RdrName)) (Maybe TcGblEnv) -- Concluded that it wasn't necessary | HscNoRecomp ModDetails -- new details (HomeSymbolTable additions) @@ -128,93 +141,183 @@ data HscResult -- Did recompilation | HscRecomp ModDetails -- new details (HomeSymbolTable additions) - (Maybe GlobalRdrEnv) ModIface -- new iface (if any compilation was done) Bool -- stub_h exists Bool -- stub_c exists (Maybe CompiledByteCode) + +-- What to do when we have compiler error or warning messages +type MessageAction = Messages -> IO () + -- no errors or warnings; the individual passes -- (parse/rename/typecheck) print messages themselves hscMain :: HscEnv - -> Module - -> ModLocation -- location info - -> Bool -- True <=> source unchanged - -> Bool -- True <=> have an object file (for msgs only) - -> Maybe ModIface -- old interface, if available + -> MessageAction -- What to do with errors/warnings + -> ModSummary + -> Bool -- True <=> source unchanged + -> Bool -- True <=> have an object file (for msgs only) + -> Maybe ModIface -- Old interface, if available -> IO HscResult -hscMain hsc_env mod location +hscMain hsc_env msg_act mod_summary source_unchanged have_object maybe_old_iface = do { (recomp_reqd, maybe_checked_iface) <- _scc_ "checkOldIface" - checkOldIface hsc_env mod - (ml_hi_file location) + checkOldIface hsc_env mod_summary source_unchanged maybe_old_iface; let no_old_iface = not (isJust maybe_checked_iface) what_next | recomp_reqd || no_old_iface = hscRecomp | otherwise = hscNoRecomp - ; what_next hsc_env have_object - mod location maybe_checked_iface + ; what_next hsc_env msg_act mod_summary have_object + maybe_checked_iface } +------------------------------ -- hscNoRecomp definitely expects to have the old interface available -hscNoRecomp hsc_env have_object - mod location (Just old_iface) - | hsc_mode hsc_env == OneShot +hscNoRecomp hsc_env msg_act mod_summary + have_object (Just old_iface) + | isOneShot (hsc_mode hsc_env) = do { - when (verbosity (hsc_dflags hsc_env) > 0) $ - hPutStrLn stderr "compilation IS NOT required"; + compilationProgressMsg (hsc_dflags hsc_env) $ + "compilation IS NOT required"; dumpIfaceStats hsc_env ; let { bomb = panic "hscNoRecomp:OneShot" }; return (HscNoRecomp bomb bomb) } | otherwise - = do { - when (verbosity (hsc_dflags hsc_env) >= 1) $ - hPutStrLn stderr ("Skipping " ++ - showModMsg have_object mod location); + = do { compilationProgressMsg (hsc_dflags hsc_env) $ + ("Skipping " ++ showModMsg have_object mod_summary) - new_details <- _scc_ "tcRnIface" + ; new_details <- _scc_ "tcRnIface" typecheckIface hsc_env old_iface ; - dumpIfaceStats hsc_env ; + ; dumpIfaceStats hsc_env - return (HscNoRecomp new_details old_iface) - } + ; return (HscNoRecomp new_details old_iface) + } -hscRecomp hsc_env have_object - mod location maybe_checked_iface - = do { - -- what target are we shooting for? - ; let one_shot = hsc_mode hsc_env == OneShot - ; let dflags = hsc_dflags hsc_env - ; let toInterp = dopt_HscLang dflags == HscInterpreted - ; let toCore = isJust (ml_hs_file location) && - isExtCoreFilename (fromJust (ml_hs_file location)) +------------------------------ +hscRecomp hsc_env msg_act mod_summary + have_object maybe_checked_iface + = case ms_hsc_src mod_summary of + HsSrcFile -> do { front_res <- hscFileFrontEnd hsc_env msg_act mod_summary + ; hscBackEnd hsc_env mod_summary maybe_checked_iface front_res } + + HsBootFile -> do { front_res <- hscFileFrontEnd hsc_env msg_act mod_summary + ; hscBootBackEnd hsc_env mod_summary maybe_checked_iface front_res } - ; when (not one_shot && verbosity dflags >= 1) $ - hPutStrLn stderr ("Compiling " ++ - showModMsg (not toInterp) mod location); + ExtCoreFile -> do { front_res <- hscCoreFrontEnd hsc_env msg_act mod_summary + ; hscBackEnd hsc_env mod_summary maybe_checked_iface front_res } + +hscCoreFrontEnd hsc_env msg_act mod_summary = do { + ------------------- + -- PARSE + ------------------- + ; inp <- readFile (expectJust "hscCoreFrontEnd" (ms_hspp_file mod_summary)) + ; case parseCore inp 1 of + FailP s -> putMsg s{-ToDo: wrong-} >> return Nothing + OkP rdr_module -> do { + + ------------------- + -- RENAME and TYPECHECK + ------------------- + ; (tc_msgs, maybe_tc_result) <- _scc_ "TypeCheck" + tcRnExtCore hsc_env rdr_module + ; msg_act tc_msgs + ; case maybe_tc_result of + Nothing -> return Nothing + Just mod_guts -> return (Just mod_guts) -- No desugaring to do! + }} + + +hscFileFrontEnd hsc_env msg_act mod_summary = do { + ------------------- + -- DISPLAY PROGRESS MESSAGE + ------------------- + let one_shot = isOneShot (hsc_mode hsc_env) + ; let dflags = hsc_dflags hsc_env + ; let toInterp = dopt_HscTarget dflags == HscInterpreted + ; when (not one_shot) $ + compilationProgressMsg dflags $ + ("Compiling " ++ showModMsg (not toInterp) mod_summary) - ; front_res <- if toCore then - hscCoreFrontEnd hsc_env location - else - hscFrontEnd hsc_env location + ------------------- + -- PARSE + ------------------- + ; let hspp_file = expectJust "hscFileFrontEnd" (ms_hspp_file mod_summary) + hspp_buf = ms_hspp_buf mod_summary - ; case front_res of - Left flure -> return flure; - Right ds_result -> do { + ; maybe_parsed <- myParseModule (hsc_dflags hsc_env) hspp_file hspp_buf + ; case maybe_parsed of { + Left err -> do { msg_act (unitBag err, emptyBag) + ; return Nothing } ; + Right rdr_module -> do { - -- OMITTED: - -- ; seqList imported_modules (return ()) + ------------------- + -- RENAME and TYPECHECK + ------------------- + (tc_msgs, maybe_tc_result) + <- _scc_ "Typecheck-Rename" + tcRnModule hsc_env (ms_hsc_src mod_summary) rdr_module + + ; msg_act tc_msgs + ; case maybe_tc_result of { + Nothing -> return Nothing ; + Just tc_result -> do { + + ------------------- + -- DESUGAR + ------------------- + ; (warns, maybe_ds_result) <- _scc_ "DeSugar" + deSugar hsc_env tc_result + ; msg_act (warns, emptyBag) + ; case maybe_ds_result of + Nothing -> return Nothing + Just ds_result -> return (Just ds_result) + }}}}} + +------------------------------ +hscBootBackEnd :: HscEnv -> ModSummary -> Maybe ModIface -> Maybe ModGuts -> IO HscResult +-- For hs-boot files, there's no code generation to do + +hscBootBackEnd hsc_env mod_summary maybe_checked_iface Nothing + = return HscFail +hscBootBackEnd hsc_env mod_summary maybe_checked_iface (Just ds_result) + = do { final_iface <- _scc_ "MkFinalIface" + mkIface hsc_env (ms_location mod_summary) + maybe_checked_iface ds_result + + ; let { final_details = ModDetails { md_types = mg_types ds_result, + md_insts = mg_insts ds_result, + md_rules = mg_rules ds_result } } + -- And the answer is ... + ; dumpIfaceStats hsc_env + + ; return (HscRecomp final_details + final_iface + False False Nothing) + } + +------------------------------ +hscBackEnd :: HscEnv -> ModSummary -> Maybe ModIface -> Maybe ModGuts -> IO HscResult + +hscBackEnd hsc_env mod_summary maybe_checked_iface Nothing + = return HscFail + +hscBackEnd hsc_env mod_summary maybe_checked_iface (Just ds_result) + = do { -- OMITTED: + -- ; seqList imported_modules (return ()) + + let one_shot = isOneShot (hsc_mode hsc_env) + dflags = hsc_dflags hsc_env ------------------- -- FLATTENING @@ -272,19 +375,15 @@ hscRecomp hsc_env have_object -- info has been set. Not yet clear if it matters waiting -- until after code output ; new_iface <- _scc_ "MkFinalIface" - mkIface hsc_env location + mkIface hsc_env (ms_location mod_summary) maybe_checked_iface tidy_result - -- Space leak reduction: throw away the new interface if -- we're in one-shot mode; we won't be needing it any -- more. ; final_iface <- if one_shot then return (error "no final iface") else return new_iface - ; let { final_globals | one_shot = Nothing - | otherwise = Just $! (mg_rdr_env tidy_result) } - ; final_globals `seq` return () -- Build the final ModDetails (except in one-shot mode, where -- we won't need this information after compilation). @@ -298,71 +397,58 @@ hscRecomp hsc_env have_object ------------------- -- CONVERT TO STG and COMPLETE CODE GENERATION ; (stub_h_exists, stub_c_exists, maybe_bcos) - <- hscBackEnd dflags tidy_result + <- hscCodeGen dflags tidy_result -- And the answer is ... ; dumpIfaceStats hsc_env ; return (HscRecomp final_details - final_globals final_iface stub_h_exists stub_c_exists maybe_bcos) - }} + } -hscCoreFrontEnd hsc_env location = do { - ------------------- - -- PARSE - ------------------- - ; inp <- readFile (expectJust "hscCoreFrontEnd:hspp" (ml_hspp_file location)) - ; case parseCore inp 1 of - FailP s -> hPutStrLn stderr s >> return (Left HscFail); - OkP rdr_module -> do { - - ------------------- - -- RENAME and TYPECHECK - ------------------- - ; maybe_tc_result <- _scc_ "TypeCheck" - tcRnExtCore hsc_env rdr_module - ; case maybe_tc_result of { - Nothing -> return (Left HscFail); - Just mod_guts -> return (Right mod_guts) - -- No desugaring to do! - }}} - -hscFrontEnd hsc_env location = do { +hscFileCheck hsc_env msg_act hspp_file = do { ------------------- -- PARSE ------------------- - ; maybe_parsed <- myParseModule (hsc_dflags hsc_env) - (expectJust "hscFrontEnd:hspp" (ml_hspp_file location)) + ; maybe_parsed <- myParseModule (hsc_dflags hsc_env) hspp_file Nothing ; case maybe_parsed of { - Nothing -> return (Left HscFail); - Just rdr_module -> do { - - ------------------- - -- RENAME and TYPECHECK - ------------------- - ; maybe_tc_result <- _scc_ "Typecheck-Rename" - tcRnModule hsc_env rdr_module - ; case maybe_tc_result of { - Nothing -> return (Left HscFail); - Just tc_result -> do { - - ------------------- - -- DESUGAR - ------------------- - ; maybe_ds_result <- _scc_ "DeSugar" - deSugar hsc_env tc_result - ; case maybe_ds_result of - Nothing -> return (Left HscFail); - Just ds_result -> return (Right ds_result); - }}}}} - - -hscBackEnd dflags + Left err -> do { msg_act (unitBag err, emptyBag) ; + ; return HscFail ; + }; + Right rdr_module -> hscBufferTypecheck hsc_env rdr_module msg_act + }} + + +-- Perform static/dynamic checks on the source code in a StringBuffer +-- This is a temporary solution: it'll read in interface files lazily, whereas +-- we probably want to use the compilation manager to load in all the modules +-- in a project. +hscBufferCheck :: HscEnv -> StringBuffer -> MessageAction -> IO HscResult +hscBufferCheck hsc_env buffer msg_act = do + let loc = mkSrcLoc (mkFastString "*edit*") 1 0 + showPass (hsc_dflags hsc_env) "Parser" + case unP parseModule (mkPState buffer loc (hsc_dflags hsc_env)) of + PFailed span err -> do + msg_act (emptyBag, unitBag (mkPlainErrMsg span err)) + return HscFail + POk _ rdr_module -> do + hscBufferTypecheck hsc_env rdr_module msg_act + +hscBufferTypecheck hsc_env rdr_module msg_act = do + (tc_msgs, maybe_tc_result) <- _scc_ "Typecheck-Rename" + tcRnModule hsc_env HsSrcFile rdr_module + msg_act tc_msgs + case maybe_tc_result of + Nothing -> return (HscChecked rdr_module Nothing) + -- space leak on rdr_module! + Just r -> return (HscChecked rdr_module (Just r)) + + +hscCodeGen dflags ModGuts{ -- This is the last use of the ModGuts in a compilation. -- From now on, we just use the bits we need. mg_module = this_mod, @@ -378,7 +464,7 @@ hscBackEnd dflags prepd_binds <- _scc_ "CorePrep" corePrepPgm dflags core_binds type_env; - case dopt_HscLang dflags of + case dopt_HscTarget dflags of HscNothing -> return (False, False, Nothing) HscInterpreted -> @@ -415,18 +501,35 @@ hscBackEnd dflags } -myParseModule dflags src_filename +hscCmmFile :: DynFlags -> FilePath -> IO Bool +hscCmmFile dflags filename = do + maybe_cmm <- parseCmmFile dflags filename + case maybe_cmm of + Nothing -> return False + Just cmm -> do + codeOutput dflags no_mod NoStubs noDependencies [cmm] + return True + where + no_mod = panic "hscCmmFile: no_mod" + + +myParseModule dflags src_filename maybe_src_buf = do -------------------------- Parser ---------------- showPass dflags "Parser" _scc_ "Parser" do - buf <- hGetStringBuffer src_filename + + -- sometimes we already have the buffer in memory, perhaps + -- because we needed to parse the imports out of it, or get the + -- module name. + buf <- case maybe_src_buf of + Just b -> return b + Nothing -> hGetStringBuffer src_filename let loc = mkSrcLoc (mkFastString src_filename) 1 0 case unP parseModule (mkPState buf loc dflags) of { - PFailed l1 l2 err -> do { hPutStrLn stderr (showSDoc (showPFailed l1 l2 err)); - return Nothing }; + PFailed span err -> return (Left (mkPlainErrMsg span err)); POk _ rdr_module -> do { @@ -435,7 +538,7 @@ myParseModule dflags src_filename dumpIfSet_dyn dflags Opt_D_source_stats "Source Statistics" (ppSourceStats False rdr_module) ; - return (Just rdr_module) + return (Right rdr_module) -- ToDo: free the string buffer later. }} @@ -495,8 +598,9 @@ hscStmt -- Compile a stmt all the way to an HValue, but don't run it hscStmt hsc_env icontext stmt = do { maybe_stmt <- hscParseStmt (hsc_dflags hsc_env) stmt ; case maybe_stmt of { - Nothing -> return Nothing ; - Just parsed_stmt -> do { + Nothing -> return Nothing ; -- Parse error + Just Nothing -> return Nothing ; -- Empty line + Just (Just parsed_stmt) -> do { -- The real stuff -- Rename and typecheck it maybe_tc_result @@ -524,16 +628,45 @@ hscTcExpr -- Typecheck an expression (but don't run it) hscTcExpr hsc_env icontext expr = do { maybe_stmt <- hscParseStmt (hsc_dflags hsc_env) expr ; case maybe_stmt of { - Just (ExprStmt expr _ _) + Nothing -> return Nothing ; -- Parse error + Just (Just (L _ (ExprStmt expr _))) -> tcRnExpr hsc_env icontext expr ; - Just other -> do { hPutStrLn stderr ("not an expression: `" ++ expr ++ "'") ; + Just other -> do { errorMsg ("not an expression: `" ++ expr ++ "'") ; + return Nothing } ; + } } + +hscKcType -- Find the kind of a type + :: HscEnv + -> InteractiveContext -- Context for compiling + -> String -- The type + -> IO (Maybe Kind) + +hscKcType hsc_env icontext str + = do { maybe_type <- hscParseType (hsc_dflags hsc_env) str + ; case maybe_type of { + Just ty -> tcRnType hsc_env icontext ty ; + Just other -> do { errorMsg ("not an type: `" ++ str ++ "'") ; return Nothing } ; Nothing -> return Nothing } } \end{code} \begin{code} -hscParseStmt :: DynFlags -> String -> IO (Maybe RdrNameStmt) -hscParseStmt dflags str +hscParseStmt :: DynFlags -> String -> IO (Maybe (Maybe (LStmt RdrName))) +hscParseStmt = hscParseThing parseStmt + +hscParseType :: DynFlags -> String -> IO (Maybe (LHsType RdrName)) +hscParseType = hscParseThing parseType + +hscParseIdentifier :: DynFlags -> String -> IO (Maybe (Located RdrName)) +hscParseIdentifier = hscParseThing parseIdentifier + +hscParseThing :: Outputable thing + => Lexer.P thing + -> DynFlags -> String + -> IO (Maybe thing) + -- Nothing => Parse error (message already printed) + -- Just x => success +hscParseThing parser dflags str = do showPass dflags "Parser" _scc_ "Parser" do @@ -541,20 +674,17 @@ hscParseStmt dflags str let loc = mkSrcLoc FSLIT("") 1 0 - case unP parseStmt (mkPState buf loc dflags) of { + case unP parser (mkPState buf loc dflags) of { - PFailed l1 l2 err -> do { hPutStrLn stderr (showSDoc (showPFailed l1 l2 err)); - return Nothing }; + PFailed span err -> do { printError span err; + return Nothing }; - -- no stmt: the line consisted of just space or comments - POk _ Nothing -> return Nothing; - - POk _ (Just rdr_stmt) -> do { + POk _ thing -> do { --ToDo: can't free the string buffer until we've finished this -- compilation sweep and all the identifiers have gone away. - dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr rdr_stmt); - return (Just rdr_stmt) + dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr thing); + return (Just thing) }} #endif \end{code} @@ -567,35 +697,30 @@ hscParseStmt dflags str \begin{code} #ifdef GHCI -hscThing -- like hscStmt, but deals with a single identifier +type GetInfoResult = (String, (IfaceDecl, Fixity, SrcLoc, [(IfaceInst,SrcLoc)])) + +hscGetInfo -- like hscStmt, but deals with a single identifier :: HscEnv -> InteractiveContext -- Context for compiling -> String -- The identifier - -> IO [(IfaceDecl, Fixity)] + -> IO [GetInfoResult] -hscThing hsc_env ic str - = do maybe_rdr_name <- myParseIdentifier (hsc_dflags hsc_env) str +hscGetInfo hsc_env ic str + = do maybe_rdr_name <- hscParseIdentifier (hsc_dflags hsc_env) str case maybe_rdr_name of { Nothing -> return []; - Just rdr_name -> do + Just (L _ rdr_name) -> do + + maybe_tc_result <- tcRnGetInfo hsc_env ic rdr_name - maybe_tc_result <- tcRnThing hsc_env ic rdr_name + let -- str' is the the naked occurrence name + -- after stripping off qualification and parens (+) + str' = occNameUserString (rdrNameOcc rdr_name) case maybe_tc_result of { Nothing -> return [] ; - Just things -> return things + Just things -> return [(str', t) | t <- things] }} - -myParseIdentifier dflags str - = do buf <- stringToStringBuffer str - - let loc = mkSrcLoc FSLIT("") 1 0 - case unP parseIdentifier (mkPState buf loc dflags) of - - PFailed l1 l2 err -> do { hPutStrLn stderr (showSDoc (showPFailed l1 l2 err)); - return Nothing } - - POk _ rdr_name -> return (Just rdr_name) #endif \end{code} @@ -609,7 +734,7 @@ myParseIdentifier dflags str #ifdef GHCI compileExpr :: HscEnv -> Module -> GlobalRdrEnv -> TypeEnv - -> TypecheckedHsExpr + -> LHsExpr Id -> IO HValue compileExpr hsc_env this_mod rdr_env type_env tc_expr