X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=7b1a1025717d014fd3fe0f4598c6db03effde6b3;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=c1fa0c44f962b1d343cca8cc7e2276602a39d381;hpb=948e7f388748078a8d9a324b284da7c4029f7060;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index c1fa0c4..7b1a102 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -6,9 +6,9 @@ \begin{code} module HscMain ( - HscResult(..), hscMain, newHscEnv + HscResult(..), hscMain, newHscEnv, hscCmmFile, hscBufferFrontEnd #ifdef GHCI - , hscStmt, hscTcExpr, hscThing, + , hscStmt, hscTcExpr, hscKcType, hscThing, , compileExpr #endif ) where @@ -16,8 +16,7 @@ module HscMain ( #include "HsVersions.h" #ifdef GHCI -import HsSyn ( Stmt(..) ) -import TcHsSyn ( TypecheckedHsExpr ) +import HsSyn ( Stmt(..), LStmt, LHsExpr, LHsType ) import IfaceSyn ( IfaceDecl ) import CodeOutput ( outputForeignStubs ) import ByteCodeGen ( byteCodeGen, coreExprToBCOs ) @@ -25,14 +24,14 @@ 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, tcRnThing, tcRnType ) +import RdrName ( RdrName ) import Type ( Type ) import PrelNames ( iNTERACTIVE ) import StringBuffer ( stringToStringBuffer ) -import SrcLoc ( noSrcLoc ) -import Name ( Name ) +import SrcLoc ( SrcLoc, noSrcLoc, Located(..) ) +import Kind ( Kind ) +import Var ( Id ) import CoreLint ( lintUnfolding ) import DsMeta ( templateHaskellNames ) import BasicTypes ( Fixity ) @@ -40,7 +39,7 @@ import BasicTypes ( Fixity ) import StringBuffer ( hGetStringBuffer ) import Parser -import Lexer ( P(..), ParseResult(..), mkPState, showPFailed ) +import Lexer ( P(..), ParseResult(..), mkPState ) import SrcLoc ( mkSrcLoc ) import TcRnDriver ( tcRnModule, tcRnExtCore ) import TcIface ( typecheckIface ) @@ -58,11 +57,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 ErrUtils import UniqSupply ( mkSplitUniqSupply ) import Outputable @@ -74,6 +74,8 @@ 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 ) @@ -120,7 +122,10 @@ knownKeyNames = map getName wiredInThings \begin{code} data HscResult -- Compilation failed - = HscFail + = HscFail + + -- In IDE mode: we just do the static/dynamic checks + | HscChecked -- Concluded that it wasn't necessary | HscNoRecomp ModDetails -- new details (HomeSymbolTable additions) @@ -134,11 +139,16 @@ data HscResult 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 + -> MessageAction -- what to do with errors/warnings -> Module -> ModLocation -- location info -> Bool -- True <=> source unchanged @@ -146,7 +156,7 @@ hscMain -> Maybe ModIface -- old interface, if available -> IO HscResult -hscMain hsc_env mod location +hscMain hsc_env msg_act mod location source_unchanged have_object maybe_old_iface = do { (recomp_reqd, maybe_checked_iface) <- @@ -159,13 +169,13 @@ hscMain hsc_env mod location what_next | recomp_reqd || no_old_iface = hscRecomp | otherwise = hscNoRecomp - ; what_next hsc_env have_object + ; what_next hsc_env msg_act have_object mod location maybe_checked_iface } -- hscNoRecomp definitely expects to have the old interface available -hscNoRecomp hsc_env have_object +hscNoRecomp hsc_env msg_act have_object mod location (Just old_iface) | hsc_mode hsc_env == OneShot = do { @@ -189,7 +199,7 @@ hscNoRecomp hsc_env have_object return (HscNoRecomp new_details old_iface) } -hscRecomp hsc_env have_object +hscRecomp hsc_env msg_act have_object mod location maybe_checked_iface = do { -- what target are we shooting for? @@ -204,9 +214,9 @@ hscRecomp hsc_env have_object showModMsg (not toInterp) mod location); ; front_res <- if toCore then - hscCoreFrontEnd hsc_env location + hscCoreFrontEnd hsc_env msg_act location else - hscFrontEnd hsc_env location + hscFileFrontEnd hsc_env msg_act location ; case front_res of Left flure -> return flure; @@ -310,20 +320,21 @@ hscRecomp hsc_env have_object maybe_bcos) }} -hscCoreFrontEnd hsc_env location = do { +hscCoreFrontEnd hsc_env msg_act 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); + FailP s -> hPutStrLn stderr s >> return (Left HscFail) OkP rdr_module -> do { ------------------- -- RENAME and TYPECHECK ------------------- - ; maybe_tc_result <- _scc_ "TypeCheck" + ; (tc_msgs, maybe_tc_result) <- _scc_ "TypeCheck" tcRnExtCore hsc_env rdr_module + ; msg_act tc_msgs ; case maybe_tc_result of { Nothing -> return (Left HscFail); Just mod_guts -> return (Right mod_guts) @@ -331,7 +342,7 @@ hscCoreFrontEnd hsc_env location = do { }}} -hscFrontEnd hsc_env location = do { +hscFileFrontEnd hsc_env msg_act location = do { ------------------- -- PARSE ------------------- @@ -339,14 +350,38 @@ hscFrontEnd hsc_env location = do { (expectJust "hscFrontEnd:hspp" (ml_hspp_file location)) ; case maybe_parsed of { - Nothing -> return (Left HscFail); - Just rdr_module -> do { - + Left err -> do { msg_act (unitBag err, emptyBag) ; + ; return (Left HscFail) ; + }; + Right rdr_module -> hscFrontEnd hsc_env msg_act rdr_module + }} + +-- 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. +hscBufferFrontEnd :: HscEnv -> StringBuffer -> MessageAction -> IO HscResult +hscBufferFrontEnd hsc_env buffer msg_act = do + let loc = mkSrcLoc (mkFastString "*edit*") 1 0 + 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 + r <- hscFrontEnd hsc_env msg_act rdr_module + case r of + Left r -> return r + Right _ -> return HscChecked + + + +hscFrontEnd hsc_env msg_act rdr_module = do { ------------------- -- RENAME and TYPECHECK ------------------- - ; maybe_tc_result <- _scc_ "Typecheck-Rename" + ; (tc_msgs, maybe_tc_result) <- _scc_ "Typecheck-Rename" tcRnModule hsc_env rdr_module + ; msg_act tc_msgs ; case maybe_tc_result of { Nothing -> return (Left HscFail); Just tc_result -> do { @@ -354,13 +389,13 @@ hscFrontEnd hsc_env location = do { ------------------- -- DESUGAR ------------------- - ; maybe_ds_result <- _scc_ "DeSugar" + ; (warns, maybe_ds_result) <- _scc_ "DeSugar" deSugar hsc_env tc_result + ; msg_act (warns, emptyBag) ; case maybe_ds_result of Nothing -> return (Left HscFail); Just ds_result -> return (Right ds_result); - }}}}} - + }}} hscBackEnd dflags ModGuts{ -- This is the last use of the ModGuts in a compilation. @@ -415,6 +450,18 @@ hscBackEnd dflags } +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 = do -------------------------- Parser ---------------- showPass dflags "Parser" @@ -425,8 +472,7 @@ myParseModule dflags src_filename 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 +481,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 +541,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 +571,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 ++ "'") ; 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 { hPutStrLn stderr ("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 +617,17 @@ hscParseStmt dflags str let loc = mkSrcLoc FSLIT("") 1 0 - case unP parseStmt (mkPState buf loc dflags) of { - - PFailed l1 l2 err -> do { hPutStrLn stderr (showSDoc (showPFailed l1 l2 err)); - return Nothing }; + case unP parser (mkPState buf loc dflags) of { - -- no stmt: the line consisted of just space or comments - POk _ Nothing -> return Nothing; + PFailed span err -> do { printError span err; + 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} @@ -571,13 +644,13 @@ hscThing -- like hscStmt, but deals with a single identifier :: HscEnv -> InteractiveContext -- Context for compiling -> String -- The identifier - -> IO [(IfaceDecl, Fixity)] + -> IO [(IfaceDecl, Fixity, SrcLoc)] hscThing hsc_env ic str - = do maybe_rdr_name <- myParseIdentifier (hsc_dflags hsc_env) 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 <- tcRnThing hsc_env ic rdr_name @@ -585,17 +658,6 @@ hscThing hsc_env ic str Nothing -> return [] ; Just things -> return 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 +671,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