Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC Commits: 461a143c by Rodrigo Mesquita at 2026-05-12T17:33:48+01:00 comment - - - - - e983b4fc by Rodrigo Mesquita at 2026-05-13T10:43:53+01:00 kill things - - - - - 19190015 by Rodrigo Mesquita at 2026-05-13T12:01:02+01:00 fix orphan keys - - - - - 3 changed files: - compiler/GHC/Builtin/KnownKeys.hs - compiler/GHC/Builtin/Modules.hs - compiler/GHC/Builtin/TH.hs Changes: ===================================== compiler/GHC/Builtin/KnownKeys.hs ===================================== @@ -61,7 +61,6 @@ where import GHC.Prelude -import GHC.Builtin.Modules import GHC.Builtin.Uniques import GHC.Unit.Types @@ -123,6 +122,11 @@ See Note [Overview of known entities] in GHC.Builtin knownKeyTable :: [(OccName, KnownKey)] knownKeyTable = [ (mkTcOcc "IO", ioTyConKey) + , (mkVarOcc "$", dollarIdKey) + , (mkVarOcc "assert", assertIdKey) + , (mkVarOcc "considerAccessible", considerAccessibleIdKey) + , (mkVarOcc "augment", augmentIdKey) + , (mkVarOcc "otherwise", otherwiseIdKey) -- Classes , (mkTcOcc "Eq", eqClassKey) @@ -337,37 +341,17 @@ and it's convenient to write them all down in one place. wildCardName :: Name wildCardName = mkSystemVarName wildCardKey (fsLit "wild") --- Class MonadFail -failMName :: Name -failMName = varQual gHC_INTERNAL_MONAD_FAIL (fsLit "fail") failMClassOpKey - --- Classes (Foldable, Traversable) -traversableClassName :: Name -traversableClassName = clsQual gHC_INTERNAL_DATA_TRAVERSABLE (fsLit "Traversable") traversableClassKey - -- AMP additions -joinMIdKey, apAClassOpKey, pureAClassOpKey, thenAClassOpKey, - alternativeClassKey :: KnownKey -joinMIdKey = mkPreludeMiscIdUnique 750 -apAClassOpKey = mkPreludeMiscIdUnique 751 -- <*> +pureAClassOpKey, thenAClassOpKey, alternativeClassKey :: KnownKey pureAClassOpKey = mkPreludeMiscIdUnique 752 thenAClassOpKey = mkPreludeMiscIdUnique 753 alternativeClassKey = mkPreludeMiscIdUnique 754 -bnbVarQual, bnnVarQual, bniVarQual :: String -> Unique -> Name -bnbVarQual str key = varQual gHC_INTERNAL_NUM_BIGNAT (fsLit str) key -bnnVarQual str key = varQual gHC_INTERNAL_NUM_NATURAL (fsLit str) key -bniVarQual str key = varQual gHC_INTERNAL_NUM_INTEGER (fsLit str) key - - - --------------------------------- -- End of ghc-bignum --------------------------------- -- WithDict -withDictClassName :: Name -withDictClassName = clsQual gHC_MAGIC_DICT (fsLit "WithDict") withDictClassKey genericClassKeys :: [KnownKey] genericClassKeys = [genClassKey, gen1ClassKey] @@ -448,8 +432,6 @@ withDictClassKey = mkPreludeClassUnique 21 dataToTagClassKey :: KnownKey dataToTagClassKey = mkPreludeClassUnique 23 -monadFixClassKey :: KnownKey -monadFixClassKey = mkPreludeClassUnique 28 monadFailClassKey :: KnownKey monadFailClassKey = mkPreludeClassUnique 29 @@ -494,7 +476,6 @@ ipClassKey = mkPreludeClassUnique 49 hasFieldClassKey :: KnownKey hasFieldClassKey = mkPreludeClassUnique 50 - ---------------- Template Haskell ------------------- -- GHC.Builtin.TH: USES ClassUniques 200-299 ----------------------------------------------------- @@ -507,21 +488,17 @@ hasFieldClassKey = mkPreludeClassUnique 50 ************************************************************************ -} -addrPrimTyConKey, arrayPrimTyConKey, boolTyConKey, - byteArrayPrimTyConKey, charPrimTyConKey, charTyConKey, doublePrimTyConKey, - doubleTyConKey, floatPrimTyConKey, floatTyConKey, fUNTyConKey, - intPrimTyConKey, intTyConKey, int8TyConKey, int16TyConKey, - int8PrimTyConKey, int16PrimTyConKey, int32PrimTyConKey, int32TyConKey, - int64PrimTyConKey, int64TyConKey, - integerTyConKey, naturalTyConKey, - listTyConKey, foreignObjPrimTyConKey, maybeTyConKey, - weakPrimTyConKey, mutableArrayPrimTyConKey, - mutableByteArrayPrimTyConKey, orderingTyConKey, mVarPrimTyConKey, - ratioTyConKey, rationalTyConKey, realWorldTyConKey, stablePtrPrimTyConKey, - stablePtrTyConKey, eqTyConKey, heqTyConKey, - smallArrayPrimTyConKey, smallMutableArrayPrimTyConKey, - stringTyConKey, - ccArrowTyConKey, ctArrowTyConKey, tcArrowTyConKey :: KnownKey +addrPrimTyConKey, arrayPrimTyConKey, boolTyConKey, byteArrayPrimTyConKey, + charPrimTyConKey, charTyConKey, doublePrimTyConKey, doubleTyConKey, + floatPrimTyConKey, floatTyConKey, fUNTyConKey, intPrimTyConKey, intTyConKey, + int8TyConKey, int16TyConKey, int8PrimTyConKey, int16PrimTyConKey, + int32PrimTyConKey, int32TyConKey, int64PrimTyConKey, int64TyConKey, + integerTyConKey, naturalTyConKey, listTyConKey, maybeTyConKey, + weakPrimTyConKey, mutableArrayPrimTyConKey, mutableByteArrayPrimTyConKey, + orderingTyConKey, mVarPrimTyConKey, ratioTyConKey, rationalTyConKey, + realWorldTyConKey, stablePtrPrimTyConKey, stablePtrTyConKey, eqTyConKey, + heqTyConKey, smallArrayPrimTyConKey, smallMutableArrayPrimTyConKey, + stringTyConKey, ccArrowTyConKey, ctArrowTyConKey, tcArrowTyConKey :: KnownKey addrPrimTyConKey = mkPreludeTyConUnique 1 arrayPrimTyConKey = mkPreludeTyConUnique 3 boolTyConKey = mkPreludeTyConUnique 4 @@ -548,7 +525,6 @@ integerTyConKey = mkPreludeTyConUnique 24 naturalTyConKey = mkPreludeTyConUnique 25 listTyConKey = mkPreludeTyConUnique 26 -foreignObjPrimTyConKey = mkPreludeTyConUnique 27 maybeTyConKey = mkPreludeTyConUnique 28 weakPrimTyConKey = mkPreludeTyConUnique 29 mutableArrayPrimTyConKey = mkPreludeTyConUnique 30 @@ -568,20 +544,16 @@ ctArrowTyConKey = mkPreludeTyConUnique 42 ccArrowTyConKey = mkPreludeTyConUnique 43 tcArrowTyConKey = mkPreludeTyConUnique 44 -statePrimTyConKey, stableNamePrimTyConKey, stableNameTyConKey, - mutVarPrimTyConKey, ioTyConKey, - wordPrimTyConKey, wordTyConKey, word8PrimTyConKey, word8TyConKey, - word16PrimTyConKey, word16TyConKey, word32PrimTyConKey, word32TyConKey, - word64PrimTyConKey, word64TyConKey, - kindConKey, boxityConKey, - typeConKey, threadIdPrimTyConKey, bcoPrimTyConKey, ptrTyConKey, - funPtrTyConKey, tVarPrimTyConKey, eqPrimTyConKey, - eqReprPrimTyConKey, eqPhantPrimTyConKey, - compactPrimTyConKey, stackSnapshotPrimTyConKey, - promptTagPrimTyConKey, constPtrTyConKey, jsvalTyConKey :: KnownKey +statePrimTyConKey, stableNamePrimTyConKey, mutVarPrimTyConKey, ioTyConKey, + wordPrimTyConKey, wordTyConKey, word8PrimTyConKey, word8TyConKey, + word16PrimTyConKey, word16TyConKey, word32PrimTyConKey, word32TyConKey, + word64PrimTyConKey, word64TyConKey, threadIdPrimTyConKey, bcoPrimTyConKey, + ptrTyConKey, funPtrTyConKey, tVarPrimTyConKey, eqPrimTyConKey, + eqReprPrimTyConKey, eqPhantPrimTyConKey, compactPrimTyConKey, + stackSnapshotPrimTyConKey, promptTagPrimTyConKey, constPtrTyConKey, + jsvalTyConKey :: KnownKey statePrimTyConKey = mkPreludeTyConUnique 50 stableNamePrimTyConKey = mkPreludeTyConUnique 51 -stableNameTyConKey = mkPreludeTyConUnique 52 eqPrimTyConKey = mkPreludeTyConUnique 53 eqReprPrimTyConKey = mkPreludeTyConUnique 54 eqPhantPrimTyConKey = mkPreludeTyConUnique 55 @@ -597,9 +569,6 @@ word32PrimTyConKey = mkPreludeTyConUnique 65 word32TyConKey = mkPreludeTyConUnique 66 word64PrimTyConKey = mkPreludeTyConUnique 67 word64TyConKey = mkPreludeTyConUnique 68 -kindConKey = mkPreludeTyConUnique 72 -boxityConKey = mkPreludeTyConUnique 73 -typeConKey = mkPreludeTyConUnique 74 threadIdPrimTyConKey = mkPreludeTyConUnique 75 bcoPrimTyConKey = mkPreludeTyConUnique 76 ptrTyConKey = mkPreludeTyConUnique 77 @@ -609,18 +578,6 @@ compactPrimTyConKey = mkPreludeTyConUnique 80 stackSnapshotPrimTyConKey = mkPreludeTyConUnique 81 promptTagPrimTyConKey = mkPreludeTyConUnique 82 -eitherTyConKey :: KnownKey -eitherTyConKey = mkPreludeTyConUnique 84 - -voidTyConKey :: KnownKey -voidTyConKey = mkPreludeTyConUnique 85 - -nonEmptyTyConKey :: KnownKey -nonEmptyTyConKey = mkPreludeTyConUnique 86 - -dictTyConKey :: KnownKey -dictTyConKey = mkPreludeTyConUnique 87 - -- Kind constructors liftedTypeKindTyConKey, unliftedTypeKindTyConKey, tYPETyConKey, cONSTRAINTTyConKey, @@ -646,42 +603,8 @@ pluginTyConKey, frontendPluginTyConKey :: KnownKey pluginTyConKey = mkPreludeTyConUnique 102 frontendPluginTyConKey = mkPreludeTyConUnique 103 -trTyConTyConKey, trModuleTyConKey, - kindRepTyConKey :: KnownKey +trTyConTyConKey :: KnownKey trTyConTyConKey = mkPreludeTyConUnique 104 -trModuleTyConKey = mkPreludeTyConUnique 105 -kindRepTyConKey = mkPreludeTyConUnique 107 - --- Generics (Unique keys) -v1TyConKey, u1TyConKey, par1TyConKey, rec1TyConKey, - sumTyConKey, prodTyConKey, compTyConKey, rec0TyConKey, - d1TyConKey, c1TyConKey, s1TyConKey, repTyConKey, rep1TyConKey, - uAddrTyConKey, uCharTyConKey, uDoubleTyConKey, - uFloatTyConKey, uIntTyConKey, uWordTyConKey :: KnownKey - -v1TyConKey = mkPreludeTyConUnique 135 -u1TyConKey = mkPreludeTyConUnique 136 -par1TyConKey = mkPreludeTyConUnique 137 -rec1TyConKey = mkPreludeTyConUnique 138 - -sumTyConKey = mkPreludeTyConUnique 141 -prodTyConKey = mkPreludeTyConUnique 142 -compTyConKey = mkPreludeTyConUnique 143 - -rec0TyConKey = mkPreludeTyConUnique 149 -d1TyConKey = mkPreludeTyConUnique 151 -c1TyConKey = mkPreludeTyConUnique 152 -s1TyConKey = mkPreludeTyConUnique 153 - -repTyConKey = mkPreludeTyConUnique 155 -rep1TyConKey = mkPreludeTyConUnique 156 - -uAddrTyConKey = mkPreludeTyConUnique 158 -uCharTyConKey = mkPreludeTyConUnique 159 -uDoubleTyConKey = mkPreludeTyConUnique 160 -uFloatTyConKey = mkPreludeTyConUnique 161 -uIntTyConKey = mkPreludeTyConUnique 162 -uWordTyConKey = mkPreludeTyConUnique 163 -- "Unsatisfiable" constraint unsatisfiableClassKey :: KnownKey @@ -712,12 +635,6 @@ smallMutableArrayPrimTyConKey = mkPreludeTyConUnique 188 callStackTyConKey :: KnownKey callStackTyConKey = mkPreludeTyConUnique 191 --- Typeables -someTypeRepTyConKey, someTypeRepDataConKey :: KnownKey -someTypeRepTyConKey = mkPreludeTyConUnique 193 -someTypeRepDataConKey = mkPreludeTyConUnique 194 - - typeSymbolAppendFamNameKey :: KnownKey typeSymbolAppendFamNameKey = mkPreludeTyConUnique 195 @@ -751,11 +668,10 @@ liftClassKey = mkPreludeClassUnique 200 ------------- Type-level Symbol, Nat, Char ---------- -- USES TyConUniques 400-499 ----------------------------------------------------- -typeSymbolKindConNameKey, typeCharKindConNameKey, +typeSymbolKindConNameKey, typeNatAddTyFamNameKey, typeNatMulTyFamNameKey, typeNatExpTyFamNameKey, typeNatSubTyFamNameKey , typeSymbolCmpTyFamNameKey, typeNatCmpTyFamNameKey, typeCharCmpTyFamNameKey - , typeLeqCharTyFamNameKey , typeNatDivTyFamNameKey , typeNatModTyFamNameKey , typeNatLogTyFamNameKey @@ -764,7 +680,6 @@ typeSymbolKindConNameKey, typeCharKindConNameKey, , exceptionContextTyConKey, unsafeUnpackJSStringUtf8ShShKey :: KnownKey typeSymbolKindConNameKey = mkPreludeTyConUnique 400 -typeCharKindConNameKey = mkPreludeTyConUnique 401 typeNatAddTyFamNameKey = mkPreludeTyConUnique 402 typeNatMulTyFamNameKey = mkPreludeTyConUnique 403 typeNatExpTyFamNameKey = mkPreludeTyConUnique 404 @@ -772,7 +687,6 @@ typeNatSubTyFamNameKey = mkPreludeTyConUnique 405 typeSymbolCmpTyFamNameKey = mkPreludeTyConUnique 406 typeNatCmpTyFamNameKey = mkPreludeTyConUnique 407 typeCharCmpTyFamNameKey = mkPreludeTyConUnique 408 -typeLeqCharTyFamNameKey = mkPreludeTyConUnique 409 typeNatDivTyFamNameKey = mkPreludeTyConUnique 410 typeNatModTyFamNameKey = mkPreludeTyConUnique 411 typeNatLogTyFamNameKey = mkPreludeTyConUnique 412 @@ -797,10 +711,9 @@ unsafeUnpackJSStringUtf8ShShKey = mkPreludeMiscIdUnique 805 -} charDataConKey, consDataConKey, doubleDataConKey, falseDataConKey, - floatDataConKey, intDataConKey, nilDataConKey, - ratioDataConKey, stableNameDataConKey, trueDataConKey, wordDataConKey, - word8DataConKey, ioDataConKey, heqDataConKey, - eqDataConKey, nothingDataConKey, justDataConKey :: KnownKey + floatDataConKey, intDataConKey, nilDataConKey, ratioDataConKey, + trueDataConKey, wordDataConKey, word8DataConKey, heqDataConKey, eqDataConKey, + nothingDataConKey, justDataConKey :: KnownKey charDataConKey = mkPreludeDataConUnique 1 consDataConKey = mkPreludeDataConUnique 2 @@ -814,31 +727,15 @@ eqDataConKey = mkPreludeDataConUnique 9 nilDataConKey = mkPreludeDataConUnique 10 ratioDataConKey = mkPreludeDataConUnique 11 word8DataConKey = mkPreludeDataConUnique 12 -stableNameDataConKey = mkPreludeDataConUnique 13 trueDataConKey = mkPreludeDataConUnique 14 wordDataConKey = mkPreludeDataConUnique 15 -ioDataConKey = mkPreludeDataConUnique 16 heqDataConKey = mkPreludeDataConUnique 18 --- Generic data constructors -crossDataConKey, inlDataConKey, inrDataConKey, genUnitDataConKey :: KnownKey -crossDataConKey = mkPreludeDataConUnique 20 -inlDataConKey = mkPreludeDataConUnique 21 -inrDataConKey = mkPreludeDataConUnique 22 -genUnitDataConKey = mkPreludeDataConUnique 23 - -leftDataConKey, rightDataConKey :: KnownKey -leftDataConKey = mkPreludeDataConUnique 25 -rightDataConKey = mkPreludeDataConUnique 26 - ordLTDataConKey, ordEQDataConKey, ordGTDataConKey :: KnownKey ordLTDataConKey = mkPreludeDataConUnique 27 ordEQDataConKey = mkPreludeDataConUnique 28 ordGTDataConKey = mkPreludeDataConUnique 29 -mkDictDataConKey :: KnownKey -mkDictDataConKey = mkPreludeDataConUnique 30 - coercibleDataConKey :: KnownKey coercibleDataConKey = mkPreludeDataConUnique 32 @@ -848,12 +745,6 @@ staticPtrDataConKey = mkPreludeDataConUnique 33 staticPtrInfoDataConKey :: KnownKey staticPtrInfoDataConKey = mkPreludeDataConUnique 34 -trTyConDataConKey, trModuleDataConKey, - trNameSDataConKey :: KnownKey -trTyConDataConKey = mkPreludeDataConUnique 41 -trModuleDataConKey = mkPreludeDataConUnique 43 -trNameSDataConKey = mkPreludeDataConUnique 45 - typeErrorTextDataConKey, typeErrorAppendDataConKey, typeErrorVAppendDataConKey, @@ -864,30 +755,6 @@ typeErrorAppendDataConKey = mkPreludeDataConUnique 51 typeErrorVAppendDataConKey = mkPreludeDataConUnique 52 typeErrorShowTypeDataConKey = mkPreludeDataConUnique 53 -prefixIDataConKey, infixIDataConKey, leftAssociativeDataConKey, - rightAssociativeDataConKey, notAssociativeDataConKey, - sourceUnpackDataConKey, sourceNoUnpackDataConKey, - noSourceUnpackednessDataConKey, sourceLazyDataConKey, - sourceStrictDataConKey, noSourceStrictnessDataConKey, - decidedLazyDataConKey, decidedStrictDataConKey, decidedUnpackDataConKey, - metaDataDataConKey, metaConsDataConKey, metaSelDataConKey :: KnownKey -prefixIDataConKey = mkPreludeDataConUnique 54 -infixIDataConKey = mkPreludeDataConUnique 55 -leftAssociativeDataConKey = mkPreludeDataConUnique 56 -rightAssociativeDataConKey = mkPreludeDataConUnique 57 -notAssociativeDataConKey = mkPreludeDataConUnique 58 -sourceUnpackDataConKey = mkPreludeDataConUnique 59 -sourceNoUnpackDataConKey = mkPreludeDataConUnique 60 -noSourceUnpackednessDataConKey = mkPreludeDataConUnique 61 -sourceLazyDataConKey = mkPreludeDataConUnique 62 -sourceStrictDataConKey = mkPreludeDataConUnique 63 -noSourceStrictnessDataConKey = mkPreludeDataConUnique 64 -decidedLazyDataConKey = mkPreludeDataConUnique 65 -decidedStrictDataConKey = mkPreludeDataConUnique 66 -decidedUnpackDataConKey = mkPreludeDataConUnique 67 -metaDataDataConKey = mkPreludeDataConUnique 68 -metaConsDataConKey = mkPreludeDataConUnique 69 -metaSelDataConKey = mkPreludeDataConUnique 70 vecRepDataConKey, sumRepDataConKey, tupleRepDataConKey, boxedRepDataConKey :: KnownKey @@ -924,21 +791,7 @@ vecElemDataConKeys :: [KnownKey] vecElemDataConKeys = map mkPreludeDataConUnique [96..105] -- Typeable things -kindRepTyConAppDataConKey, kindRepVarDataConKey, kindRepAppDataConKey, - kindRepFunDataConKey, kindRepTYPEDataConKey, - kindRepTypeLitSDataConKey - :: KnownKey -kindRepTyConAppDataConKey = mkPreludeDataConUnique 106 -kindRepVarDataConKey = mkPreludeDataConUnique 107 -kindRepAppDataConKey = mkPreludeDataConUnique 108 -kindRepFunDataConKey = mkPreludeDataConUnique 109 -kindRepTYPEDataConKey = mkPreludeDataConUnique 110 -kindRepTypeLitSDataConKey = mkPreludeDataConUnique 111 - -typeLitSymbolDataConKey, typeLitNatDataConKey, typeLitCharDataConKey :: KnownKey -typeLitSymbolDataConKey = mkPreludeDataConUnique 113 -typeLitNatDataConKey = mkPreludeDataConUnique 114 -typeLitCharDataConKey = mkPreludeDataConUnique 115 + -- Unsafe equality unsafeReflDataConKey :: KnownKey @@ -974,7 +827,7 @@ naturalNBDataConKey = mkPreludeDataConUnique 124 -} wildCardKey, absentErrorIdKey, absentConstraintErrorIdKey, augmentIdKey, - buildIdKey, foldrIdKey, recSelErrorIdKey, + buildIdKey, recSelErrorIdKey, seqIdKey, eqStringIdKey, noMethodBindingErrorIdKey, nonExhaustiveGuardsErrorIdKey, impossibleErrorIdKey, impossibleConstraintErrorIdKey, @@ -983,15 +836,13 @@ wildCardKey, absentErrorIdKey, absentConstraintErrorIdKey, augmentIdKey, unpackCStringUtf8IdKey, unpackCStringAppendUtf8IdKey, unpackCStringFoldrUtf8IdKey, unpackCStringIdKey, unpackCStringAppendIdKey, unpackCStringFoldrIdKey, typeErrorIdKey, divIntIdKey, modIntIdKey, - absentSumFieldErrorIdKey, cstringLengthIdKey, composeIdKey - :: KnownKey + absentSumFieldErrorIdKey, cstringLengthIdKey :: KnownKey wildCardKey = mkPreludeMiscIdUnique 0 -- See Note [WildCard binders] absentErrorIdKey = mkPreludeMiscIdUnique 1 absentConstraintErrorIdKey = mkPreludeMiscIdUnique 2 augmentIdKey = mkPreludeMiscIdUnique 3 buildIdKey = mkPreludeMiscIdUnique 5 -foldrIdKey = mkPreludeMiscIdUnique 6 recSelErrorIdKey = mkPreludeMiscIdUnique 7 seqIdKey = mkPreludeMiscIdUnique 8 absentSumFieldErrorIdKey = mkPreludeMiscIdUnique 9 @@ -1017,15 +868,8 @@ typeErrorIdKey = mkPreludeMiscIdUnique 25 divIntIdKey = mkPreludeMiscIdUnique 26 modIntIdKey = mkPreludeMiscIdUnique 27 cstringLengthIdKey = mkPreludeMiscIdUnique 28 -composeIdKey = mkPreludeMiscIdUnique 29 - -bindIOIdKey, returnIOIdKey, newStablePtrIdKey, - printIdKey, nullAddrIdKey, voidArgIdKey, - otherwiseIdKey, assertIdKey :: KnownKey -bindIOIdKey = mkPreludeMiscIdUnique 34 -returnIOIdKey = mkPreludeMiscIdUnique 35 -newStablePtrIdKey = mkPreludeMiscIdUnique 36 -printIdKey = mkPreludeMiscIdUnique 37 + +nullAddrIdKey, voidArgIdKey, otherwiseIdKey, assertIdKey :: KnownKey nullAddrIdKey = mkPreludeMiscIdUnique 39 voidArgIdKey = mkPreludeMiscIdUnique 40 otherwiseIdKey = mkPreludeMiscIdUnique 43 @@ -1035,28 +879,22 @@ leftSectionKey, rightSectionKey :: KnownKey leftSectionKey = mkPreludeMiscIdUnique 45 rightSectionKey = mkPreludeMiscIdUnique 46 -rootMainKey, runMainKey :: KnownKey +rootMainKey :: KnownKey rootMainKey = mkPreludeMiscIdUnique 101 -runMainKey = mkPreludeMiscIdUnique 102 -thenIOIdKey, lazyIdKey, oneShotKey, runRWKey :: KnownKey -thenIOIdKey = mkPreludeMiscIdUnique 103 +lazyIdKey, oneShotKey, runRWKey :: KnownKey lazyIdKey = mkPreludeMiscIdUnique 104 oneShotKey = mkPreludeMiscIdUnique 106 runRWKey = mkPreludeMiscIdUnique 107 -traceKey :: KnownKey -traceKey = mkPreludeMiscIdUnique 108 nospecIdKey :: KnownKey nospecIdKey = mkPreludeMiscIdUnique 109 inlineIdKey, noinlineIdKey, noinlineConstraintIdKey :: KnownKey inlineIdKey = mkPreludeMiscIdUnique 120 --- see below -mapIdKey, dollarIdKey, coercionTokenIdKey, considerAccessibleIdKey :: KnownKey -mapIdKey = mkPreludeMiscIdUnique 121 +dollarIdKey, coercionTokenIdKey, considerAccessibleIdKey :: KnownKey dollarIdKey = mkPreludeMiscIdUnique 123 coercionTokenIdKey = mkPreludeMiscIdUnique 124 considerAccessibleIdKey = mkPreludeMiscIdUnique 125 @@ -1080,60 +918,17 @@ coerceKey = mkPreludeMiscIdUnique 135 unboundKey :: KnownKey unboundKey = mkPreludeMiscIdUnique 136 -fromIntegerClassOpKey, minusClassOpKey, fromRationalClassOpKey, - enumFromClassOpKey, enumFromThenClassOpKey, enumFromToClassOpKey, - enumFromThenToClassOpKey, negateClassOpKey, - bindMClassOpKey, thenMClassOpKey, returnMClassOpKey, fmapClassOpKey - :: KnownKey -fromIntegerClassOpKey = mkPreludeMiscIdUnique 140 -minusClassOpKey = mkPreludeMiscIdUnique 141 -fromRationalClassOpKey = mkPreludeMiscIdUnique 142 -enumFromClassOpKey = mkPreludeMiscIdUnique 143 -enumFromThenClassOpKey = mkPreludeMiscIdUnique 144 -enumFromToClassOpKey = mkPreludeMiscIdUnique 145 -enumFromThenToClassOpKey = mkPreludeMiscIdUnique 146 - -eqClassOpKey, geClassOpKey, leClassOpKey, - ltClassOpKey, gtClassOpKey, compareClassOpKey :: KnownKey -eqClassOpKey = mkPreludeMiscIdUnique 147 -geClassOpKey = mkPreludeMiscIdUnique 148 -leClassOpKey = mkPreludeMiscIdUnique 149 -ltClassOpKey = mkPreludeMiscIdUnique 150 -gtClassOpKey = mkPreludeMiscIdUnique 151 -compareClassOpKey = mkPreludeMiscIdUnique 152 - - -negateClassOpKey = mkPreludeMiscIdUnique 153 + + +bindMClassOpKey, thenMClassOpKey, returnMClassOpKey :: KnownKey bindMClassOpKey = mkPreludeMiscIdUnique 154 thenMClassOpKey = mkPreludeMiscIdUnique 155 -- (>>) -fmapClassOpKey = mkPreludeMiscIdUnique 156 returnMClassOpKey = mkPreludeMiscIdUnique 157 --- Recursive do notation -mfixIdKey :: KnownKey -mfixIdKey = mkPreludeMiscIdUnique 158 - -- MonadFail operations failMClassOpKey :: KnownKey failMClassOpKey = mkPreludeMiscIdUnique 159 --- fromLabel -fromLabelClassOpKey :: KnownKey -fromLabelClassOpKey = mkPreludeMiscIdUnique 160 - --- Arrow notation -arrAIdKey, composeAIdKey, firstAIdKey, appAIdKey, choiceAIdKey, - loopAIdKey :: KnownKey -arrAIdKey = mkPreludeMiscIdUnique 180 -composeAIdKey = mkPreludeMiscIdUnique 181 -- >>> -firstAIdKey = mkPreludeMiscIdUnique 182 -appAIdKey = mkPreludeMiscIdUnique 183 -choiceAIdKey = mkPreludeMiscIdUnique 184 -- ||| -loopAIdKey = mkPreludeMiscIdUnique 185 - -fromStringClassOpKey :: KnownKey -fromStringClassOpKey = mkPreludeMiscIdUnique 186 - -- Conversion functions fromIntegralIdKey, realToFracIdKey, toIntegerClassOpKey, toRationalClassOpKey :: KnownKey fromIntegralIdKey = mkPreludeMiscIdUnique 190 @@ -1141,16 +936,8 @@ realToFracIdKey = mkPreludeMiscIdUnique 191 toIntegerClassOpKey = mkPreludeMiscIdUnique 192 toRationalClassOpKey = mkPreludeMiscIdUnique 193 --- Monad comprehensions -guardMIdKey, mzipIdKey :: KnownKey -guardMIdKey = mkPreludeMiscIdUnique 194 -mzipIdKey = mkPreludeMiscIdUnique 196 - -- Overloaded lists -isListClassKey, fromListClassOpKey, fromListNClassOpKey, toListClassOpKey :: KnownKey -isListClassKey = mkPreludeMiscIdUnique 198 -fromListClassOpKey = mkPreludeMiscIdUnique 199 -fromListNClassOpKey = mkPreludeMiscIdUnique 500 +toListClassOpKey :: KnownKey toListClassOpKey = mkPreludeMiscIdUnique 501 proxyHashKey :: KnownKey @@ -1160,37 +947,6 @@ proxyHashKey = mkPreludeMiscIdUnique 502 -- GHC.Builtin.TH: USES IdUniques 200-499 ----------------------------------------------------- --- Used to make `Typeable` dictionaries -mkTyConKey - , mkTrConKey - , mkTrAppCheckedKey - , mkTrFunKey - , typeNatTypeRepKey - , typeSymbolTypeRepKey - , typeCharTypeRepKey - , typeRepIdKey - :: KnownKey -mkTyConKey = mkPreludeMiscIdUnique 503 -mkTrConKey = mkPreludeMiscIdUnique 505 -mkTrAppCheckedKey = mkPreludeMiscIdUnique 506 -typeNatTypeRepKey = mkPreludeMiscIdUnique 507 -typeSymbolTypeRepKey = mkPreludeMiscIdUnique 508 -typeCharTypeRepKey = mkPreludeMiscIdUnique 509 -typeRepIdKey = mkPreludeMiscIdUnique 510 -mkTrFunKey = mkPreludeMiscIdUnique 511 - --- KindReps for common cases -starKindRepKey, starArrStarKindRepKey, starArrStarArrStarKindRepKey, constraintKindRepKey :: KnownKey -starKindRepKey = mkPreludeMiscIdUnique 520 -starArrStarKindRepKey = mkPreludeMiscIdUnique 521 -starArrStarArrStarKindRepKey = mkPreludeMiscIdUnique 522 -constraintKindRepKey = mkPreludeMiscIdUnique 523 - --- Dynamic -toDynIdKey :: KnownKey -toDynIdKey = mkPreludeMiscIdUnique 530 - - heqSCSelIdKey, eqSCSelIdKey, coercibleSCSelIdKey :: KnownKey eqSCSelIdKey = mkPreludeMiscIdUnique 551 heqSCSelIdKey = mkPreludeMiscIdUnique 552 @@ -1199,13 +955,9 @@ coercibleSCSelIdKey = mkPreludeMiscIdUnique 553 sappendClassOpKey :: KnownKey sappendClassOpKey = mkPreludeMiscIdUnique 554 -memptyClassOpKey, mappendClassOpKey, mconcatClassOpKey :: KnownKey -memptyClassOpKey = mkPreludeMiscIdUnique 555 +mappendClassOpKey :: KnownKey mappendClassOpKey = mkPreludeMiscIdUnique 556 -mconcatClassOpKey = mkPreludeMiscIdUnique 557 -fromStaticPtrClassOpKey :: KnownKey -fromStaticPtrClassOpKey = mkPreludeMiscIdUnique 560 makeStaticKey :: KnownKey makeStaticKey = mkPreludeMiscIdUnique 561 @@ -1346,13 +1098,3 @@ naturalLcmIdKey = mkPreludeMiscIdUnique 679 bignatEqIdKey = mkPreludeMiscIdUnique 691 bignatCompareIdKey = mkPreludeMiscIdUnique 692 bignatCompareWordIdKey = mkPreludeMiscIdUnique 693 - - ------------------------------------------------------- --- ghci optimization for big rationals 700-749 uniques ------------------------------------------------------- - --- Creating rationals at runtime. -mkRationalBase2IdKey, mkRationalBase10IdKey :: KnownKey -mkRationalBase2IdKey = mkPreludeMiscIdUnique 700 -mkRationalBase10IdKey = mkPreludeMiscIdUnique 701 :: KnownKey ===================================== compiler/GHC/Builtin/Modules.hs ===================================== @@ -21,119 +21,42 @@ import Language.Haskell.Syntax.Module.Name --MetaHaskell Extension Add a new module here -} -gHC_PRIM, gHC_PRIM_PANIC, - gHC_TYPES, gHC_INTERNAL_DATA_DATA, gHC_MAGIC, gHC_MAGIC_DICT, - gHC_CLASSES, gHC_CLASSES_IP, gHC_PRIMOPWRAPPERS :: Module +gHC_PRIM, gHC_PRIM_PANIC, gHC_TYPES, gHC_MAGIC, + gHC_MAGIC_DICT, gHC_CLASSES, gHC_PRIMOPWRAPPERS :: Module gHC_PRIM = mkGhcInternalModule (fsLit "GHC.Internal.Prim") -- Primitive types and values gHC_PRIM_PANIC = mkGhcInternalModule (fsLit "GHC.Internal.Prim.Panic") gHC_TYPES = mkGhcInternalModule (fsLit "GHC.Internal.Types") gHC_MAGIC = mkGhcInternalModule (fsLit "GHC.Internal.Magic") gHC_MAGIC_DICT = mkGhcInternalModule (fsLit "GHC.Internal.Magic.Dict") gHC_CLASSES = mkGhcInternalModule (fsLit "GHC.Internal.Classes") -gHC_CLASSES_IP = mkGhcInternalModule (fsLit "GHC.Internal.Classes.IP") gHC_PRIMOPWRAPPERS = mkGhcInternalModule (fsLit "GHC.Internal.PrimopWrappers") gHC_INTERNAL_TUPLE = mkGhcInternalModule (fsLit "GHC.Internal.Tuple") -gHC_INTERNAL_CONTROL_MONAD_ZIP :: Module -gHC_INTERNAL_CONTROL_MONAD_ZIP = mkGhcInternalModule (fsLit "GHC.Internal.Control.Monad.Zip") - gHC_INTERNAL_NUM_INTEGER, gHC_INTERNAL_NUM_NATURAL, gHC_INTERNAL_NUM_BIGNAT :: Module gHC_INTERNAL_NUM_INTEGER = mkGhcInternalModule (fsLit "GHC.Internal.Bignum.Integer") gHC_INTERNAL_NUM_NATURAL = mkGhcInternalModule (fsLit "GHC.Internal.Bignum.Natural") gHC_INTERNAL_NUM_BIGNAT = mkGhcInternalModule (fsLit "GHC.Internal.Bignum.BigNat") -gHC_INTERNAL_BASE, gHC_INTERNAL_ENUM, - gHC_INTERNAL_GHCI, gHC_INTERNAL_GHCI_HELPERS, gHC_INTERNAL_DATA_STRING, - gHC_INTERNAL_SHOW, gHC_INTERNAL_READ, gHC_INTERNAL_NUM, gHC_INTERNAL_MAYBE, - gHC_INTERNAL_LIST, gHC_INTERNAL_TUPLE, gHC_INTERNAL_DATA_EITHER, - gHC_INTERNAL_DATA_FOLDABLE, gHC_INTERNAL_DATA_TRAVERSABLE, - gHC_INTERNAL_EXCEPTION_CONTEXT, - gHC_INTERNAL_CONC, gHC_INTERNAL_IO, gHC_INTERNAL_IO_Exception, - gHC_INTERNAL_ST, gHC_INTERNAL_IX, gHC_INTERNAL_STABLE, gHC_INTERNAL_PTR, gHC_INTERNAL_ERR, gHC_INTERNAL_REAL, - gHC_INTERNAL_FLOAT, gHC_INTERNAL_TOP_HANDLER, gHC_INTERNAL_SYSTEM_IO, gHC_INTERNAL_DYNAMIC, - gHC_INTERNAL_TYPEABLE, gHC_INTERNAL_TYPEABLE_INTERNAL, gHC_INTERNAL_GENERICS, - gHC_INTERNAL_READ_PREC, gHC_INTERNAL_LEX, gHC_INTERNAL_INT, gHC_INTERNAL_WORD, gHC_INTERNAL_MONAD, gHC_INTERNAL_MONAD_FIX, gHC_INTERNAL_MONAD_FAIL, - gHC_INTERNAL_ARROW, gHC_INTERNAL_DESUGAR, gHC_INTERNAL_RANDOM, gHC_INTERNAL_EXTS, - gHC_INTERNAL_CONTROL_EXCEPTION_BASE, gHC_INTERNAL_TYPEERROR, gHC_INTERNAL_TYPELITS, gHC_INTERNAL_TYPELITS_INTERNAL, - gHC_INTERNAL_TYPENATS, gHC_INTERNAL_TYPENATS_INTERNAL, - gHC_INTERNAL_DATA_COERCE, gHC_INTERNAL_DEBUG_TRACE, gHC_INTERNAL_UNSAFE_COERCE, gHC_INTERNAL_FOREIGN_C_CONSTPTR, - gHC_INTERNAL_JS_PRIM, gHC_INTERNAL_WASM_PRIM_TYPES :: Module +gHC_INTERNAL_BASE, gHC_INTERNAL_GHCI_HELPERS, gHC_INTERNAL_MAYBE, + gHC_INTERNAL_TUPLE, gHC_INTERNAL_DATA_TRAVERSABLE, gHC_INTERNAL_ERR, + gHC_INTERNAL_WORD, gHC_INTERNAL_MONAD_FAIL, + gHC_INTERNAL_CONTROL_EXCEPTION_BASE, gHC_INTERNAL_TYPEERROR, + gHC_INTERNAL_TYPELITS, gHC_INTERNAL_TYPELITS_INTERNAL, gHC_INTERNAL_TYPENATS, + gHC_INTERNAL_TYPENATS_INTERNAL, gHC_INTERNAL_UNSAFE_COERCE :: Module gHC_INTERNAL_BASE = mkGhcInternalModule (fsLit "GHC.Internal.Base") -gHC_INTERNAL_ENUM = mkGhcInternalModule (fsLit "GHC.Internal.Enum") -gHC_INTERNAL_GHCI = mkGhcInternalModule (fsLit "GHC.Internal.GHCi") gHC_INTERNAL_GHCI_HELPERS = mkGhcInternalModule (fsLit "GHC.Internal.GHCi.Helpers") -gHC_INTERNAL_SHOW = mkGhcInternalModule (fsLit "GHC.Internal.Show") -gHC_INTERNAL_READ = mkGhcInternalModule (fsLit "GHC.Internal.Read") -gHC_INTERNAL_NUM = mkGhcInternalModule (fsLit "GHC.Internal.Num") gHC_INTERNAL_MAYBE = mkGhcInternalModule (fsLit "GHC.Internal.Maybe") -gHC_INTERNAL_LIST = mkGhcInternalModule (fsLit "GHC.Internal.List") -gHC_INTERNAL_DATA_EITHER = mkGhcInternalModule (fsLit "GHC.Internal.Data.Either") -gHC_INTERNAL_DATA_STRING = mkGhcInternalModule (fsLit "GHC.Internal.Data.String") -gHC_INTERNAL_DATA_FOLDABLE = mkGhcInternalModule (fsLit "GHC.Internal.Data.Foldable") gHC_INTERNAL_DATA_TRAVERSABLE = mkGhcInternalModule (fsLit "GHC.Internal.Data.Traversable") -gHC_INTERNAL_CONC = mkGhcInternalModule (fsLit "GHC.Internal.GHC.Conc") -gHC_INTERNAL_IO = mkGhcInternalModule (fsLit "GHC.Internal.IO") -gHC_INTERNAL_IO_Exception = mkGhcInternalModule (fsLit "GHC.Internal.IO.Exception") -gHC_INTERNAL_ST = mkGhcInternalModule (fsLit "GHC.Internal.ST") -gHC_INTERNAL_IX = mkGhcInternalModule (fsLit "GHC.Internal.Ix") -gHC_INTERNAL_STABLE = mkGhcInternalModule (fsLit "GHC.Internal.Stable") -gHC_INTERNAL_PTR = mkGhcInternalModule (fsLit "GHC.Internal.Ptr") gHC_INTERNAL_ERR = mkGhcInternalModule (fsLit "GHC.Internal.Err") -gHC_INTERNAL_REAL = mkGhcInternalModule (fsLit "GHC.Internal.Real") -gHC_INTERNAL_FLOAT = mkGhcInternalModule (fsLit "GHC.Internal.Float") -gHC_INTERNAL_TOP_HANDLER = mkGhcInternalModule (fsLit "GHC.Internal.TopHandler") -gHC_INTERNAL_SYSTEM_IO = mkGhcInternalModule (fsLit "GHC.Internal.System.IO") -gHC_INTERNAL_DYNAMIC = mkGhcInternalModule (fsLit "GHC.Internal.Data.Dynamic") -gHC_INTERNAL_TYPEABLE = mkGhcInternalModule (fsLit "GHC.Internal.Data.Typeable") -gHC_INTERNAL_TYPEABLE_INTERNAL = mkGhcInternalModule (fsLit "GHC.Internal.Data.Typeable.Internal") -gHC_INTERNAL_DATA_DATA = mkGhcInternalModule (fsLit "GHC.Internal.Data.Data") -gHC_INTERNAL_READ_PREC = mkGhcInternalModule (fsLit "GHC.Internal.Text.ParserCombinators.ReadPrec") -gHC_INTERNAL_LEX = mkGhcInternalModule (fsLit "GHC.Internal.Text.Read.Lex") -gHC_INTERNAL_INT = mkGhcInternalModule (fsLit "GHC.Internal.Int") gHC_INTERNAL_WORD = mkGhcInternalModule (fsLit "GHC.Internal.Word") -gHC_INTERNAL_MONAD = mkGhcInternalModule (fsLit "GHC.Internal.Control.Monad") -gHC_INTERNAL_MONAD_FIX = mkGhcInternalModule (fsLit "GHC.Internal.Control.Monad.Fix") gHC_INTERNAL_MONAD_FAIL = mkGhcInternalModule (fsLit "GHC.Internal.Control.Monad.Fail") -gHC_INTERNAL_ARROW = mkGhcInternalModule (fsLit "GHC.Internal.Control.Arrow") -gHC_INTERNAL_DESUGAR = mkGhcInternalModule (fsLit "GHC.Internal.Desugar") -gHC_INTERNAL_RANDOM = mkGhcInternalModule (fsLit "GHC.Internal.System.Random") -gHC_INTERNAL_EXTS = mkGhcInternalModule (fsLit "GHC.Internal.Exts") gHC_INTERNAL_CONTROL_EXCEPTION_BASE = mkGhcInternalModule (fsLit "GHC.Internal.Control.Exception.Base") -gHC_INTERNAL_EXCEPTION_CONTEXT = mkGhcInternalModule (fsLit "GHC.Internal.Exception.Context") -gHC_INTERNAL_GENERICS = mkGhcInternalModule (fsLit "GHC.Internal.Generics") gHC_INTERNAL_TYPEERROR = mkGhcInternalModule (fsLit "GHC.Internal.TypeError") gHC_INTERNAL_TYPELITS = mkGhcInternalModule (fsLit "GHC.Internal.TypeLits") gHC_INTERNAL_TYPELITS_INTERNAL = mkGhcInternalModule (fsLit "GHC.Internal.TypeLits.Internal") gHC_INTERNAL_TYPENATS = mkGhcInternalModule (fsLit "GHC.Internal.TypeNats") gHC_INTERNAL_TYPENATS_INTERNAL = mkGhcInternalModule (fsLit "GHC.Internal.TypeNats.Internal") -gHC_INTERNAL_DATA_COERCE = mkGhcInternalModule (fsLit "GHC.Internal.Data.Coerce") -gHC_INTERNAL_DEBUG_TRACE = mkGhcInternalModule (fsLit "GHC.Internal.Debug.Trace") gHC_INTERNAL_UNSAFE_COERCE = mkGhcInternalModule (fsLit "GHC.Internal.Unsafe.Coerce") -gHC_INTERNAL_FOREIGN_C_CONSTPTR = mkGhcInternalModule (fsLit "GHC.Internal.Foreign.C.ConstPtr") -gHC_INTERNAL_JS_PRIM = mkGhcInternalModule (fsLit "GHC.Internal.JS.Prim") -gHC_INTERNAL_WASM_PRIM_TYPES = mkGhcInternalModule (fsLit "GHC.Internal.Wasm.Prim.Types") - -gHC_INTERNAL_SRCLOC :: Module -gHC_INTERNAL_SRCLOC = mkGhcInternalModule (fsLit "GHC.Internal.SrcLoc") - -gHC_INTERNAL_STACK, gHC_INTERNAL_STACK_TYPES :: Module -gHC_INTERNAL_STACK = mkGhcInternalModule (fsLit "GHC.Internal.Stack") -gHC_INTERNAL_STACK_TYPES = mkGhcInternalModule (fsLit "GHC.Internal.Stack.Types") - -gHC_INTERNAL_STATICPTR :: Module -gHC_INTERNAL_STATICPTR = mkGhcInternalModule (fsLit "GHC.Internal.StaticPtr") - -gHC_INTERNAL_STATICPTR_INTERNAL :: Module -gHC_INTERNAL_STATICPTR_INTERNAL = mkGhcInternalModule (fsLit "GHC.Internal.StaticPtr.Internal") - -gHC_INTERNAL_FINGERPRINT_TYPE :: Module -gHC_INTERNAL_FINGERPRINT_TYPE = mkGhcInternalModule (fsLit "GHC.Internal.Fingerprint.Type") - -gHC_INTERNAL_OVER_LABELS :: Module -gHC_INTERNAL_OVER_LABELS = mkGhcInternalModule (fsLit "GHC.Internal.OverloadedLabels") - -gHC_INTERNAL_RECORDS :: Module -gHC_INTERNAL_RECORDS = mkGhcInternalModule (fsLit "GHC.Internal.Records") rOOT_MAIN :: Module rOOT_MAIN = mkMainModule (fsLit ":Main") -- Root module for initialisation ===================================== compiler/GHC/Builtin/TH.hs ===================================== @@ -28,15 +28,10 @@ liftLib = mkTHModule (fsLit "GHC.Internal.TH.Lift") mkTHModule :: FastString -> Module mkTHModule m = mkModule ghcInternalUnit (mkModuleNameFS m) -libFun, libTc, thFun, thTc, thCon, liftFun, thMonadTc, thMonadCls, thMonadFun :: FastString -> Unique -> Name +libFun, thFun, thCon, thMonadFun :: FastString -> Unique -> Name libFun = mk_known_key_name varName thLib -libTc = mk_known_key_name tcName thLib thFun = mk_known_key_name varName thSyn -thTc = mk_known_key_name tcName thSyn thCon = mk_known_key_name dataName thSyn -liftFun = mk_known_key_name varName liftLib -thMonadTc = mk_known_key_name tcName thMonad -thMonadCls = mk_known_key_name clsName thMonad thMonadFun = mk_known_key_name varName thMonad thMonadFld :: FastString -> FastString -> Unique -> Name @@ -49,11 +44,10 @@ qqFld = mk_known_key_name (fieldName (fsLit "QuasiQuoter")) qqLib quoteClassOcc :: KnownOcc quoteClassOcc = mkTcOcc "Quote" -qTyConOcc, nameTyConOcc, fieldExpTyConOcc, patTyConOcc, - fieldPatTyConOcc, expTyConOcc, decTyConOcc, typeTyConOcc, - matchTyConOcc, clauseTyConOcc, funDepTyConOcc, predTyConOcc, - codeTyConOcc, injAnnTyConOcc, overlapTyConOcc, decsTyConOcc, - modNameTyConOcc, quasiQuoterTyConOcc :: KnownOcc +qTyConOcc, nameTyConOcc, fieldExpTyConOcc, patTyConOcc, fieldPatTyConOcc, + expTyConOcc, decTyConOcc, typeTyConOcc, matchTyConOcc, funDepTyConOcc, + codeTyConOcc, injAnnTyConOcc, overlapTyConOcc, decsTyConOcc, modNameTyConOcc, + quasiQuoterTyConOcc :: KnownOcc qTyConOcc = mkTcOcc "Q" nameTyConOcc = mkTcOcc "Name" fieldExpTyConOcc = mkTcOcc "FieldExp" @@ -64,9 +58,7 @@ decTyConOcc = mkTcOcc "Dec" decsTyConOcc = mkTcOcc "Decs" typeTyConOcc = mkTcOcc "Type" matchTyConOcc = mkTcOcc "Match" -clauseTyConOcc = mkTcOcc "Clause" funDepTyConOcc = mkTcOcc "FunDep" -predTyConOcc = mkTcOcc "Pred" codeTyConOcc = mkTcOcc "Code" injAnnTyConOcc = mkTcOcc "InjectivityAnn" overlapTyConOcc = mkTcOcc "Overlap" @@ -76,12 +68,9 @@ quasiQuoterTyConOcc = mkTcOcc "QuasiQuoter" sequenceQOcc :: KnownOcc sequenceQOcc = mkVarOcc "sequenceQ" -newNameName, - mkNameName, mkNameG_vName, mkNameG_fldName, mkNameG_dName, mkNameG_tcName, - mkNameLName, mkNameSName, unTypeName, unTypeCodeName, - mkModNameName, mkNameQName :: Name +newNameName, mkNameG_vName, mkNameG_fldName, mkNameG_dName, mkNameG_tcName, + mkNameLName, mkNameSName, unTypeCodeName, mkModNameName, mkNameQName :: Name newNameName = thMonadFun (fsLit "newName") newNameIdKey -mkNameName = thFun (fsLit "mkName") mkNameIdKey mkNameG_vName = thFun (fsLit "mkNameG_v") mkNameG_vIdKey mkNameG_dName = thFun (fsLit "mkNameG_d") mkNameG_dIdKey mkNameG_tcName = thFun (fsLit "mkNameG_tc") mkNameG_tcIdKey @@ -90,7 +79,6 @@ mkNameLName = thFun (fsLit "mkNameL") mkNameLIdKey mkNameQName = thFun (fsLit "mkNameQ") mkNameQIdKey mkNameSName = thFun (fsLit "mkNameS") mkNameSIdKey mkModNameName = thFun (fsLit "mkModName") mkModNameIdKey -unTypeName = thMonadFld (fsLit "TExp") (fsLit "unType") unTypeIdKey unTypeCodeName = thMonadFun (fsLit "unTypeCode") unTypeCodeIdKey liftIdOcc, unsafeCodeCoerceOcc :: KnownOcc @@ -143,18 +131,17 @@ matchOcc = mkVarOcc "match" clauseOcc = mkVarOcc "clause" -- data Exp = ... -varEOcc, conEOcc, litEOcc, appEOcc, appTypeEOcc, infixEOcc, infixAppOcc, - sectionLOcc, sectionROcc, lamEOcc, lamCaseEOcc, lamCasesEOcc, tupEOcc, - unboxedTupEOcc, unboxedSumEOcc, condEOcc, multiIfEOcc, letEOcc, - caseEOcc, doEOcc, mdoEOcc, compEOcc, staticEOcc, unboundVarEOcc, - labelEOcc, implicitParamVarEOcc, getFieldEOcc, projectionEOcc, typeEOcc, - forallEOcc, forallVisEOcc, constrainedEOcc :: KnownOcc +varEOcc, conEOcc, litEOcc, appEOcc, appTypeEOcc, infixAppOcc, sectionLOcc, + sectionROcc, lamEOcc, lamCaseEOcc, lamCasesEOcc, tupEOcc, unboxedTupEOcc, + unboxedSumEOcc, condEOcc, multiIfEOcc, letEOcc, caseEOcc, doEOcc, mdoEOcc, + compEOcc, staticEOcc, unboundVarEOcc, labelEOcc, implicitParamVarEOcc, + getFieldEOcc, projectionEOcc, typeEOcc, forallEOcc, forallVisEOcc, + constrainedEOcc :: KnownOcc varEOcc = mkVarOcc "varE" conEOcc = mkVarOcc "conE" litEOcc = mkVarOcc "litE" appEOcc = mkVarOcc "appE" appTypeEOcc = mkVarOcc "appTypeE" -infixEOcc = mkVarOcc "infixE" infixAppOcc = mkVarOcc "infixApp" sectionLOcc = mkVarOcc "sectionL" sectionROcc = mkVarOcc "sectionR" @@ -535,53 +522,6 @@ liftClassKey = mkPreludeClassUnique 200 -- TyConUniques available: 200-299 -- Check in GHC.Builtin.KnownKeys if you want to change this -expTyConKey, matchTyConKey, clauseTyConKey, qTyConKey, expQTyConKey, - patTyConKey, - stmtTyConKey, conTyConKey, typeQTyConKey, typeTyConKey, - tyVarBndrUnitTyConKey, tyVarBndrSpecTyConKey, tyVarBndrVisTyConKey, - decTyConKey, bangTypeTyConKey, varBangTypeTyConKey, - fieldExpTyConKey, fieldPatTyConKey, nameTyConKey, patQTyConKey, - funDepTyConKey, predTyConKey, - predQTyConKey, decsQTyConKey, ruleBndrTyConKey, tySynEqnTyConKey, - roleTyConKey, codeTyConKey, injAnnTyConKey, kindTyConKey, - overlapTyConKey, derivClauseTyConKey, derivStrategyTyConKey, decsTyConKey, - modNameTyConKey, quasiQuoterTyConKey :: Unique -expTyConKey = mkPreludeTyConUnique 200 -matchTyConKey = mkPreludeTyConUnique 201 -clauseTyConKey = mkPreludeTyConUnique 202 -qTyConKey = mkPreludeTyConUnique 203 -expQTyConKey = mkPreludeTyConUnique 204 -patTyConKey = mkPreludeTyConUnique 206 -stmtTyConKey = mkPreludeTyConUnique 209 -conTyConKey = mkPreludeTyConUnique 210 -typeQTyConKey = mkPreludeTyConUnique 211 -typeTyConKey = mkPreludeTyConUnique 212 -decTyConKey = mkPreludeTyConUnique 213 -bangTypeTyConKey = mkPreludeTyConUnique 214 -varBangTypeTyConKey = mkPreludeTyConUnique 215 -fieldExpTyConKey = mkPreludeTyConUnique 216 -fieldPatTyConKey = mkPreludeTyConUnique 217 -nameTyConKey = mkPreludeTyConUnique 218 -patQTyConKey = mkPreludeTyConUnique 219 -funDepTyConKey = mkPreludeTyConUnique 222 -predTyConKey = mkPreludeTyConUnique 223 -predQTyConKey = mkPreludeTyConUnique 224 -tyVarBndrUnitTyConKey = mkPreludeTyConUnique 225 -decsQTyConKey = mkPreludeTyConUnique 226 -ruleBndrTyConKey = mkPreludeTyConUnique 227 -tySynEqnTyConKey = mkPreludeTyConUnique 228 -roleTyConKey = mkPreludeTyConUnique 229 -injAnnTyConKey = mkPreludeTyConUnique 231 -kindTyConKey = mkPreludeTyConUnique 232 -overlapTyConKey = mkPreludeTyConUnique 233 -derivClauseTyConKey = mkPreludeTyConUnique 234 -derivStrategyTyConKey = mkPreludeTyConUnique 235 -decsTyConKey = mkPreludeTyConUnique 236 -tyVarBndrSpecTyConKey = mkPreludeTyConUnique 237 -codeTyConKey = mkPreludeTyConUnique 238 -modNameTyConKey = mkPreludeTyConUnique 239 -tyVarBndrVisTyConKey = mkPreludeTyConUnique 240 -quasiQuoterTyConKey = mkPreludeTyConUnique 241 {- ********************************************************************* * * @@ -635,189 +575,23 @@ dataNamespaceSpecifierDataConKey = mkPreludeDataConUnique 215 -- IdUniques available: 200-499 -- If you want to change this, make sure you check in GHC.Builtin.KnownKeys -sequenceQIdKey, liftIdKey, newNameIdKey, - mkNameIdKey, mkNameG_vIdKey, mkNameG_fldIdKey, mkNameG_dIdKey, mkNameG_tcIdKey, - mkNameLIdKey, mkNameSIdKey, unTypeIdKey, unTypeCodeIdKey, - unsafeCodeCoerceIdKey, liftTypedIdKey, mkModNameIdKey, mkNameQIdKey :: Unique -sequenceQIdKey = mkPreludeMiscIdUnique 202 -liftIdKey = mkPreludeMiscIdUnique 203 +newNameIdKey, mkNameG_vIdKey, mkNameG_fldIdKey, mkNameG_dIdKey, + mkNameG_tcIdKey, mkNameLIdKey, mkNameSIdKey, unTypeCodeIdKey, + mkModNameIdKey, mkNameQIdKey :: Unique newNameIdKey = mkPreludeMiscIdUnique 204 -mkNameIdKey = mkPreludeMiscIdUnique 205 mkNameG_vIdKey = mkPreludeMiscIdUnique 206 mkNameG_dIdKey = mkPreludeMiscIdUnique 207 mkNameG_tcIdKey = mkPreludeMiscIdUnique 208 mkNameLIdKey = mkPreludeMiscIdUnique 209 mkNameSIdKey = mkPreludeMiscIdUnique 210 -unTypeIdKey = mkPreludeMiscIdUnique 211 unTypeCodeIdKey = mkPreludeMiscIdUnique 212 -liftTypedIdKey = mkPreludeMiscIdUnique 214 -mkModNameIdKey = mkPreludeMiscIdUnique 215 -unsafeCodeCoerceIdKey = mkPreludeMiscIdUnique 216 +mkModNameIdKey = mkPreludeMiscIdUnique 215 mkNameQIdKey = mkPreludeMiscIdUnique 217 mkNameG_fldIdKey = mkPreludeMiscIdUnique 218 - --- data Lit = ... -charLIdKey, stringLIdKey, integerLIdKey, intPrimLIdKey, wordPrimLIdKey, - floatPrimLIdKey, doublePrimLIdKey, rationalLIdKey, stringPrimLIdKey, - charPrimLIdKey:: Unique -charLIdKey = mkPreludeMiscIdUnique 220 -stringLIdKey = mkPreludeMiscIdUnique 221 -integerLIdKey = mkPreludeMiscIdUnique 222 -intPrimLIdKey = mkPreludeMiscIdUnique 223 -wordPrimLIdKey = mkPreludeMiscIdUnique 224 -floatPrimLIdKey = mkPreludeMiscIdUnique 225 -doublePrimLIdKey = mkPreludeMiscIdUnique 226 -rationalLIdKey = mkPreludeMiscIdUnique 227 -stringPrimLIdKey = mkPreludeMiscIdUnique 228 -charPrimLIdKey = mkPreludeMiscIdUnique 229 - -liftStringIdKey :: Unique -liftStringIdKey = mkPreludeMiscIdUnique 230 - --- data Pat = ... -litPIdKey, varPIdKey, tupPIdKey, unboxedTupPIdKey, unboxedSumPIdKey, conPIdKey, - infixPIdKey, tildePIdKey, bangPIdKey, asPIdKey, wildPIdKey, recPIdKey, - listPIdKey, sigPIdKey, viewPIdKey, typePIdKey, invisPIdKey, orPIdKey :: Unique -litPIdKey = mkPreludeMiscIdUnique 240 -varPIdKey = mkPreludeMiscIdUnique 241 -tupPIdKey = mkPreludeMiscIdUnique 242 -unboxedTupPIdKey = mkPreludeMiscIdUnique 243 -unboxedSumPIdKey = mkPreludeMiscIdUnique 244 -conPIdKey = mkPreludeMiscIdUnique 245 -infixPIdKey = mkPreludeMiscIdUnique 246 -tildePIdKey = mkPreludeMiscIdUnique 247 -bangPIdKey = mkPreludeMiscIdUnique 248 -asPIdKey = mkPreludeMiscIdUnique 249 -wildPIdKey = mkPreludeMiscIdUnique 250 -recPIdKey = mkPreludeMiscIdUnique 251 -listPIdKey = mkPreludeMiscIdUnique 252 -sigPIdKey = mkPreludeMiscIdUnique 253 -viewPIdKey = mkPreludeMiscIdUnique 254 -typePIdKey = mkPreludeMiscIdUnique 255 -invisPIdKey = mkPreludeMiscIdUnique 256 -orPIdKey = mkPreludeMiscIdUnique 257 - --- type FieldPat = ... -fieldPatIdKey :: Unique -fieldPatIdKey = mkPreludeMiscIdUnique 260 - --- data Match = ... -matchIdKey :: Unique -matchIdKey = mkPreludeMiscIdUnique 261 - --- data Clause = ... -clauseIdKey :: Unique -clauseIdKey = mkPreludeMiscIdUnique 262 - - --- data Exp = ... -varEIdKey, conEIdKey, litEIdKey, appEIdKey, appTypeEIdKey, infixEIdKey, - infixAppIdKey, sectionLIdKey, sectionRIdKey, lamEIdKey, lamCaseEIdKey, - lamCasesEIdKey, tupEIdKey, unboxedTupEIdKey, unboxedSumEIdKey, condEIdKey, - multiIfEIdKey, letEIdKey, caseEIdKey, doEIdKey, compEIdKey, - fromEIdKey, fromThenEIdKey, fromToEIdKey, fromThenToEIdKey, - listEIdKey, sigEIdKey, recConEIdKey, recUpdEIdKey, staticEIdKey, - unboundVarEIdKey, labelEIdKey, implicitParamVarEIdKey, mdoEIdKey, - getFieldEIdKey, projectionEIdKey, typeEIdKey, forallEIdKey, - forallVisEIdKey, constrainedEIdKey :: Unique -varEIdKey = mkPreludeMiscIdUnique 270 -conEIdKey = mkPreludeMiscIdUnique 271 -litEIdKey = mkPreludeMiscIdUnique 272 -appEIdKey = mkPreludeMiscIdUnique 273 -appTypeEIdKey = mkPreludeMiscIdUnique 274 -infixEIdKey = mkPreludeMiscIdUnique 275 -infixAppIdKey = mkPreludeMiscIdUnique 276 -sectionLIdKey = mkPreludeMiscIdUnique 277 -sectionRIdKey = mkPreludeMiscIdUnique 278 -lamEIdKey = mkPreludeMiscIdUnique 279 -lamCaseEIdKey = mkPreludeMiscIdUnique 280 -lamCasesEIdKey = mkPreludeMiscIdUnique 281 -tupEIdKey = mkPreludeMiscIdUnique 282 -unboxedTupEIdKey = mkPreludeMiscIdUnique 283 -unboxedSumEIdKey = mkPreludeMiscIdUnique 284 -condEIdKey = mkPreludeMiscIdUnique 285 -multiIfEIdKey = mkPreludeMiscIdUnique 286 -letEIdKey = mkPreludeMiscIdUnique 287 -caseEIdKey = mkPreludeMiscIdUnique 288 -doEIdKey = mkPreludeMiscIdUnique 289 -compEIdKey = mkPreludeMiscIdUnique 290 -fromEIdKey = mkPreludeMiscIdUnique 291 -fromThenEIdKey = mkPreludeMiscIdUnique 292 -fromToEIdKey = mkPreludeMiscIdUnique 293 -fromThenToEIdKey = mkPreludeMiscIdUnique 294 -listEIdKey = mkPreludeMiscIdUnique 295 -sigEIdKey = mkPreludeMiscIdUnique 296 -recConEIdKey = mkPreludeMiscIdUnique 297 -recUpdEIdKey = mkPreludeMiscIdUnique 298 -staticEIdKey = mkPreludeMiscIdUnique 299 -unboundVarEIdKey = mkPreludeMiscIdUnique 300 -labelEIdKey = mkPreludeMiscIdUnique 301 -implicitParamVarEIdKey = mkPreludeMiscIdUnique 302 -mdoEIdKey = mkPreludeMiscIdUnique 303 -getFieldEIdKey = mkPreludeMiscIdUnique 304 -projectionEIdKey = mkPreludeMiscIdUnique 305 -typeEIdKey = mkPreludeMiscIdUnique 306 -forallEIdKey = mkPreludeMiscIdUnique 802 -forallVisEIdKey = mkPreludeMiscIdUnique 803 -constrainedEIdKey = mkPreludeMiscIdUnique 804 - --- data Dec = ... -funDIdKey, valDIdKey, dataDIdKey, newtypeDIdKey, tySynDIdKey, classDIdKey, - instanceWithOverlapDIdKey, instanceDIdKey, sigDIdKey, forImpDIdKey, - pragInlDIdKey, pragSpecDIdKey, pragSpecInlDIdKey, pragSpecInstDIdKey, - pragRuleDIdKey, pragAnnDIdKey, defaultSigDIdKey, dataFamilyDIdKey, - openTypeFamilyDIdKey, closedTypeFamilyDIdKey, dataInstDIdKey, - newtypeInstDIdKey, tySynInstDIdKey, standaloneDerivWithStrategyDIdKey, - infixLWithSpecDIdKey, infixRWithSpecDIdKey, infixNWithSpecDIdKey, - roleAnnotDIdKey, patSynDIdKey, patSynSigDIdKey, pragCompleteDIdKey, - implicitParamBindDIdKey, kiSigDIdKey, defaultDIdKey, pragOpaqueDIdKey, - typeDataDIdKey, pragSCCFunDKey, pragSCCFunNamedDKey, - pragSpecEDIdKey, pragSpecInlEDIdKey :: Unique -funDIdKey = mkPreludeMiscIdUnique 320 -valDIdKey = mkPreludeMiscIdUnique 321 -dataDIdKey = mkPreludeMiscIdUnique 322 -newtypeDIdKey = mkPreludeMiscIdUnique 323 -tySynDIdKey = mkPreludeMiscIdUnique 324 -classDIdKey = mkPreludeMiscIdUnique 325 -instanceWithOverlapDIdKey = mkPreludeMiscIdUnique 326 -instanceDIdKey = mkPreludeMiscIdUnique 327 -sigDIdKey = mkPreludeMiscIdUnique 328 -forImpDIdKey = mkPreludeMiscIdUnique 329 -pragInlDIdKey = mkPreludeMiscIdUnique 330 -pragSpecDIdKey = mkPreludeMiscIdUnique 331 -pragSpecInlDIdKey = mkPreludeMiscIdUnique 332 -pragSpecInstDIdKey = mkPreludeMiscIdUnique 333 -pragRuleDIdKey = mkPreludeMiscIdUnique 334 -pragAnnDIdKey = mkPreludeMiscIdUnique 335 -dataFamilyDIdKey = mkPreludeMiscIdUnique 336 -openTypeFamilyDIdKey = mkPreludeMiscIdUnique 337 -dataInstDIdKey = mkPreludeMiscIdUnique 338 -newtypeInstDIdKey = mkPreludeMiscIdUnique 339 -tySynInstDIdKey = mkPreludeMiscIdUnique 340 -closedTypeFamilyDIdKey = mkPreludeMiscIdUnique 341 -infixLWithSpecDIdKey = mkPreludeMiscIdUnique 342 -infixRWithSpecDIdKey = mkPreludeMiscIdUnique 343 -infixNWithSpecDIdKey = mkPreludeMiscIdUnique 344 -roleAnnotDIdKey = mkPreludeMiscIdUnique 345 -standaloneDerivWithStrategyDIdKey = mkPreludeMiscIdUnique 346 -defaultSigDIdKey = mkPreludeMiscIdUnique 347 -patSynDIdKey = mkPreludeMiscIdUnique 348 -patSynSigDIdKey = mkPreludeMiscIdUnique 349 -pragCompleteDIdKey = mkPreludeMiscIdUnique 350 -implicitParamBindDIdKey = mkPreludeMiscIdUnique 351 -kiSigDIdKey = mkPreludeMiscIdUnique 352 -defaultDIdKey = mkPreludeMiscIdUnique 353 -pragOpaqueDIdKey = mkPreludeMiscIdUnique 354 -typeDataDIdKey = mkPreludeMiscIdUnique 355 -pragSCCFunDKey = mkPreludeMiscIdUnique 356 -pragSCCFunNamedDKey = mkPreludeMiscIdUnique 357 -pragSpecEDIdKey = mkPreludeMiscIdUnique 358 -pragSpecInlEDIdKey = mkPreludeMiscIdUnique 359 - -- type Cxt = ... cxtIdKey :: Unique -cxtIdKey = mkPreludeMiscIdUnique 361 +cxtIdKey = mkPreludeMiscIdUnique 361 -- data SourceUnpackedness = ... noSourceUnpackednessKey, sourceNoUnpackKey, sourceUnpackKey :: Unique View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/99f77e238c27c11fa306d9e2b195321... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/99f77e238c27c11fa306d9e2b195321... You're receiving this email because of your account on gitlab.haskell.org.
participants (1)
-
Rodrigo Mesquita (＠alt-romes)