X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FdeSugar%2FDsMeta.hs;h=061c3678b210a13a5573cde61372c2b2304b8b84;hb=5a0fa26191608c2ab71d9bce4146dc787a04627f;hp=f74202ee6ac3c2cead8934a94f84c4a48be8b13a;hpb=f2e26fc5cb932857160772b64d2f17ce2a863fd4;p=ghc-hetmet.git diff --git a/ghc/compiler/deSugar/DsMeta.hs b/ghc/compiler/deSugar/DsMeta.hs index f74202e..061c367 100644 --- a/ghc/compiler/deSugar/DsMeta.hs +++ b/ghc/compiler/deSugar/DsMeta.hs @@ -13,8 +13,8 @@ module DsMeta( dsBracket, dsReify, templateHaskellNames, qTyConName, - liftName, exprTyConName, declTyConName, typeTyConName, - decTyConName, typTyConName ) where + liftName, expQTyConName, decQTyConName, typeQTyConName, + decTyConName, typeTyConName ) where #include "HsVersions.h" @@ -30,22 +30,19 @@ import HsSyn ( Pat(..), HsExpr(..), Stmt(..), HsLit(..), HsOverLit(..), Match(..), GRHSs(..), GRHS(..), HsBracket(..), HsStmtContext(ListComp,DoExpr), ArithSeqInfo(..), HsBinds(..), MonoBinds(..), HsConDetails(..), - TyClDecl(..), HsGroup(..), + TyClDecl(..), HsGroup(..), HsBang(..), HsReify(..), ReifyFlavour(..), - HsType(..), HsContext(..), HsPred(..), HsTyOp(..), + HsType(..), HsContext(..), HsPred(..), HsTyVarBndr(..), Sig(..), ForeignDecl(..), InstDecl(..), ConDecl(..), BangType(..), PendingSplice, splitHsInstDeclTy, placeHolderType, tyClDeclNames, collectHsBinders, collectPatBinders, collectPatsBinders, - hsTyVarName, hsConArgs, getBangType, - toHsType + hsTyVarName, hsConArgs ) -import PrelNames ( mETA_META_Name, rationalTyConName, negateName, - parrTyConName ) -import MkIface ( ifaceTyThing ) -import Name ( Name, nameOccName, nameModule ) +import PrelNames ( mETA_META_Name, rationalTyConName, integerTyConName, negateName ) +import Name ( Name, nameOccName, nameModule, getSrcLoc ) import OccName ( isDataOcc, isTvOcc, occNameUserString ) -- To avoid clashes with DsMeta.varName we must make a local alias for OccName.varName -- we do this by removing varName from the import of OccName above, making @@ -53,30 +50,35 @@ import OccName ( isDataOcc, isTvOcc, occNameUserString ) -- ws previously used in this file. import qualified OccName( varName, tcName ) -import Module ( Module, mkThPkgModule, moduleUserString ) +import Module ( Module, mkModule, moduleUserString ) import Id ( Id, idType ) -import Name ( mkKnownKeyExternalName ) +import Name ( mkExternalName ) import OccName ( mkOccFS ) import NameEnv import NameSet -import Type ( Type, TyThing(..), mkGenTyConApp ) +import Type ( Type, mkGenTyConApp ) import TcType ( tcTyConAppArgs ) -import TyCon ( DataConDetails(..) ) -import TysWiredIn ( stringTy ) +import TyCon ( DataConDetails(..), tyConName ) +import TysWiredIn ( stringTy, parrTyCon ) import CoreSyn import CoreUtils ( exprType ) import SrcLoc ( noSrcLoc ) +import Maybes ( orElse ) import Maybe ( catMaybes, fromMaybe ) import Panic ( panic ) import Unique ( mkPreludeTyConUnique, mkPreludeMiscIdUnique ) import BasicTypes ( NewOrData(..), StrictnessMark(..), isBoxed ) - +import SrcLoc ( SrcLoc ) +import Packages ( thPackage ) import Outputable import FastString ( mkFastString ) + +import Monad ( zipWithM ) +import List ( sortBy ) ----------------------------------------------------------------------------- dsBracket :: HsBracket Name -> [PendingSplice] -> DsM CoreExpr --- Returns a CoreExpr of type M.Expr +-- Returns a CoreExpr of type M.ExpQ -- The quoted thing is parameterised over Name, even though it has -- been type checked. We don't want all those type decorations! @@ -92,9 +94,12 @@ dsBracket brack splices ----------------------------------------------------------------------------- dsReify :: HsReify Id -> DsM CoreExpr --- Returns a CoreExpr of type reifyType --> M.Type --- reifyDecl --> M.Decl +dsReify r = panic "dsReify" -- To be re-done + +-- Returns a CoreExpr of type reifyType --> M.TypeQ +-- reifyDecl --> M.DecQ -- reifyFixty --> Q M.Fix +{- dsReify (ReifyOut ReifyType name) = do { thing <- dsLookupGlobal name ; -- By deferring the lookup until now (rather than doing it @@ -108,12 +113,12 @@ dsReify (ReifyOut ReifyType name) dsReify r@(ReifyOut ReifyDecl name) = do { thing <- dsLookupGlobal name ; - mb_d <- repTyClD (ifaceTyThing thing) ; + mb_d <- repTyClD (ifaceTyThing True{-omit pragmas-} thing) ; case mb_d of Just (MkC d) -> return d Nothing -> pprPanic "dsReify" (ppr r) } - +-} {- -------------- Examples -------------------- [| \x -> x |] @@ -136,26 +141,28 @@ dsReify r@(ReifyOut ReifyDecl name) repTopDs :: HsGroup Name -> DsM (Core (M.Q [M.Dec])) repTopDs group = do { let { bndrs = groupBinders group } ; - ss <- mkGenSyms bndrs ; + let { ss = mkGenSyms bndrs } ; -- Bind all the names mainly to avoid repeated use of explicit strings. -- Thus we get -- do { t :: String <- genSym "T" ; -- return (Data t [] ...more t's... } -- The other important reason is that the output must mention - -- only "T", not "Foo.T" where Foo is the current module + -- only "T", not "Foo:T" where Foo is the current module decls <- addBinds ss (do { - val_ds <- rep_binds (hs_valds group) ; - tycl_ds <- mapM repTyClD (hs_tyclds group) ; - inst_ds <- mapM repInstD (hs_instds group) ; + val_ds <- rep_binds' (hs_valds group) ; + tycl_ds <- mapM repTyClD' (hs_tyclds group) ; + inst_ds <- mapM repInstD' (hs_instds group) ; -- more needed - return (val_ds ++ catMaybes tycl_ds ++ inst_ds) }) ; + return (de_loc $ sort_by_loc $ val_ds ++ catMaybes tycl_ds ++ inst_ds) }) ; - decl_ty <- lookupType declTyConName ; + decl_ty <- lookupType decQTyConName ; let { core_list = coreList' decl_ty decls } ; - q_decs <- repSequenceQ decl_ty core_list ; + + dec_ty <- lookupType decTyConName ; + q_decs <- repSequenceQ dec_ty core_list ; wrapNongenSyms ss q_decs -- Do *not* gensym top-level binders @@ -193,53 +200,78 @@ in repTyClD and repC. -} -repTyClD :: TyClDecl Name -> DsM (Maybe (Core M.Decl)) +repTyClD :: TyClDecl Name -> DsM (Maybe (Core M.DecQ)) +repTyClD decl = do x <- repTyClD' decl + return (fmap snd x) -repTyClD (TyData { tcdND = DataType, tcdCtxt = [], - tcdName = tc, tcdTyVars = tvs, - tcdCons = DataCons cons, tcdDerivs = mb_derivs }) +repTyClD' :: TyClDecl Name -> DsM (Maybe (SrcLoc, Core M.DecQ)) + +repTyClD' (TyData { tcdND = DataType, tcdCtxt = cxt, + tcdName = tc, tcdTyVars = tvs, + tcdCons = cons, tcdDerivs = mb_derivs, + tcdLoc = loc}) + = do { tc1 <- lookupOcc tc ; -- See note [Binders and occurrences] + dec <- addTyVarBinds tvs $ \bndrs -> do { + cxt1 <- repContext cxt ; + cons1 <- mapM repC cons ; + cons2 <- coreList conQTyConName cons1 ; + derivs1 <- repDerivs mb_derivs ; + repData cxt1 tc1 (coreList' stringTy bndrs) cons2 derivs1 } ; + return $ Just (loc, dec) } + +repTyClD' (TyData { tcdND = NewType, tcdCtxt = cxt, + tcdName = tc, tcdTyVars = tvs, + tcdCons = [con], tcdDerivs = mb_derivs, + tcdLoc = loc}) = do { tc1 <- lookupOcc tc ; -- See note [Binders and occurrences] dec <- addTyVarBinds tvs $ \bndrs -> do { - cons1 <- mapM repC cons ; - cons2 <- coreList consTyConName cons1 ; + cxt1 <- repContext cxt ; + con1 <- repC con ; derivs1 <- repDerivs mb_derivs ; - repData tc1 (coreList' stringTy bndrs) cons2 derivs1 } ; - return $ Just dec } + repNewtype cxt1 tc1 (coreList' stringTy bndrs) con1 derivs1 } ; + return $ Just (loc, dec) } -repTyClD (TySynonym { tcdName = tc, tcdTyVars = tvs, tcdSynRhs = ty }) +repTyClD' (TySynonym { tcdName = tc, tcdTyVars = tvs, tcdSynRhs = ty, + tcdLoc = loc}) = do { tc1 <- lookupOcc tc ; -- See note [Binders and occurrences] dec <- addTyVarBinds tvs $ \bndrs -> do { ty1 <- repTy ty ; repTySyn tc1 (coreList' stringTy bndrs) ty1 } ; - return (Just dec) } - -repTyClD (ClassDecl { tcdCtxt = cxt, tcdName = cls, - tcdTyVars = tvs, tcdFDs = [], - tcdSigs = sigs, tcdMeths = Just binds }) = - do - cls1 <- lookupOcc cls -- See note [Binders and occurrences] - dec <- addTyVarBinds tvs $ \bndrs -> do - cxt1 <- repContext cxt - sigs1 <- rep_sigs sigs - binds1 <- rep_monobind binds - decls1 <- coreList declTyConName (sigs1 ++ binds1) - repClass cxt1 cls1 (coreList' stringTy bndrs) decls1 - return $ Just dec + return (Just (loc, dec)) } + +repTyClD' (ClassDecl { tcdCtxt = cxt, tcdName = cls, + tcdTyVars = tvs, + tcdFDs = [], -- We don't understand functional dependencies + tcdSigs = sigs, tcdMeths = meth_binds, + tcdLoc = loc}) + = do { cls1 <- lookupOcc cls ; -- See note [Binders and occurrences] + dec <- addTyVarBinds tvs $ \bndrs -> do { + cxt1 <- repContext cxt ; + sigs1 <- rep_sigs sigs ; + binds1 <- rep_monobind meth_binds ; + decls1 <- coreList decQTyConName (sigs1 ++ binds1) ; + repClass cxt1 cls1 (coreList' stringTy bndrs) decls1 } ; + return $ Just (loc, dec) } -- Un-handled cases -repTyClD d = do { addDsWarn (hang msg 4 (ppr d)) ; +repTyClD' d = do { addDsWarn (hang msg 4 (ppr d)) ; return Nothing } where msg = ptext SLIT("Cannot desugar this Template Haskell declaration:") -repInstD (InstDecl ty binds _ _ loc) +repInstD' (InstDecl ty binds _ loc) -- Ignore user pragmas for now - = do { cxt1 <- repContext cxt ; - inst_ty1 <- repPred (HsClassP cls tys) ; - binds1 <- rep_monobind binds ; - decls1 <- coreList declTyConName binds1 ; - repInst cxt1 inst_ty1 decls1 } + = do { cxt1 <- repContext cxt + ; inst_ty1 <- repPred (HsClassP cls tys) + ; let ss = mkGenSyms (collectMonoBinders binds) + ; binds1 <- addBinds ss (rep_monobind binds) + ; decls1 <- coreList decQTyConName binds1 + ; i <- repInst cxt1 inst_ty1 + (wrapNonGenSyms ss decls1) + -- wrapNonGenSyms: do not clone the class op names! + -- They must be called 'op' etc, not 'op34' + ; return (loc, i)} where (tvs, cxt, cls, tys) = splitHsInstDeclTy ty @@ -248,18 +280,18 @@ repInstD (InstDecl ty binds _ _ loc) -- Constructors ------------------------------------------------------- -repC :: ConDecl Name -> DsM (Core M.Cons) +repC :: ConDecl Name -> DsM (Core M.ConQ) repC (ConDecl con [] [] details loc) = do { con1 <- lookupOcc con ; -- See note [Binders and occurrences] - arg_tys <- mapM (repBangTy con) (hsConArgs details) ; - arg_tys1 <- coreList typeTyConName arg_tys ; - repConstr con1 arg_tys1 } + repConstr con1 details } -repBangTy con (BangType NotMarkedStrict ty) = repTy ty -repBangTy con bty = do { addDsWarn msg ; repTy (getBangType bty) } - where - msg = ptext SLIT("Ignoring stricness on argument of constructor") - <+> quotes (ppr con) +repBangTy :: BangType Name -> DsM (Core (M.StrictTypeQ)) +repBangTy (BangType str ty) = do MkC s <- rep2 strName [] + MkC t <- repTy ty + rep2 strictTypeName [s, t] + where strName = case str of + HsNoBang -> notStrictName + other -> isStrictName ------------------------------------------------------- -- Deriving clause @@ -281,38 +313,35 @@ repDerivs (Just ctxt) -- Signatures in a class decl, or a group of bindings ------------------------------------------------------- -rep_sigs :: [Sig Name] -> DsM [Core M.Decl] +rep_sigs :: [Sig Name] -> DsM [Core M.DecQ] +rep_sigs sigs = do locs_cores <- rep_sigs' sigs + return $ de_loc $ sort_by_loc locs_cores + +rep_sigs' :: [Sig Name] -> DsM [(SrcLoc, Core M.DecQ)] -- We silently ignore ones we don't recognise -rep_sigs sigs = do { sigs1 <- mapM rep_sig sigs ; +rep_sigs' sigs = do { sigs1 <- mapM rep_sig sigs ; return (concat sigs1) } -rep_sig :: Sig Name -> DsM [Core M.Decl] +rep_sig :: Sig Name -> DsM [(SrcLoc, Core M.DecQ)] -- Singleton => Ok -- Empty => Too hard, signature ignored -rep_sig (ClassOpSig nm _ ty _) = rep_proto nm ty -rep_sig (Sig nm ty _) = rep_proto nm ty -rep_sig other = return [] +rep_sig (Sig nm ty loc) = rep_proto nm ty loc +rep_sig other = return [] -rep_proto nm ty = do { nm1 <- lookupBinder nm ; +rep_proto :: Name -> HsType Name -> SrcLoc -> DsM [(SrcLoc, Core M.DecQ)] +rep_proto nm ty loc = do { nm1 <- lookupOcc nm ; ty1 <- repTy ty ; sig <- repProto nm1 ty1 ; - return [sig] } + return [(loc, sig)] } ------------------------------------------------------- -- Types ------------------------------------------------------- --- represent a list of type variables in a usage position that does not need --- gensym'ing --- -repTvs :: [HsTyVarBndr Name] -> DsM (Core [String]) -repTvs tvs = do { tvs1 <- mapM (localVar . hsTyVarName) tvs ; - return (coreList' stringTy tvs1) } - -- gensym a list of type variables and enter them into the meta environment; -- the computations passed as the second argument is executed in that extended --- meta environment and gets the *original* names as an argument +-- meta environment and gets the *new* names on Core-level as an argument -- addTyVarBinds :: [HsTyVarBndr Name] -- the binders to be added -> ([Core String] -> DsM (Core (M.Q a))) -- action in the ext env @@ -320,7 +349,7 @@ addTyVarBinds :: [HsTyVarBndr Name] -- the binders to be added addTyVarBinds tvs m = do let names = map hsTyVarName tvs - freshNames <- mkGenSyms names + let freshNames = mkGenSyms names term <- addBinds freshNames $ do bndrs <- mapM lookupBinder names m bndrs @@ -328,15 +357,15 @@ addTyVarBinds tvs m = -- represent a type context -- -repContext :: HsContext Name -> DsM (Core M.Ctxt) +repContext :: HsContext Name -> DsM (Core M.CxtQ) repContext ctxt = do preds <- mapM repPred ctxt - predList <- coreList typeTyConName preds + predList <- coreList typeQTyConName preds repCtxt predList -- represent a type predicate -- -repPred :: HsPred Name -> DsM (Core M.Type) +repPred :: HsPred Name -> DsM (Core M.TypeQ) repPred (HsClassP cls tys) = do tcon <- repTy (HsTyVar cls) tys1 <- repTys tys @@ -346,14 +375,14 @@ repPred (HsIParam _ _) = -- yield the representation of a list of types -- -repTys :: [HsType Name] -> DsM [Core M.Type] +repTys :: [HsType Name] -> DsM [Core M.TypeQ] repTys tys = mapM repTy tys -- represent a type -- -repTy :: HsType Name -> DsM (Core M.Type) -repTy (HsForAllTy bndrs ctxt ty) = - addTyVarBinds (fromMaybe [] bndrs) $ \bndrs' -> do +repTy :: HsType Name -> DsM (Core M.TypeQ) +repTy (HsForAllTy _ bndrs ctxt ty) = + addTyVarBinds bndrs $ \bndrs' -> do ctxt' <- repContext ctxt ty' <- repTy ty repTForall (coreList' stringTy bndrs') ctxt' ty' @@ -380,14 +409,13 @@ repTy (HsListTy t) = do repTapp tcon t1 repTy (HsPArrTy t) = do t1 <- repTy t - tcon <- repTy (HsTyVar parrTyConName) + tcon <- repTy (HsTyVar (tyConName parrTyCon)) repTapp tcon t1 repTy (HsTupleTy tc tys) = do tys1 <- repTys tys tcon <- repTupleTyCon (length tys) repTapps tcon tys1 -repTy (HsOpTy ty1 HsArrow ty2) = repTy (HsFunTy ty1 ty2) -repTy (HsOpTy ty1 (HsTyOp n) ty2) = repTy ((HsTyVar n `HsAppTy` ty1) +repTy (HsOpTy ty1 n ty2) = repTy ((HsTyVar n `HsAppTy` ty1) `HsAppTy` ty2) repTy (HsParTy t) = repTy t repTy (HsNumTy i) = @@ -401,14 +429,14 @@ repTy (HsKindSig ty kind) = -- Expressions ----------------------------------------------------------------------------- -repEs :: [HsExpr Name] -> DsM (Core [M.Expr]) +repEs :: [HsExpr Name] -> DsM (Core [M.ExpQ]) repEs es = do { es' <- mapM repE es ; - coreList exprTyConName es' } + coreList expQTyConName es' } -- FIXME: some of these panics should be converted into proper error messages -- unless we can make sure that constructs, which are plainly not -- supported in TH already lead to error messages at an earlier stage -repE :: HsExpr Name -> DsM (Core M.Expr) +repE :: HsExpr Name -> DsM (Core M.ExpQ) repE (HsVar x) = do { mb_val <- dsLookupMetaEnv x ; case mb_val of @@ -427,12 +455,10 @@ repE (HsLam m) = repLambda m repE (HsApp x y) = do {a <- repE x; b <- repE y; repApp a b} repE (OpApp e1 op fix e2) = - case op of - HsVar op -> do { arg1 <- repE e1; - arg2 <- repE e2; - the_op <- lookupOcc op ; - repInfixApp arg1 the_op arg2 } - _ -> panic "DsMeta.repE: Operator is not a variable" + do { arg1 <- repE e1; + arg2 <- repE e2; + the_op <- repE op ; + repInfixApp arg1 the_op arg2 } repE (NegApp x nm) = do a <- repE x negateVar <- lookupOcc negateName >>= repVar @@ -468,8 +494,14 @@ repE (ExplicitPArr ty es) = repE (ExplicitTuple es boxed) | isBoxed boxed = do { xs <- repEs es; repTup xs } | otherwise = panic "DsMeta.repE: Can't represent unboxed tuples" -repE (RecordConOut _ _ _) = panic "DsMeta.repE: No record construction yet" -repE (RecordUpdOut _ _ _ _) = panic "DsMeta.repE: No record update yet" +repE (RecordCon c flds) + = do { x <- lookupOcc c; + fs <- repFields flds; + repRecCon x fs } +repE (RecordUpd e flds) + = do { x <- repE e; + fs <- repFields flds; + repRecUpd x fs } repE (ExprWithTySig e ty) = do { e1 <- repE e; t1 <- repTy ty; repSigExp e1 t1 } repE (ArithSeqIn aseq) = @@ -489,7 +521,7 @@ repE (ArithSeqIn aseq) = ds3 <- repE e3 repFromThenTo ds1 ds2 ds3 repE (PArrSeqOut _ aseq) = panic "DsMeta.repE: parallel array seq.s missing" -repE (HsCCall _ _ _ _ _) = panic "DsMeta.repE: Can't represent __ccall__" +repE (HsCoreAnn _ _) = panic "DsMeta.repE: Can't represent CoreAnn" -- hdaume: core annotations repE (HsSCC _ _) = panic "DsMeta.repE: Can't represent SCC" repE (HsBracketOut _ _) = panic "DsMeta.repE: Can't represent Oxford brackets" @@ -505,9 +537,9 @@ repE e = ----------------------------------------------------------------------------- -- Building representations of auxillary structures like Match, Clause, Stmt, -repMatchTup :: Match Name -> DsM (Core M.Mtch) +repMatchTup :: Match Name -> DsM (Core M.MatchQ) repMatchTup (Match [p] ty (GRHSs guards wheres ty2)) = - do { ss1 <- mkGenSyms (collectPatBinders p) + do { let ss1 = mkGenSyms (collectPatBinders p) ; addBinds ss1 $ do { ; p1 <- repP p ; (ss2,ds) <- repBinds wheres @@ -516,9 +548,9 @@ repMatchTup (Match [p] ty (GRHSs guards wheres ty2)) = ; match <- repMatch p1 gs ds ; wrapGenSyns (ss1++ss2) match }}} -repClauseTup :: Match Name -> DsM (Core M.Clse) +repClauseTup :: Match Name -> DsM (Core M.ClauseQ) repClauseTup (Match ps ty (GRHSs guards wheres ty2)) = - do { ss1 <- mkGenSyms (collectPatsBinders ps) + do { let ss1 = mkGenSyms (collectPatsBinders ps) ; addBinds ss1 $ do { ps1 <- repPs ps ; (ss2,ds) <- repBinds wheres @@ -527,7 +559,7 @@ repClauseTup (Match ps ty (GRHSs guards wheres ty2)) = ; clause <- repClause ps1 gs ds ; wrapGenSyns (ss1++ss2) clause }}} -repGuards :: [GRHS Name] -> DsM (Core M.Rihs) +repGuards :: [GRHS Name] -> DsM (Core M.BodyQ) repGuards [GRHS [ResultStmt e loc] loc2] = do {a <- repE e; repNormal a } repGuards other @@ -538,10 +570,17 @@ repGuards other = do { x <- repE e1; y <- repE e2; return (x, y) } process other = panic "Non Haskell 98 guarded body" +repFields :: [(Name,HsExpr Name)] -> DsM (Core [M.FieldExp]) +repFields flds = do + fnames <- mapM lookupOcc (map fst flds) + es <- mapM repE (map snd flds) + fs <- zipWithM (\n x -> rep2 fieldExpName [unC n, unC x]) fnames es + coreList fieldExpTyConName fs + ----------------------------------------------------------------------------- -- Representing Stmt's is tricky, especially if bound variables --- shaddow each other. Consider: [| do { x <- f 1; x <- f x; g x } |] +-- shadow each other. Consider: [| do { x <- f 1; x <- f x; g x } |] -- First gensym new names for every variable in any of the patterns. -- both static (x'1 and x'2), and dynamic ((gensym "x") and (gensym "y")) -- if variables didn't shaddow, the static gensym wouldn't be necessary @@ -564,14 +603,14 @@ repGuards other -- The helper function repSts computes the translation of each sub expression -- and a bunch of prefix bindings denoting the dynamic renaming. -repSts :: [Stmt Name] -> DsM ([GenSymBind], [Core M.Stmt]) +repSts :: [Stmt Name] -> DsM ([GenSymBind], [Core M.StmtQ]) repSts [ResultStmt e loc] = do { a <- repE e ; e1 <- repNoBindSt a ; return ([], [e1]) } repSts (BindStmt p e loc : ss) = do { e2 <- repE e - ; ss1 <- mkGenSyms (collectPatBinders p) + ; let ss1 = mkGenSyms (collectPatBinders p) ; addBinds ss1 $ do { ; p1 <- repP p; ; (ss2,zs) <- repSts ss @@ -594,65 +633,81 @@ repSts other = panic "Exotic Stmt in meta brackets" -- Bindings ----------------------------------------------------------- -repBinds :: HsBinds Name -> DsM ([GenSymBind], Core [M.Decl]) +repBinds :: HsBinds Name -> DsM ([GenSymBind], Core [M.DecQ]) repBinds decs - = do { let { bndrs = collectHsBinders decs } ; - ss <- mkGenSyms bndrs ; - core <- addBinds ss (rep_binds decs) ; - core_list <- coreList declTyConName core ; - return (ss, core_list) } - -rep_binds :: HsBinds Name -> DsM [Core M.Decl] -rep_binds EmptyBinds = return [] -rep_binds (ThenBinds x y) - = do { core1 <- rep_binds x - ; core2 <- rep_binds y + = do { let { bndrs = collectHsBinders decs } + -- No need to worrry about detailed scopes within + -- the binding group, because we are talking Names + -- here, so we can safely treat it as a mutually + -- recursive group + ; let ss = mkGenSyms bndrs + ; core <- addBinds ss (rep_binds decs) + ; core_list <- coreList decQTyConName core + ; return (ss, core_list) } + +rep_binds :: HsBinds Name -> DsM [Core M.DecQ] +-- Assumes: all the binders of the binding are alrady in the meta-env +rep_binds binds = do locs_cores <- rep_binds' binds + return $ de_loc $ sort_by_loc locs_cores + +rep_binds' :: HsBinds Name -> DsM [(SrcLoc, Core M.DecQ)] +-- Assumes: all the binders of the binding are alrady in the meta-env +rep_binds' EmptyBinds = return [] +rep_binds' (ThenBinds x y) + = do { core1 <- rep_binds' x + ; core2 <- rep_binds' y ; return (core1 ++ core2) } -rep_binds (MonoBind bs sigs _) - = do { core1 <- rep_monobind bs - ; core2 <- rep_sigs sigs +rep_binds' (MonoBind bs sigs _) + = do { core1 <- rep_monobind' bs + ; core2 <- rep_sigs' sigs ; return (core1 ++ core2) } -rep_binds (IPBinds _ _) +rep_binds' (IPBinds _) = panic "DsMeta:repBinds: can't do implicit parameters" -rep_monobind :: MonoBinds Name -> DsM [Core M.Decl] -rep_monobind EmptyMonoBinds = return [] -rep_monobind (AndMonoBinds x y) = do { x1 <- rep_monobind x; - y1 <- rep_monobind y; +rep_monobind :: MonoBinds Name -> DsM [Core M.DecQ] +-- Assumes: all the binders of the binding are alrady in the meta-env +rep_monobind binds = do locs_cores <- rep_monobind' binds + return $ de_loc $ sort_by_loc locs_cores + +rep_monobind' :: MonoBinds Name -> DsM [(SrcLoc, Core M.DecQ)] +-- Assumes: all the binders of the binding are alrady in the meta-env +rep_monobind' EmptyMonoBinds = return [] +rep_monobind' (AndMonoBinds x y) = do { x1 <- rep_monobind' x; + y1 <- rep_monobind' y; return (x1 ++ y1) } -- Note GHC treats declarations of a variable (not a pattern) -- e.g. x = g 5 as a Fun MonoBinds. This is indicated by a single match -- with an empty list of patterns -rep_monobind (FunMonoBind fn infx [Match [] ty (GRHSs guards wheres ty2)] loc) +rep_monobind' (FunMonoBind fn infx [Match [] ty (GRHSs guards wheres ty2)] loc) = do { (ss,wherecore) <- repBinds wheres ; guardcore <- addBinds ss (repGuards guards) ; fn' <- lookupBinder fn ; p <- repPvar fn' ; ans <- repVal p guardcore wherecore - ; return [ans] } + ; return [(loc, ans)] } -rep_monobind (FunMonoBind fn infx ms loc) +rep_monobind' (FunMonoBind fn infx ms loc) = do { ms1 <- mapM repClauseTup ms ; fn' <- lookupBinder fn ; ans <- repFun fn' (nonEmptyCoreList ms1) - ; return [ans] } + ; return [(loc, ans)] } -rep_monobind (PatMonoBind pat (GRHSs guards wheres ty2) loc) +rep_monobind' (PatMonoBind pat (GRHSs guards wheres ty2) loc) = do { patcore <- repP pat ; (ss,wherecore) <- repBinds wheres ; guardcore <- addBinds ss (repGuards guards) ; ans <- repVal patcore guardcore wherecore - ; return [ans] } + ; return [(loc, ans)] } -rep_monobind (VarMonoBind v e) +rep_monobind' (VarMonoBind v e) = do { v' <- lookupBinder v ; e2 <- repE e ; x <- repNormal e2 ; patcore <- repPvar v' - ; empty_decls <- coreList declTyConName [] + ; empty_decls <- coreList decQTyConName [] ; ans <- repVal patcore x empty_decls - ; return [ans] } + ; return [(getSrcLoc v, ans)] } ----------------------------------------------------------------------------- -- Since everything in a MonoBind is mutually recursive we need rename all @@ -678,11 +733,11 @@ rep_monobind (VarMonoBind v e) -- Haskell Template's Meta.Exp type so we punt if it isn't a simple thing like -- (\ p1 .. pn -> exp) by causing an error. -repLambda :: Match Name -> DsM (Core M.Expr) +repLambda :: Match Name -> DsM (Core M.ExpQ) repLambda (Match ps _ (GRHSs [GRHS [ResultStmt e _ ] _ ] EmptyBinds _)) = do { let bndrs = collectPatsBinders ps ; - ; ss <- mkGenSyms bndrs + ; let ss = mkGenSyms bndrs ; lam <- addBinds ss ( do { xs <- repPs ps; body <- repE e; repLam xs body }) ; wrapGenSyns ss lam } @@ -698,64 +753,66 @@ repLambda z = panic "Can't represent a guarded lambda in Template Haskell" -- variable should already appear in the environment. -- Process a list of patterns -repPs :: [Pat Name] -> DsM (Core [M.Patt]) +repPs :: [Pat Name] -> DsM (Core [M.Pat]) repPs ps = do { ps' <- mapM repP ps ; - coreList pattTyConName ps' } + coreList patTyConName ps' } -repP :: Pat Name -> DsM (Core M.Patt) +repP :: Pat Name -> DsM (Core M.Pat) repP (WildPat _) = repPwild repP (LitPat l) = do { l2 <- repLiteral l; repPlit l2 } repP (VarPat x) = do { x' <- lookupBinder x; repPvar x' } repP (LazyPat p) = do { p1 <- repP p; repPtilde p1 } repP (AsPat x p) = do { x' <- lookupBinder x; p1 <- repP p; repPaspat x' p1 } repP (ParPat p) = repP p -repP (ListPat ps _) = repListPat ps +repP (ListPat ps _) = do { qs <- repPs ps; repPlist qs } repP (TuplePat ps _) = do { qs <- repPs ps; repPtup qs } repP (ConPatIn dc details) = do { con_str <- lookupOcc dc ; case details of PrefixCon ps -> do { qs <- repPs ps; repPcon con_str qs } - RecCon pairs -> error "No records in template haskell yet" + RecCon pairs -> do { vs <- sequence $ map lookupOcc (map fst pairs) + ; ps <- sequence $ map repP (map snd pairs) + ; fps <- zipWithM (\x y -> rep2 fieldPatName [unC x,unC y]) vs ps + ; fps' <- coreList fieldPatTyConName fps + ; repPrec con_str fps' } InfixCon p1 p2 -> do { qs <- repPs [p1,p2]; repPcon con_str qs } } repP (NPatIn l (Just _)) = panic "Can't cope with negative overloaded patterns yet (repP (NPatIn _ (Just _)))" repP (NPatIn l Nothing) = do { a <- repOverloadedLiteral l; repPlit a } repP other = panic "Exotic pattern inside meta brackets" -repListPat :: [Pat Name] -> DsM (Core M.Patt) -repListPat [] = do { nil_con <- coreStringLit "[]" - ; nil_args <- coreList pattTyConName [] - ; repPcon nil_con nil_args } -repListPat (p:ps) = do { p2 <- repP p - ; ps2 <- repListPat ps - ; cons_con <- coreStringLit ":" - ; repPcon cons_con (nonEmptyCoreList [p2,ps2]) } +---------------------------------------------------------- +-- Declaration ordering helpers + +sort_by_loc :: [(SrcLoc, a)] -> [(SrcLoc, a)] +sort_by_loc xs = sortBy comp xs + where comp x y = compare (fst x) (fst y) +de_loc :: [(SrcLoc, a)] -> [a] +de_loc = map snd ---------------------------------------------------------- -- The meta-environment -- A name/identifier association for fresh names of locally bound entities --- type GenSymBind = (Name, Id) -- Gensym the string and bind it to the Id -- I.e. (x, x_id) means -- let x_id = gensym "x" in ... -- Generate a fresh name for a locally bound entity --- -mkGenSym :: Name -> DsM GenSymBind -mkGenSym nm = do { id <- newUniqueId nm stringTy; return (nm,id) } + +mkGenSym :: Name -> GenSymBind +mkGenSym nm = (nm, mkLocalId nm stringTy) -- Ditto for a list of names -- -mkGenSyms :: [Name] -> DsM [GenSymBind] -mkGenSyms ns = mapM mkGenSym ns +mkGenSyms :: [Name] -> [GenSymBind] +mkGenSyms ns = map mkGenSym ns --- Add a list of fresh names for locally bound entities to the meta --- environment (which is part of the state carried around by the desugarer --- monad) --- addBinds :: [GenSymBind] -> DsM a -> DsM a +-- Add a list of fresh names for locally bound entities to the +-- meta environment (which is part of the state carried around +-- by the desugarer monad) addBinds bs m = dsExtendMetaEnv (mkNameEnv [(n,Bound id) | (n,id) <- bs]) m -- Look up a locally bound name @@ -792,18 +849,18 @@ globalVar n = coreStringLit (name_mod ++ ":" ++ name_occ) localVar :: Name -> DsM (Core String) localVar n = coreStringLit (occNameUserString (nameOccName n)) -lookupType :: Name -- Name of type constructor (e.g. M.Expr) +lookupType :: Name -- Name of type constructor (e.g. M.ExpQ) -> DsM Type -- The type lookupType tc_name = do { tc <- dsLookupTyCon tc_name ; return (mkGenTyConApp tc []) } +wrapGenSyns :: [GenSymBind] + -> Core (M.Q a) -> DsM (Core (M.Q a)) -- wrapGenSyns [(nm1,id1), (nm2,id2)] y -- --> bindQ (gensym nm1) (\ id1 -> -- bindQ (gensym nm2 (\ id2 -> -- y)) -wrapGenSyns :: [GenSymBind] - -> Core (M.Q a) -> DsM (Core (M.Q a)) wrapGenSyns binds body@(MkC b) = go binds where @@ -821,8 +878,10 @@ wrapGenSyns binds body@(MkC b) gensym_app (MkC (Lam id body')) } -- Just like wrapGenSym, but don't actually do the gensym --- Instead use the existing name --- Only used for [Decl] +-- Instead use the existing name: +-- let x = "x" in ... +-- Only used for [Decl], and for the class ops in class +-- and instance decls wrapNongenSyms :: [GenSymBind] -> Core a -> DsM (Core a) wrapNongenSyms binds (MkC body) = do { binds' <- mapM do_one binds ; @@ -866,174 +925,207 @@ rep2 n xs = do { id <- dsLookupGlobalId n -- %********************************************************************* --------------- Patterns ----------------- -repPlit :: Core M.Lit -> DsM (Core M.Patt) -repPlit (MkC l) = rep2 plitName [l] +repPlit :: Core M.Lit -> DsM (Core M.Pat) +repPlit (MkC l) = rep2 litPName [l] -repPvar :: Core String -> DsM (Core M.Patt) -repPvar (MkC s) = rep2 pvarName [s] +repPvar :: Core String -> DsM (Core M.Pat) +repPvar (MkC s) = rep2 varPName [s] -repPtup :: Core [M.Patt] -> DsM (Core M.Patt) -repPtup (MkC ps) = rep2 ptupName [ps] +repPtup :: Core [M.Pat] -> DsM (Core M.Pat) +repPtup (MkC ps) = rep2 tupPName [ps] -repPcon :: Core String -> Core [M.Patt] -> DsM (Core M.Patt) -repPcon (MkC s) (MkC ps) = rep2 pconName [s, ps] +repPcon :: Core String -> Core [M.Pat] -> DsM (Core M.Pat) +repPcon (MkC s) (MkC ps) = rep2 conPName [s, ps] -repPtilde :: Core M.Patt -> DsM (Core M.Patt) -repPtilde (MkC p) = rep2 ptildeName [p] +repPrec :: Core String -> Core [(String,M.Pat)] -> DsM (Core M.Pat) +repPrec (MkC c) (MkC rps) = rep2 recPName [c,rps] -repPaspat :: Core String -> Core M.Patt -> DsM (Core M.Patt) -repPaspat (MkC s) (MkC p) = rep2 paspatName [s, p] +repPtilde :: Core M.Pat -> DsM (Core M.Pat) +repPtilde (MkC p) = rep2 tildePName [p] -repPwild :: DsM (Core M.Patt) -repPwild = rep2 pwildName [] +repPaspat :: Core String -> Core M.Pat -> DsM (Core M.Pat) +repPaspat (MkC s) (MkC p) = rep2 asPName [s, p] + +repPwild :: DsM (Core M.Pat) +repPwild = rep2 wildPName [] + +repPlist :: Core [M.Pat] -> DsM (Core M.Pat) +repPlist (MkC ps) = rep2 listPName [ps] --------------- Expressions ----------------- -repVarOrCon :: Name -> Core String -> DsM (Core M.Expr) +repVarOrCon :: Name -> Core String -> DsM (Core M.ExpQ) repVarOrCon vc str | isDataOcc (nameOccName vc) = repCon str | otherwise = repVar str -repVar :: Core String -> DsM (Core M.Expr) -repVar (MkC s) = rep2 varName [s] +repVar :: Core String -> DsM (Core M.ExpQ) +repVar (MkC s) = rep2 varEName [s] -repCon :: Core String -> DsM (Core M.Expr) -repCon (MkC s) = rep2 conName [s] +repCon :: Core String -> DsM (Core M.ExpQ) +repCon (MkC s) = rep2 conEName [s] -repLit :: Core M.Lit -> DsM (Core M.Expr) -repLit (MkC c) = rep2 litName [c] +repLit :: Core M.Lit -> DsM (Core M.ExpQ) +repLit (MkC c) = rep2 litEName [c] -repApp :: Core M.Expr -> Core M.Expr -> DsM (Core M.Expr) -repApp (MkC x) (MkC y) = rep2 appName [x,y] +repApp :: Core M.ExpQ -> Core M.ExpQ -> DsM (Core M.ExpQ) +repApp (MkC x) (MkC y) = rep2 appEName [x,y] -repLam :: Core [M.Patt] -> Core M.Expr -> DsM (Core M.Expr) -repLam (MkC ps) (MkC e) = rep2 lamName [ps, e] +repLam :: Core [M.Pat] -> Core M.ExpQ -> DsM (Core M.ExpQ) +repLam (MkC ps) (MkC e) = rep2 lamEName [ps, e] -repTup :: Core [M.Expr] -> DsM (Core M.Expr) -repTup (MkC es) = rep2 tupName [es] +repTup :: Core [M.ExpQ] -> DsM (Core M.ExpQ) +repTup (MkC es) = rep2 tupEName [es] -repCond :: Core M.Expr -> Core M.Expr -> Core M.Expr -> DsM (Core M.Expr) -repCond (MkC x) (MkC y) (MkC z) = rep2 condName [x,y,z] +repCond :: Core M.ExpQ -> Core M.ExpQ -> Core M.ExpQ -> DsM (Core M.ExpQ) +repCond (MkC x) (MkC y) (MkC z) = rep2 condEName [x,y,z] -repLetE :: Core [M.Decl] -> Core M.Expr -> DsM (Core M.Expr) +repLetE :: Core [M.DecQ] -> Core M.ExpQ -> DsM (Core M.ExpQ) repLetE (MkC ds) (MkC e) = rep2 letEName [ds, e] -repCaseE :: Core M.Expr -> Core [M.Mtch] -> DsM( Core M.Expr) +repCaseE :: Core M.ExpQ -> Core [M.MatchQ] -> DsM( Core M.ExpQ) repCaseE (MkC e) (MkC ms) = rep2 caseEName [e, ms] -repDoE :: Core [M.Stmt] -> DsM (Core M.Expr) +repDoE :: Core [M.StmtQ] -> DsM (Core M.ExpQ) repDoE (MkC ss) = rep2 doEName [ss] -repComp :: Core [M.Stmt] -> DsM (Core M.Expr) -repComp (MkC ss) = rep2 compName [ss] +repComp :: Core [M.StmtQ] -> DsM (Core M.ExpQ) +repComp (MkC ss) = rep2 compEName [ss] + +repListExp :: Core [M.ExpQ] -> DsM (Core M.ExpQ) +repListExp (MkC es) = rep2 listEName [es] -repListExp :: Core [M.Expr] -> DsM (Core M.Expr) -repListExp (MkC es) = rep2 listExpName [es] +repSigExp :: Core M.ExpQ -> Core M.TypeQ -> DsM (Core M.ExpQ) +repSigExp (MkC e) (MkC t) = rep2 sigEName [e,t] -repSigExp :: Core M.Expr -> Core M.Type -> DsM (Core M.Expr) -repSigExp (MkC e) (MkC t) = rep2 sigExpName [e,t] +repRecCon :: Core String -> Core [M.FieldExp]-> DsM (Core M.ExpQ) +repRecCon (MkC c) (MkC fs) = rep2 recCName [c,fs] -repInfixApp :: Core M.Expr -> Core String -> Core M.Expr -> DsM (Core M.Expr) +repRecUpd :: Core M.ExpQ -> Core [M.FieldExp] -> DsM (Core M.ExpQ) +repRecUpd (MkC e) (MkC fs) = rep2 recUpdEName [e,fs] + +repInfixApp :: Core M.ExpQ -> Core M.ExpQ -> Core M.ExpQ -> DsM (Core M.ExpQ) repInfixApp (MkC x) (MkC y) (MkC z) = rep2 infixAppName [x,y,z] -repSectionL :: Core M.Expr -> Core M.Expr -> DsM (Core M.Expr) -repSectionL (MkC x) (MkC y) = rep2 infixAppName [x,y] +repSectionL :: Core M.ExpQ -> Core M.ExpQ -> DsM (Core M.ExpQ) +repSectionL (MkC x) (MkC y) = rep2 sectionLName [x,y] -repSectionR :: Core M.Expr -> Core M.Expr -> DsM (Core M.Expr) -repSectionR (MkC x) (MkC y) = rep2 infixAppName [x,y] +repSectionR :: Core M.ExpQ -> Core M.ExpQ -> DsM (Core M.ExpQ) +repSectionR (MkC x) (MkC y) = rep2 sectionRName [x,y] ------------ Right hand sides (guarded expressions) ---- -repGuarded :: Core [(M.Expr, M.Expr)] -> DsM (Core M.Rihs) -repGuarded (MkC pairs) = rep2 guardedName [pairs] +repGuarded :: Core [(M.ExpQ, M.ExpQ)] -> DsM (Core M.BodyQ) +repGuarded (MkC pairs) = rep2 guardedBName [pairs] -repNormal :: Core M.Expr -> DsM (Core M.Rihs) -repNormal (MkC e) = rep2 normalName [e] +repNormal :: Core M.ExpQ -> DsM (Core M.BodyQ) +repNormal (MkC e) = rep2 normalBName [e] -------------- Statements ------------------- -repBindSt :: Core M.Patt -> Core M.Expr -> DsM (Core M.Stmt) -repBindSt (MkC p) (MkC e) = rep2 bindStName [p,e] +------------- Stmts ------------------- +repBindSt :: Core M.Pat -> Core M.ExpQ -> DsM (Core M.StmtQ) +repBindSt (MkC p) (MkC e) = rep2 bindSName [p,e] -repLetSt :: Core [M.Decl] -> DsM (Core M.Stmt) -repLetSt (MkC ds) = rep2 letStName [ds] +repLetSt :: Core [M.DecQ] -> DsM (Core M.StmtQ) +repLetSt (MkC ds) = rep2 letSName [ds] -repNoBindSt :: Core M.Expr -> DsM (Core M.Stmt) -repNoBindSt (MkC e) = rep2 noBindStName [e] +repNoBindSt :: Core M.ExpQ -> DsM (Core M.StmtQ) +repNoBindSt (MkC e) = rep2 noBindSName [e] --------------- DotDot (Arithmetic sequences) ----------- -repFrom :: Core M.Expr -> DsM (Core M.Expr) -repFrom (MkC x) = rep2 fromName [x] +-------------- Range (Arithmetic sequences) ----------- +repFrom :: Core M.ExpQ -> DsM (Core M.ExpQ) +repFrom (MkC x) = rep2 fromEName [x] -repFromThen :: Core M.Expr -> Core M.Expr -> DsM (Core M.Expr) -repFromThen (MkC x) (MkC y) = rep2 fromThenName [x,y] +repFromThen :: Core M.ExpQ -> Core M.ExpQ -> DsM (Core M.ExpQ) +repFromThen (MkC x) (MkC y) = rep2 fromThenEName [x,y] -repFromTo :: Core M.Expr -> Core M.Expr -> DsM (Core M.Expr) -repFromTo (MkC x) (MkC y) = rep2 fromToName [x,y] +repFromTo :: Core M.ExpQ -> Core M.ExpQ -> DsM (Core M.ExpQ) +repFromTo (MkC x) (MkC y) = rep2 fromToEName [x,y] -repFromThenTo :: Core M.Expr -> Core M.Expr -> Core M.Expr -> DsM (Core M.Expr) -repFromThenTo (MkC x) (MkC y) (MkC z) = rep2 fromThenToName [x,y,z] +repFromThenTo :: Core M.ExpQ -> Core M.ExpQ -> Core M.ExpQ -> DsM (Core M.ExpQ) +repFromThenTo (MkC x) (MkC y) (MkC z) = rep2 fromThenToEName [x,y,z] ------------ Match and Clause Tuples ----------- -repMatch :: Core M.Patt -> Core M.Rihs -> Core [M.Decl] -> DsM (Core M.Mtch) +repMatch :: Core M.Pat -> Core M.BodyQ -> Core [M.DecQ] -> DsM (Core M.MatchQ) repMatch (MkC p) (MkC bod) (MkC ds) = rep2 matchName [p, bod, ds] -repClause :: Core [M.Patt] -> Core M.Rihs -> Core [M.Decl] -> DsM (Core M.Clse) +repClause :: Core [M.Pat] -> Core M.BodyQ -> Core [M.DecQ] -> DsM (Core M.ClauseQ) repClause (MkC ps) (MkC bod) (MkC ds) = rep2 clauseName [ps, bod, ds] -------------- Dec ----------------------------- -repVal :: Core M.Patt -> Core M.Rihs -> Core [M.Decl] -> DsM (Core M.Decl) -repVal (MkC p) (MkC b) (MkC ds) = rep2 valName [p, b, ds] +repVal :: Core M.Pat -> Core M.BodyQ -> Core [M.DecQ] -> DsM (Core M.DecQ) +repVal (MkC p) (MkC b) (MkC ds) = rep2 valDName [p, b, ds] + +repFun :: Core String -> Core [M.ClauseQ] -> DsM (Core M.DecQ) +repFun (MkC nm) (MkC b) = rep2 funDName [nm, b] -repFun :: Core String -> Core [M.Clse] -> DsM (Core M.Decl) -repFun (MkC nm) (MkC b) = rep2 funName [nm, b] +repData :: Core M.CxtQ -> Core String -> Core [String] -> Core [M.ConQ] -> Core [String] -> DsM (Core M.DecQ) +repData (MkC cxt) (MkC nm) (MkC tvs) (MkC cons) (MkC derivs) + = rep2 dataDName [cxt, nm, tvs, cons, derivs] -repData :: Core String -> Core [String] -> Core [M.Cons] -> Core [String] -> DsM (Core M.Decl) -repData (MkC nm) (MkC tvs) (MkC cons) (MkC derivs) = rep2 dataDName [nm, tvs, cons, derivs] +repNewtype :: Core M.CxtQ -> Core String -> Core [String] -> Core M.ConQ -> Core [String] -> DsM (Core M.DecQ) +repNewtype (MkC cxt) (MkC nm) (MkC tvs) (MkC con) (MkC derivs) + = rep2 newtypeDName [cxt, nm, tvs, con, derivs] -repTySyn :: Core String -> Core [String] -> Core M.Type -> DsM (Core M.Decl) +repTySyn :: Core String -> Core [String] -> Core M.TypeQ -> DsM (Core M.DecQ) repTySyn (MkC nm) (MkC tvs) (MkC rhs) = rep2 tySynDName [nm, tvs, rhs] -repInst :: Core M.Ctxt -> Core M.Type -> Core [M.Decl] -> DsM (Core M.Decl) -repInst (MkC cxt) (MkC ty) (MkC ds) = rep2 instName [cxt, ty, ds] +repInst :: Core M.CxtQ -> Core M.TypeQ -> Core [M.DecQ] -> DsM (Core M.DecQ) +repInst (MkC cxt) (MkC ty) (MkC ds) = rep2 instanceDName [cxt, ty, ds] -repClass :: Core M.Ctxt -> Core String -> Core [String] -> Core [M.Decl] -> DsM (Core M.Decl) +repClass :: Core M.CxtQ -> Core String -> Core [String] -> Core [M.DecQ] -> DsM (Core M.DecQ) repClass (MkC cxt) (MkC cls) (MkC tvs) (MkC ds) = rep2 classDName [cxt, cls, tvs, ds] -repProto :: Core String -> Core M.Type -> DsM (Core M.Decl) -repProto (MkC s) (MkC ty) = rep2 protoName [s, ty] - -repCtxt :: Core [M.Type] -> DsM (Core M.Ctxt) -repCtxt (MkC tys) = rep2 ctxtName [tys] - -repConstr :: Core String -> Core [M.Type] -> DsM (Core M.Cons) -repConstr (MkC con) (MkC tys) = rep2 constrName [con, tys] +repProto :: Core String -> Core M.TypeQ -> DsM (Core M.DecQ) +repProto (MkC s) (MkC ty) = rep2 sigDName [s, ty] + +repCtxt :: Core [M.TypeQ] -> DsM (Core M.CxtQ) +repCtxt (MkC tys) = rep2 cxtName [tys] + +repConstr :: Core String -> HsConDetails Name (BangType Name) + -> DsM (Core M.ConQ) +repConstr con (PrefixCon ps) + = do arg_tys <- mapM repBangTy ps + arg_tys1 <- coreList strictTypeQTyConName arg_tys + rep2 normalCName [unC con, unC arg_tys1] +repConstr con (RecCon ips) + = do arg_vs <- mapM lookupOcc (map fst ips) + arg_tys <- mapM repBangTy (map snd ips) + arg_vtys <- zipWithM (\x y -> rep2 varStrictTypeName [unC x, unC y]) + arg_vs arg_tys + arg_vtys' <- coreList varStrictTypeQTyConName arg_vtys + rep2 recCName [unC con, unC arg_vtys'] +repConstr con (InfixCon st1 st2) + = do arg1 <- repBangTy st1 + arg2 <- repBangTy st2 + rep2 infixCName [unC arg1, unC con, unC arg2] ------------ Types ------------------- -repTForall :: Core [String] -> Core M.Ctxt -> Core M.Type -> DsM (Core M.Type) -repTForall (MkC tvars) (MkC ctxt) (MkC ty) = rep2 tforallName [tvars, ctxt, ty] +repTForall :: Core [String] -> Core M.CxtQ -> Core M.TypeQ -> DsM (Core M.TypeQ) +repTForall (MkC tvars) (MkC ctxt) (MkC ty) + = rep2 forallTName [tvars, ctxt, ty] -repTvar :: Core String -> DsM (Core M.Type) -repTvar (MkC s) = rep2 tvarName [s] +repTvar :: Core String -> DsM (Core M.TypeQ) +repTvar (MkC s) = rep2 varTName [s] -repTapp :: Core M.Type -> Core M.Type -> DsM (Core M.Type) -repTapp (MkC t1) (MkC t2) = rep2 tappName [t1,t2] +repTapp :: Core M.TypeQ -> Core M.TypeQ -> DsM (Core M.TypeQ) +repTapp (MkC t1) (MkC t2) = rep2 appTName [t1,t2] -repTapps :: Core M.Type -> [Core M.Type] -> DsM (Core M.Type) +repTapps :: Core M.TypeQ -> [Core M.TypeQ] -> DsM (Core M.TypeQ) repTapps f [] = return f repTapps f (t:ts) = do { f1 <- repTapp f t; repTapps f1 ts } --------- Type constructors -------------- -repNamedTyCon :: Core String -> DsM (Core M.Type) -repNamedTyCon (MkC s) = rep2 namedTyConName [s] +repNamedTyCon :: Core String -> DsM (Core M.TypeQ) +repNamedTyCon (MkC s) = rep2 conTName [s] -repTupleTyCon :: Int -> DsM (Core M.Type) +repTupleTyCon :: Int -> DsM (Core M.TypeQ) -- Note: not Core Int; it's easier to be direct here -repTupleTyCon i = rep2 tupleTyConName [mkIntExpr (fromIntegral i)] +repTupleTyCon i = rep2 tupleTName [mkIntExpr (fromIntegral i)] -repArrowTyCon :: DsM (Core M.Type) -repArrowTyCon = rep2 arrowTyConName [] +repArrowTyCon :: DsM (Core M.TypeQ) +repArrowTyCon = rep2 arrowTName [] -repListTyCon :: DsM (Core M.Type) -repListTyCon = rep2 listTyConName [] +repListTyCon :: DsM (Core M.TypeQ) +repListTyCon = rep2 listTName [] ---------------------------------------------------------- @@ -1041,28 +1133,43 @@ repListTyCon = rep2 listTyConName [] repLiteral :: HsLit -> DsM (Core M.Lit) repLiteral lit - = do { lit_expr <- dsLit lit; rep2 lit_name [lit_expr] } + = do lit' <- case lit of + HsIntPrim i -> mk_integer i + HsInt i -> mk_integer i + HsFloatPrim r -> mk_rational r + HsDoublePrim r -> mk_rational r + _ -> return lit + lit_expr <- dsLit lit' + rep2 lit_name [lit_expr] where lit_name = case lit of - HsInteger _ -> integerLName - HsChar _ -> charLName - HsString _ -> stringLName - HsRat _ _ -> rationalLName - other -> uh_oh + HsInteger _ _ -> integerLName + HsInt _ -> integerLName + HsIntPrim _ -> intPrimLName + HsFloatPrim _ -> floatPrimLName + HsDoublePrim _ -> doublePrimLName + HsChar _ -> charLName + HsString _ -> stringLName + HsRat _ _ -> rationalLName + other -> uh_oh uh_oh = pprPanic "DsMeta.repLiteral: trying to represent exotic literal" (ppr lit) +mk_integer i = do integer_ty <- lookupType integerTyConName + return $ HsInteger i integer_ty +mk_rational r = do rat_ty <- lookupType rationalTyConName + return $ HsRat r rat_ty + repOverloadedLiteral :: HsOverLit -> DsM (Core M.Lit) -repOverloadedLiteral (HsIntegral i _) = repLiteral (HsInteger i) -repOverloadedLiteral (HsFractional f _) = do { rat_ty <- lookupType rationalTyConName ; - repLiteral (HsRat f rat_ty) } +repOverloadedLiteral (HsIntegral i _) = do { lit <- mk_integer i; repLiteral lit } +repOverloadedLiteral (HsFractional f _) = do { lit <- mk_rational f; repLiteral lit } -- The type Rational will be in the environment, becuase -- the smart constructor 'THSyntax.rationalL' uses it in its type, -- and rationalL is sucked in when any TH stuff is used --------------- Miscellaneous ------------------- -repLift :: Core e -> DsM (Core M.Expr) +repLift :: Core e -> DsM (Core M.ExpQ) repLift (MkC x) = rep2 liftName [x] repGensym :: Core String -> DsM (Core (M.Q String)) @@ -1118,231 +1225,337 @@ coreVar id = MkC (Var id) -- 2) Make a "Name" -- 3) Add the name to knownKeyNames -templateHaskellNames :: NameSet +templateHaskellNames :: [Name] -- The names that are implicitly mentioned by ``bracket'' -- Should stay in sync with the import list of DsMeta -templateHaskellNames - = mkNameSet [ integerLName,charLName, stringLName, rationalLName, - plitName, pvarName, ptupName, - pconName, ptildeName, paspatName, pwildName, - varName, conName, litName, appName, infixEName, lamName, - tupName, doEName, compName, - listExpName, sigExpName, condName, letEName, caseEName, - infixAppName, sectionLName, sectionRName, - guardedName, normalName, - bindStName, letStName, noBindStName, parStName, - fromName, fromThenName, fromToName, fromThenToName, - funName, valName, liftName, - gensymName, returnQName, bindQName, sequenceQName, - matchName, clauseName, funName, valName, tySynDName, dataDName, classDName, - instName, protoName, tforallName, tvarName, tconName, tappName, - arrowTyConName, tupleTyConName, listTyConName, namedTyConName, - ctxtName, constrName, - exprTyConName, declTyConName, pattTyConName, mtchTyConName, - clseTyConName, stmtTyConName, consTyConName, typeTyConName, - qTyConName, expTyConName, matTyConName, clsTyConName, - decTyConName, typTyConName ] +templateHaskellNames = [ + returnQName, bindQName, sequenceQName, gensymName, liftName, + -- Lit + charLName, stringLName, integerLName, intPrimLName, + floatPrimLName, doublePrimLName, rationalLName, + -- Pat + litPName, varPName, tupPName, conPName, tildePName, + asPName, wildPName, recPName, listPName, + -- FieldPat + fieldPatName, + -- Match + matchName, + -- Clause + clauseName, + -- Exp + varEName, conEName, litEName, appEName, infixEName, + infixAppName, sectionLName, sectionRName, lamEName, tupEName, + condEName, letEName, caseEName, doEName, compEName, + fromEName, fromThenEName, fromToEName, fromThenToEName, + listEName, sigEName, recConEName, recUpdEName, + -- FieldExp + fieldExpName, + -- Body + guardedBName, normalBName, + -- Stmt + bindSName, letSName, noBindSName, parSName, + -- Dec + funDName, valDName, dataDName, newtypeDName, tySynDName, + classDName, instanceDName, sigDName, + -- Cxt + cxtName, + -- Strict + isStrictName, notStrictName, + -- Con + normalCName, recCName, infixCName, + -- StrictType + strictTypeName, + -- VarStrictType + varStrictTypeName, + -- Type + forallTName, varTName, conTName, appTName, + tupleTName, arrowTName, listTName, + + -- And the tycons + qTyConName, patTyConName, fieldPatTyConName, matchQTyConName, + clauseQTyConName, expQTyConName, fieldExpTyConName, stmtQTyConName, + decQTyConName, conQTyConName, strictTypeQTyConName, + varStrictTypeQTyConName, typeQTyConName, expTyConName, decTyConName, + typeTyConName, matchTyConName, clauseTyConName] varQual = mk_known_key_name OccName.varName tcQual = mk_known_key_name OccName.tcName thModule :: Module -- NB: the THSyntax module comes from the "haskell-src" package -thModule = mkThPkgModule mETA_META_Name +thModule = mkModule thPackage mETA_META_Name mk_known_key_name space str uniq - = mkKnownKeyExternalName thModule (mkOccFS space str) uniq - -integerLName = varQual FSLIT("integerL") integerLIdKey -charLName = varQual FSLIT("charL") charLIdKey -stringLName = varQual FSLIT("stringL") stringLIdKey -rationalLName = varQual FSLIT("rationalL") rationalLIdKey -plitName = varQual FSLIT("plit") plitIdKey -pvarName = varQual FSLIT("pvar") pvarIdKey -ptupName = varQual FSLIT("ptup") ptupIdKey -pconName = varQual FSLIT("pcon") pconIdKey -ptildeName = varQual FSLIT("ptilde") ptildeIdKey -paspatName = varQual FSLIT("paspat") paspatIdKey -pwildName = varQual FSLIT("pwild") pwildIdKey -varName = varQual FSLIT("var") varIdKey -conName = varQual FSLIT("con") conIdKey -litName = varQual FSLIT("lit") litIdKey -appName = varQual FSLIT("app") appIdKey -infixEName = varQual FSLIT("infixE") infixEIdKey -lamName = varQual FSLIT("lam") lamIdKey -tupName = varQual FSLIT("tup") tupIdKey -doEName = varQual FSLIT("doE") doEIdKey -compName = varQual FSLIT("comp") compIdKey -listExpName = varQual FSLIT("listExp") listExpIdKey -sigExpName = varQual FSLIT("sigExp") sigExpIdKey -condName = varQual FSLIT("cond") condIdKey -letEName = varQual FSLIT("letE") letEIdKey -caseEName = varQual FSLIT("caseE") caseEIdKey -infixAppName = varQual FSLIT("infixApp") infixAppIdKey -sectionLName = varQual FSLIT("sectionL") sectionLIdKey -sectionRName = varQual FSLIT("sectionR") sectionRIdKey -guardedName = varQual FSLIT("guarded") guardedIdKey -normalName = varQual FSLIT("normal") normalIdKey -bindStName = varQual FSLIT("bindSt") bindStIdKey -letStName = varQual FSLIT("letSt") letStIdKey -noBindStName = varQual FSLIT("noBindSt") noBindStIdKey -parStName = varQual FSLIT("parSt") parStIdKey -fromName = varQual FSLIT("from") fromIdKey -fromThenName = varQual FSLIT("fromThen") fromThenIdKey -fromToName = varQual FSLIT("fromTo") fromToIdKey -fromThenToName = varQual FSLIT("fromThenTo") fromThenToIdKey -liftName = varQual FSLIT("lift") liftIdKey -gensymName = varQual FSLIT("gensym") gensymIdKey -returnQName = varQual FSLIT("returnQ") returnQIdKey -bindQName = varQual FSLIT("bindQ") bindQIdKey -sequenceQName = varQual FSLIT("sequenceQ") sequenceQIdKey - --- type Mat = ... -matchName = varQual FSLIT("match") matchIdKey - --- type Cls = ... -clauseName = varQual FSLIT("clause") clauseIdKey - --- data Dec = ... -funName = varQual FSLIT("fun") funIdKey -valName = varQual FSLIT("val") valIdKey -dataDName = varQual FSLIT("dataD") dataDIdKey -tySynDName = varQual FSLIT("tySynD") tySynDIdKey -classDName = varQual FSLIT("classD") classDIdKey -instName = varQual FSLIT("inst") instIdKey -protoName = varQual FSLIT("proto") protoIdKey - --- data Typ = ... -tforallName = varQual FSLIT("tforall") tforallIdKey -tvarName = varQual FSLIT("tvar") tvarIdKey -tconName = varQual FSLIT("tcon") tconIdKey -tappName = varQual FSLIT("tapp") tappIdKey - --- data Tag = ... -arrowTyConName = varQual FSLIT("arrowTyCon") arrowIdKey -tupleTyConName = varQual FSLIT("tupleTyCon") tupleIdKey -listTyConName = varQual FSLIT("listTyCon") listIdKey -namedTyConName = varQual FSLIT("namedTyCon") namedTyConIdKey + = mkExternalName uniq thModule (mkOccFS space str) + Nothing noSrcLoc + +returnQName = varQual FSLIT("returnQ") returnQIdKey +bindQName = varQual FSLIT("bindQ") bindQIdKey +sequenceQName = varQual FSLIT("sequenceQ") sequenceQIdKey +gensymName = varQual FSLIT("gensym") gensymIdKey +liftName = varQual FSLIT("lift") liftIdKey + +-- data Lit = ... +charLName = varQual FSLIT("charL") charLIdKey +stringLName = varQual FSLIT("stringL") stringLIdKey +integerLName = varQual FSLIT("integerL") integerLIdKey +intPrimLName = varQual FSLIT("intPrimL") intPrimLIdKey +floatPrimLName = varQual FSLIT("floatPrimL") floatPrimLIdKey +doublePrimLName = varQual FSLIT("doublePrimL") doublePrimLIdKey +rationalLName = varQual FSLIT("rationalL") rationalLIdKey + +-- data Pat = ... +litPName = varQual FSLIT("litP") litPIdKey +varPName = varQual FSLIT("varP") varPIdKey +tupPName = varQual FSLIT("tupP") tupPIdKey +conPName = varQual FSLIT("conP") conPIdKey +tildePName = varQual FSLIT("tildeP") tildePIdKey +asPName = varQual FSLIT("asP") asPIdKey +wildPName = varQual FSLIT("wildP") wildPIdKey +recPName = varQual FSLIT("recP") recPIdKey +listPName = varQual FSLIT("listP") listPIdKey + +-- type FieldPat = ... +fieldPatName = varQual FSLIT("fieldPat") fieldPatIdKey + +-- data Match = ... +matchName = varQual FSLIT("match") matchIdKey + +-- data Clause = ... +clauseName = varQual FSLIT("clause") clauseIdKey + +-- data Exp = ... +varEName = varQual FSLIT("varE") varEIdKey +conEName = varQual FSLIT("conE") conEIdKey +litEName = varQual FSLIT("litE") litEIdKey +appEName = varQual FSLIT("appE") appEIdKey +infixEName = varQual FSLIT("infixE") infixEIdKey +infixAppName = varQual FSLIT("infixApp") infixAppIdKey +sectionLName = varQual FSLIT("sectionL") sectionLIdKey +sectionRName = varQual FSLIT("sectionR") sectionRIdKey +lamEName = varQual FSLIT("lamE") lamEIdKey +tupEName = varQual FSLIT("tupE") tupEIdKey +condEName = varQual FSLIT("condE") condEIdKey +letEName = varQual FSLIT("letE") letEIdKey +caseEName = varQual FSLIT("caseE") caseEIdKey +doEName = varQual FSLIT("doE") doEIdKey +compEName = varQual FSLIT("compE") compEIdKey +-- ArithSeq skips a level +fromEName = varQual FSLIT("fromE") fromEIdKey +fromThenEName = varQual FSLIT("fromThenE") fromThenEIdKey +fromToEName = varQual FSLIT("fromToE") fromToEIdKey +fromThenToEName = varQual FSLIT("fromThenToE") fromThenToEIdKey +-- end ArithSeq +listEName = varQual FSLIT("listE") listEIdKey +sigEName = varQual FSLIT("sigE") sigEIdKey +recConEName = varQual FSLIT("recConE") recConEIdKey +recUpdEName = varQual FSLIT("recUpdE") recUpdEIdKey + +-- type FieldExp = ... +fieldExpName = varQual FSLIT("fieldExp") fieldExpIdKey + +-- data Body = ... +guardedBName = varQual FSLIT("guardedB") guardedBIdKey +normalBName = varQual FSLIT("normalB") normalBIdKey + +-- data Stmt = ... +bindSName = varQual FSLIT("bindS") bindSIdKey +letSName = varQual FSLIT("letS") letSIdKey +noBindSName = varQual FSLIT("noBindS") noBindSIdKey +parSName = varQual FSLIT("parS") parSIdKey + +-- data Dec = ... +funDName = varQual FSLIT("funD") funDIdKey +valDName = varQual FSLIT("valD") valDIdKey +dataDName = varQual FSLIT("dataD") dataDIdKey +newtypeDName = varQual FSLIT("newtypeD") newtypeDIdKey +tySynDName = varQual FSLIT("tySynD") tySynDIdKey +classDName = varQual FSLIT("classD") classDIdKey +instanceDName = varQual FSLIT("instanceD") instanceDIdKey +sigDName = varQual FSLIT("sigD") sigDIdKey -- type Ctxt = ... -ctxtName = varQual FSLIT("ctxt") ctxtIdKey - +cxtName = varQual FSLIT("cxt") cxtIdKey + +-- data Strict = ... +isStrictName = varQual FSLIT("isStrict") isStrictKey +notStrictName = varQual FSLIT("notStrict") notStrictKey + -- data Con = ... -constrName = varQual FSLIT("constr") constrIdKey +normalCName = varQual FSLIT("normalC") normalCIdKey +recCName = varQual FSLIT("recC") recCIdKey +infixCName = varQual FSLIT("infixC") infixCIdKey -exprTyConName = tcQual FSLIT("Expr") exprTyConKey -declTyConName = tcQual FSLIT("Decl") declTyConKey -pattTyConName = tcQual FSLIT("Patt") pattTyConKey -mtchTyConName = tcQual FSLIT("Mtch") mtchTyConKey -clseTyConName = tcQual FSLIT("Clse") clseTyConKey -stmtTyConName = tcQual FSLIT("Stmt") stmtTyConKey -consTyConName = tcQual FSLIT("Cons") consTyConKey -typeTyConName = tcQual FSLIT("Type") typeTyConKey +-- type StrictType = ... +strictTypeName = varQual FSLIT("strictType") strictTKey + +-- type VarStrictType = ... +varStrictTypeName = varQual FSLIT("varStrictType") varStrictTKey + +-- data Type = ... +forallTName = varQual FSLIT("forallT") forallTIdKey +varTName = varQual FSLIT("varT") varTIdKey +conTName = varQual FSLIT("conT") conTIdKey +tupleTName = varQual FSLIT("tupleT") tupleTIdKey +arrowTName = varQual FSLIT("arrowT") arrowTIdKey +listTName = varQual FSLIT("listT") listTIdKey +appTName = varQual FSLIT("appT") appTIdKey -qTyConName = tcQual FSLIT("Q") qTyConKey -expTyConName = tcQual FSLIT("Exp") expTyConKey -decTyConName = tcQual FSLIT("Dec") decTyConKey -typTyConName = tcQual FSLIT("Typ") typTyConKey -matTyConName = tcQual FSLIT("Mat") matTyConKey -clsTyConName = tcQual FSLIT("Cls") clsTyConKey +qTyConName = tcQual FSLIT("Q") qTyConKey +patTyConName = tcQual FSLIT("Pat") patTyConKey +fieldPatTyConName = tcQual FSLIT("FieldPat") fieldPatTyConKey +matchQTyConName = tcQual FSLIT("MatchQ") matchQTyConKey +clauseQTyConName = tcQual FSLIT("ClauseQ") clauseQTyConKey +expQTyConName = tcQual FSLIT("ExpQ") expQTyConKey +fieldExpTyConName = tcQual FSLIT("FieldExp") fieldExpTyConKey +stmtQTyConName = tcQual FSLIT("StmtQ") stmtQTyConKey +decQTyConName = tcQual FSLIT("DecQ") decQTyConKey +conQTyConName = tcQual FSLIT("ConQ") conQTyConKey +strictTypeQTyConName = tcQual FSLIT("StrictTypeQ") strictTypeQTyConKey +varStrictTypeQTyConName = tcQual FSLIT("VarStrictTypeQ") varStrictTypeQTyConKey +typeQTyConName = tcQual FSLIT("TypeQ") typeQTyConKey + +expTyConName = tcQual FSLIT("Exp") expTyConKey +decTyConName = tcQual FSLIT("Dec") decTyConKey +typeTyConName = tcQual FSLIT("Type") typeTyConKey +matchTyConName = tcQual FSLIT("Match") matchTyConKey +clauseTyConName = tcQual FSLIT("Clause") clauseTyConKey -- TyConUniques available: 100-119 -- Check in PrelNames if you want to change this -expTyConKey = mkPreludeTyConUnique 100 -matTyConKey = mkPreludeTyConUnique 101 -clsTyConKey = mkPreludeTyConUnique 102 -qTyConKey = mkPreludeTyConUnique 103 -exprTyConKey = mkPreludeTyConUnique 104 -declTyConKey = mkPreludeTyConUnique 105 -pattTyConKey = mkPreludeTyConUnique 106 -mtchTyConKey = mkPreludeTyConUnique 107 -clseTyConKey = mkPreludeTyConUnique 108 -stmtTyConKey = mkPreludeTyConUnique 109 -consTyConKey = mkPreludeTyConUnique 110 -typeTyConKey = mkPreludeTyConUnique 111 -typTyConKey = mkPreludeTyConUnique 112 -decTyConKey = mkPreludeTyConUnique 113 - - +expTyConKey = mkPreludeTyConUnique 100 +matchTyConKey = mkPreludeTyConUnique 101 +clauseTyConKey = mkPreludeTyConUnique 102 +qTyConKey = mkPreludeTyConUnique 103 +expQTyConKey = mkPreludeTyConUnique 104 +decQTyConKey = mkPreludeTyConUnique 105 +patTyConKey = mkPreludeTyConUnique 106 +matchQTyConKey = mkPreludeTyConUnique 107 +clauseQTyConKey = mkPreludeTyConUnique 108 +stmtQTyConKey = mkPreludeTyConUnique 109 +conQTyConKey = mkPreludeTyConUnique 110 +typeQTyConKey = mkPreludeTyConUnique 111 +typeTyConKey = mkPreludeTyConUnique 112 +decTyConKey = mkPreludeTyConUnique 113 +varStrictTypeQTyConKey = mkPreludeTyConUnique 114 +strictTypeQTyConKey = mkPreludeTyConUnique 115 +fieldExpTyConKey = mkPreludeTyConUnique 116 +fieldPatTyConKey = mkPreludeTyConUnique 117 -- IdUniques available: 200-299 -- If you want to change this, make sure you check in PrelNames -fromIdKey = mkPreludeMiscIdUnique 200 -fromThenIdKey = mkPreludeMiscIdUnique 201 -fromToIdKey = mkPreludeMiscIdUnique 202 -fromThenToIdKey = mkPreludeMiscIdUnique 203 -liftIdKey = mkPreludeMiscIdUnique 204 -gensymIdKey = mkPreludeMiscIdUnique 205 -returnQIdKey = mkPreludeMiscIdUnique 206 -bindQIdKey = mkPreludeMiscIdUnique 207 -funIdKey = mkPreludeMiscIdUnique 208 -valIdKey = mkPreludeMiscIdUnique 209 -protoIdKey = mkPreludeMiscIdUnique 210 -matchIdKey = mkPreludeMiscIdUnique 211 -clauseIdKey = mkPreludeMiscIdUnique 212 -integerLIdKey = mkPreludeMiscIdUnique 213 -charLIdKey = mkPreludeMiscIdUnique 214 - -classDIdKey = mkPreludeMiscIdUnique 215 -instIdKey = mkPreludeMiscIdUnique 216 -dataDIdKey = mkPreludeMiscIdUnique 217 - -sequenceQIdKey = mkPreludeMiscIdUnique 218 -tySynDIdKey = mkPreludeMiscIdUnique 219 - -plitIdKey = mkPreludeMiscIdUnique 220 -pvarIdKey = mkPreludeMiscIdUnique 221 -ptupIdKey = mkPreludeMiscIdUnique 222 -pconIdKey = mkPreludeMiscIdUnique 223 -ptildeIdKey = mkPreludeMiscIdUnique 224 -paspatIdKey = mkPreludeMiscIdUnique 225 -pwildIdKey = mkPreludeMiscIdUnique 226 -varIdKey = mkPreludeMiscIdUnique 227 -conIdKey = mkPreludeMiscIdUnique 228 -litIdKey = mkPreludeMiscIdUnique 229 -appIdKey = mkPreludeMiscIdUnique 230 -infixEIdKey = mkPreludeMiscIdUnique 231 -lamIdKey = mkPreludeMiscIdUnique 232 -tupIdKey = mkPreludeMiscIdUnique 233 -doEIdKey = mkPreludeMiscIdUnique 234 -compIdKey = mkPreludeMiscIdUnique 235 -listExpIdKey = mkPreludeMiscIdUnique 237 -condIdKey = mkPreludeMiscIdUnique 238 -letEIdKey = mkPreludeMiscIdUnique 239 -caseEIdKey = mkPreludeMiscIdUnique 240 -infixAppIdKey = mkPreludeMiscIdUnique 241 --- 242 unallocated -sectionLIdKey = mkPreludeMiscIdUnique 243 -sectionRIdKey = mkPreludeMiscIdUnique 244 -guardedIdKey = mkPreludeMiscIdUnique 245 -normalIdKey = mkPreludeMiscIdUnique 246 -bindStIdKey = mkPreludeMiscIdUnique 247 -letStIdKey = mkPreludeMiscIdUnique 248 -noBindStIdKey = mkPreludeMiscIdUnique 249 -parStIdKey = mkPreludeMiscIdUnique 250 - -tforallIdKey = mkPreludeMiscIdUnique 251 -tvarIdKey = mkPreludeMiscIdUnique 252 -tconIdKey = mkPreludeMiscIdUnique 253 -tappIdKey = mkPreludeMiscIdUnique 254 - -arrowIdKey = mkPreludeMiscIdUnique 255 -tupleIdKey = mkPreludeMiscIdUnique 256 -listIdKey = mkPreludeMiscIdUnique 257 -namedTyConIdKey = mkPreludeMiscIdUnique 258 - -ctxtIdKey = mkPreludeMiscIdUnique 259 - -constrIdKey = mkPreludeMiscIdUnique 260 - -stringLIdKey = mkPreludeMiscIdUnique 261 -rationalLIdKey = mkPreludeMiscIdUnique 262 - -sigExpIdKey = mkPreludeMiscIdUnique 263 - +returnQIdKey = mkPreludeMiscIdUnique 200 +bindQIdKey = mkPreludeMiscIdUnique 201 +sequenceQIdKey = mkPreludeMiscIdUnique 202 +gensymIdKey = mkPreludeMiscIdUnique 203 +liftIdKey = mkPreludeMiscIdUnique 204 + +-- data Lit = ... +charLIdKey = mkPreludeMiscIdUnique 210 +stringLIdKey = mkPreludeMiscIdUnique 211 +integerLIdKey = mkPreludeMiscIdUnique 212 +intPrimLIdKey = mkPreludeMiscIdUnique 213 +floatPrimLIdKey = mkPreludeMiscIdUnique 214 +doublePrimLIdKey = mkPreludeMiscIdUnique 215 +rationalLIdKey = mkPreludeMiscIdUnique 216 + +-- data Pat = ... +litPIdKey = mkPreludeMiscIdUnique 220 +varPIdKey = mkPreludeMiscIdUnique 221 +tupPIdKey = mkPreludeMiscIdUnique 222 +conPIdKey = mkPreludeMiscIdUnique 223 +tildePIdKey = mkPreludeMiscIdUnique 224 +asPIdKey = mkPreludeMiscIdUnique 225 +wildPIdKey = mkPreludeMiscIdUnique 226 +recPIdKey = mkPreludeMiscIdUnique 227 +listPIdKey = mkPreludeMiscIdUnique 228 + +-- type FieldPat = ... +fieldPatIdKey = mkPreludeMiscIdUnique 230 + +-- data Match = ... +matchIdKey = mkPreludeMiscIdUnique 231 + +-- data Clause = ... +clauseIdKey = mkPreludeMiscIdUnique 232 + +-- data Exp = ... +varEIdKey = mkPreludeMiscIdUnique 240 +conEIdKey = mkPreludeMiscIdUnique 241 +litEIdKey = mkPreludeMiscIdUnique 242 +appEIdKey = mkPreludeMiscIdUnique 243 +infixEIdKey = mkPreludeMiscIdUnique 244 +infixAppIdKey = mkPreludeMiscIdUnique 245 +sectionLIdKey = mkPreludeMiscIdUnique 246 +sectionRIdKey = mkPreludeMiscIdUnique 247 +lamEIdKey = mkPreludeMiscIdUnique 248 +tupEIdKey = mkPreludeMiscIdUnique 249 +condEIdKey = mkPreludeMiscIdUnique 250 +letEIdKey = mkPreludeMiscIdUnique 251 +caseEIdKey = mkPreludeMiscIdUnique 252 +doEIdKey = mkPreludeMiscIdUnique 253 +compEIdKey = mkPreludeMiscIdUnique 254 +fromEIdKey = mkPreludeMiscIdUnique 255 +fromThenEIdKey = mkPreludeMiscIdUnique 256 +fromToEIdKey = mkPreludeMiscIdUnique 257 +fromThenToEIdKey = mkPreludeMiscIdUnique 258 +listEIdKey = mkPreludeMiscIdUnique 259 +sigEIdKey = mkPreludeMiscIdUnique 260 +recConEIdKey = mkPreludeMiscIdUnique 261 +recUpdEIdKey = mkPreludeMiscIdUnique 262 + +-- type FieldExp = ... +fieldExpIdKey = mkPreludeMiscIdUnique 265 + +-- data Body = ... +guardedBIdKey = mkPreludeMiscIdUnique 266 +normalBIdKey = mkPreludeMiscIdUnique 267 + +-- data Stmt = ... +bindSIdKey = mkPreludeMiscIdUnique 268 +letSIdKey = mkPreludeMiscIdUnique 269 +noBindSIdKey = mkPreludeMiscIdUnique 270 +parSIdKey = mkPreludeMiscIdUnique 271 + +-- data Dec = ... +funDIdKey = mkPreludeMiscIdUnique 272 +valDIdKey = mkPreludeMiscIdUnique 273 +dataDIdKey = mkPreludeMiscIdUnique 274 +newtypeDIdKey = mkPreludeMiscIdUnique 275 +tySynDIdKey = mkPreludeMiscIdUnique 276 +classDIdKey = mkPreludeMiscIdUnique 277 +instanceDIdKey = mkPreludeMiscIdUnique 278 +sigDIdKey = mkPreludeMiscIdUnique 279 + +-- type Cxt = ... +cxtIdKey = mkPreludeMiscIdUnique 280 + +-- data Strict = ... +isStrictKey = mkPreludeMiscIdUnique 281 +notStrictKey = mkPreludeMiscIdUnique 282 + +-- data Con = ... +normalCIdKey = mkPreludeMiscIdUnique 283 +recCIdKey = mkPreludeMiscIdUnique 284 +infixCIdKey = mkPreludeMiscIdUnique 285 + +-- type StrictType = ... +strictTKey = mkPreludeMiscIdUnique 2286 + +-- type VarStrictType = ... +varStrictTKey = mkPreludeMiscIdUnique 287 + +-- data Type = ... +forallTIdKey = mkPreludeMiscIdUnique 290 +varTIdKey = mkPreludeMiscIdUnique 291 +conTIdKey = mkPreludeMiscIdUnique 292 +tupleTIdKey = mkPreludeMiscIdUnique 294 +arrowTIdKey = mkPreludeMiscIdUnique 295 +listTIdKey = mkPreludeMiscIdUnique 296 +appTIdKey = mkPreludeMiscIdUnique 293 -- %************************************************************************ -- %* * @@ -1352,4 +1565,5 @@ sigExpIdKey = mkPreludeMiscIdUnique 263 -- It is rather usatisfactory that we don't have a SrcLoc addDsWarn :: SDoc -> DsM () -addDsWarn msg = dsWarn (noSrcLoc, msg) \ No newline at end of file +addDsWarn msg = dsWarn (noSrcLoc, msg) +