X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=b5085cdbd183da5ac4ddb59c6ef048442280f4da;hb=11c7505f6a0d17bb7d00183b81a0bbf7cd38f3ef;hp=290f1770d827f34809e4a71286164d68f8a4e142;hpb=1dfaee318171836b32f6b33a14231c69adfdef2f;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index 290f177..b5085cd 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -14,13 +14,15 @@ module HscMain ( HscResult(..), hscMain, #include "HsVersions.h" #ifdef GHCI +import Interpreter import ByteCodeGen ( byteCodeGen ) import CoreTidy ( tidyCoreExpr ) import CorePrep ( corePrepExpr ) import Rename ( renameStmt, renameRdrName ) -import RdrName ( mkUnqual, mkQual ) +import RdrName ( rdrNameOcc, setRdrNameOcc ) import RdrHsSyn ( RdrNameStmt ) -import OccName ( varName, dataName, tcClsName ) +import OccName ( dataName, tcClsName, + occNameSpace, setOccNameSpace ) import Type ( Type ) import Id ( Id, idName, setGlobalIdDetails ) import IdInfo ( GlobalIdDetails(VanillaGlobal) ) @@ -28,12 +30,12 @@ import HscTypes ( InteractiveContext(..) ) import PrelNames ( iNTERACTIVE ) import StringBuffer ( stringToStringBuffer ) import FastString ( mkFastString ) -import Char ( isUpper ) -import DriverUtil ( split_longest_prefix ) +import Maybes ( catMaybes ) #endif import HsSyn +import RdrName ( mkRdrOrig ) import Id ( idName ) import IdInfo ( CafInfo(..), CgInfoEnv, CgInfo(..) ) import StringBuffer ( hGetStringBuffer, freeStringBuffer ) @@ -44,6 +46,7 @@ import Finder ( findModule ) import Rename ( checkOldIface, renameModule, closeIfaceDecls ) import Rules ( emptyRuleBase ) import PrelInfo ( wiredInThingEnv, wiredInThings ) +import PrelRules ( builtinRules ) import PrelNames ( knownKeyNames ) import MkIface ( mkFinalIface ) import TcModule @@ -66,9 +69,8 @@ import ErrUtils ( dumpIfSet_dyn, showPass, printError ) import Util ( unJust ) import UniqSupply ( mkSplitUniqSupply ) -import Bag ( emptyBag ) +import Bag ( consBag, emptyBag ) import Outputable -import Interpreter import HscStats ( ppSourceStats ) import HscTypes import FiniteMap ( FiniteMap, plusFM, emptyFM, addToFM ) @@ -80,7 +82,7 @@ import Module ( Module ) import IOExts ( newIORef, readIORef, writeIORef, unsafePerformIO ) import Monad ( when ) -import Maybe ( isJust, fromJust, catMaybes ) +import Maybe ( isJust, fromJust ) import IO import MkExternalCore ( emitExternalCore ) @@ -159,7 +161,8 @@ hscNoRecomp ghci_mode dflags have_object mod location (Just old_iface) hst hit pcs_ch | ghci_mode == OneShot = do { - hPutStrLn stderr "compilation IS NOT required"; + when (verbosity dflags > 0) $ + hPutStrLn stderr "compilation IS NOT required"; let { bomb = panic "hscNoRecomp:OneShot" }; return (HscNoRecomp pcs_ch bomb bomb) } @@ -188,7 +191,7 @@ hscNoRecomp ghci_mode dflags have_object }}} compMsg use_object mod location = - mod_str ++ take (max 0 (16 - length mod_str)) (repeat ' ') + mod_str ++ replicate (max 0 (16 - length mod_str)) ' ' ++" ( " ++ unJust "hscRecomp" (ml_hs_file location) ++ ", " ++ (if use_object then unJust "hscRecomp" (ml_obj_file location) @@ -204,7 +207,7 @@ hscRecomp ghci_mode dflags have_object ; let toInterp = dopt_HscLang dflags == HscInterpreted ; let toNothing = dopt_HscLang dflags == HscNothing - ; when (verbosity dflags >= 1) $ + ; when (ghci_mode /= OneShot && verbosity dflags >= 1) $ hPutStrLn stderr ("Compiling " ++ compMsg (not toInterp) mod location); @@ -432,19 +435,14 @@ myCoreToStg dflags this_mod tidy_binds <- _scc_ "Core2Stg" stg2stg dflags this_mod stg_binds let env_rhs :: CgInfoEnv - env_rhs = mkNameEnv [ (idName bndr, CgInfo (stgRhsArity rhs) caf_info) + env_rhs = mkNameEnv [ (idName bndr, CgInfo caf_info) | (bind,_) <- stg_binds2, let caf_info | stgBindHasCafRefs bind = MayHaveCafRefs - | otherwise = NoCafRefs, - (bndr,rhs) <- stgBindPairs bind ] + | otherwise = NoCafRefs, + bndr <- stgBinders bind ] return (stg_binds2, cost_centre_info, env_rhs) - where - stgBindPairs (StgNonRec _ b r) = [(b,r)] - stgBindPairs (StgRec _ prs) = prs - - \end{code} @@ -498,13 +496,7 @@ A naked expression returns a singleton Name [it]. \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 + = do { maybe_stmt <- hscParseStmt dflags stmt ; case maybe_stmt of Nothing -> return (pcs0, Nothing) Just parsed_stmt -> do { @@ -520,8 +512,8 @@ hscStmt dflags hst hit pcs0 icontext stmt just_expr -- Rename it (pcs1, print_unqual, maybe_renamed_stmt) - <- renameStmt dflags hit hst pcs0 scope_mod - iNTERACTIVE rn_env parsed_stmt + <- renameStmt dflags hit hst pcs0 + iNTERACTIVE icontext parsed_stmt ; case maybe_renamed_stmt of Nothing -> return (pcs0, Nothing) @@ -531,9 +523,9 @@ hscStmt dflags hst hit pcs0 icontext stmt just_expr maybe_tc_return <- if just_expr then case rn_stmt of { (ExprStmt e _ _, decls) -> - typecheckExpr dflags pcs1 hst type_env + typecheckExpr dflags pcs1 hst (ic_type_env icontext) print_unqual iNTERACTIVE (e,decls) } - else typecheckStmt dflags pcs1 hst type_env + else typecheckStmt dflags pcs1 hst (ic_type_env icontext) print_unqual iNTERACTIVE bound_names rn_stmt ; case maybe_tc_return of @@ -620,29 +612,24 @@ hscThing -- like hscStmt, but deals with a single identifier [TyThing] ) hscThing dflags hst hit pcs0 icontext str - = do let - InteractiveContext { - ic_rn_env = rn_env, - ic_type_env = type_env, - ic_module = scope_mod } = icontext - - rdr_names - | '.' `elem` str - = [ mkQual ns (fmod,fvar) | ns <- namespaces var ] - | otherwise - = [ mkUnqual ns fstr | ns <- namespaces str ] - where (mod,var) = split_longest_prefix str '.' - fmod = mkFastString mod - fvar = mkFastString var - fstr = mkFastString str - namespaces s - | isUpper c || c == ':' = [ tcClsName, dataName ] - | otherwise = [ varName ] - where c = head s + = do maybe_rdr_name <- myParseIdentifier dflags str + case maybe_rdr_name of { + Nothing -> return (pcs0, []); + Just rdr_name -> do + + -- if the identifier is a constructor (begins with an + -- upper-case letter), then we need to consider both + -- constructor and type class identifiers. + let rdr_names + | occNameSpace occ == dataName = [ rdr_name, tccls_name ] + | otherwise = [ rdr_name ] + where + occ = rdrNameOcc rdr_name + tccls_occ = setOccNameSpace occ tcClsName + tccls_name = setRdrNameOcc rdr_name tccls_occ (pcs, unqual, maybe_rn_result) <- - renameRdrName dflags hit hst pcs0 scope_mod scope_mod - rn_env rdr_names + renameRdrName dflags hit hst pcs0 iNTERACTIVE icontext rdr_names case maybe_rn_result of { Nothing -> return (pcs, []); @@ -657,7 +644,25 @@ hscThing dflags hst hit pcs0 icontext str let maybe_ty_things = map (lookupType hst (pcs_PTE pcs)) names in return (pcs, catMaybes maybe_ty_things) } - }} + }}} + +myParseIdentifier dflags str + = do buf <- stringToStringBuffer str + + let glaexts | dopt Opt_GlasgowExts dflags = 1# + | otherwise = 0# + + case parseIdentifier buf + PState{ bol = 0#, atbol = 1#, + context = [], glasgow_exts = glaexts, + loc = mkSrcLoc SLIT("") 1 } of + + PFailed err -> do { hPutStrLn stderr (showSDoc err); + freeStringBuffer buf; + return Nothing } + + POk _ rdr_name -> do { --should, but can't: freeStringBuffer buf; + return (Just rdr_name) } #endif \end{code} @@ -688,10 +693,18 @@ initPersistentRenamerState :: IO PersistentRenamerState nsIPs = emptyFM }, prsDecls = (emptyNameEnv, 0), prsInsts = (emptyBag, 0), - prsRules = (emptyBag, 0), + prsRules = foldr add_rule (emptyBag, 0) builtinRules, prsImpMods = emptyFM } ) + where + add_rule (name,rule) (rules, n_rules) + = (gated_decl `consBag` rules, n_rules+1) + where + gated_decl = (gate_fn, (mod, IfaceRuleOut rdr_name rule)) + mod = nameModule name + rdr_name = mkRdrOrig (moduleName mod) (nameOccName name) + gate_fn vis_fn = vis_fn name -- Load the rule whenever name is visible initOrigNames :: FiniteMap (ModuleName,OccName) Name initOrigNames