X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fext-core%2FLanguage%2FCore%2FPrims.hs;h=a022f429de44e40c8f99248c904e981015f3949d;hb=56f88d581b74ed9b816df6e65a58d9aef6b02bca;hp=0c682d4da2e11ac01f6391f5f1271e79fe7f0edd;hpb=b84b5969798530dbf5be9b8bb795b77e5dfbf042;p=ghc-hetmet.git diff --git a/utils/ext-core/Language/Core/Prims.hs b/utils/ext-core/Language/Core/Prims.hs index 0c682d4..a022f42 100644 --- a/utils/ext-core/Language/Core/Prims.hs +++ b/utils/ext-core/Language/Core/Prims.hs @@ -18,14 +18,7 @@ initialEnv = efromlist [(primMname,primEnv), (errMname,errorEnv)] primEnv :: Envs --- Tediously, we add defs for ByteArray# etc. because these are --- declared as ByteArr# (etc.) in primops.txt, and GHC has --- ByteArray# etc. wired-in. --- At least this is better than when all primops were wired-in here. -primEnv = Envs {tcenv_=efromlist $ map (\ (t,k) -> (t,Kind k)) $ - [(snd tcByteArrayzh,ktByteArrayzh), - (snd tcMutableArrayzh, ktMutableArrayzh), - (snd tcMutableByteArrayzh, ktMutableByteArrayzh)] ++ +primEnv = Envs {tcenv_=efromlist $ map (\ (t,k) -> (t,Kind k)) ([(snd $ tcUtuple n, ktUtuple n) | n <- [1..maxUtuple]] ++ ((snd tcArrow,ktArrow):primTcs)), cenv_=efromlist primDcs, @@ -54,20 +47,6 @@ opsState :: [(Var, Ty)] opsState = [ ("realWorldzh", tRWS)] -{- Arrays -} - -tcByteArrayzh, tcMutableArrayzh, tcMutableByteArrayzh :: Qual Tcon -ktByteArrayzh, ktMutableArrayzh, ktMutableByteArrayzh :: Kind - -tcByteArrayzh = pvz "ByteArray" -ktByteArrayzh = Kunlifted - -tcMutableArrayzh = pvz "MutableArray" -ktMutableArrayzh = Karrow Klifted (Karrow Klifted Kunlifted) - -tcMutableByteArrayzh = pvz "MutableByteArray" -ktMutableByteArrayzh = Karrow Klifted Kunlifted - {- Real world and state. -} -- tjc: why isn't this one unboxed?