X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FbasicTypes%2FUnique.lhs;h=54c78983a4092f491f245e405a7aaf8803669fb0;hb=ca5a4a480d10d61e5b7a52eb4d556e8b8c33e69d;hp=36702cc905301254c5e991e1083519399524ed03;hpb=f01a8e8c9c53bfb5ab3393ed3457ebf25390efa1;p=ghc-hetmet.git diff --git a/ghc/compiler/basicTypes/Unique.lhs b/ghc/compiler/basicTypes/Unique.lhs index 36702cc..54c7898 100644 --- a/ghc/compiler/basicTypes/Unique.lhs +++ b/ghc/compiler/basicTypes/Unique.lhs @@ -252,13 +252,13 @@ w2i x = word2Int# x i2w x = int2Word# x i2w_s x = (x::Int#) -mkUnique (MkChar c#) (MkInt i#) - = MkUnique (w2i (((i2w (ord# c#)) `shiftL#` (i2w_s 24#)) `or#` (i2w i#))) +mkUnique (C# c) (I# i) + = MkUnique (w2i (((i2w (ord# c)) `shiftL#` (i2w_s 24#)) `or#` (i2w i))) unpkUnique (MkUnique u) = let - tag = MkChar (chr# (w2i ((i2w u) `shiftr` (i2w_s 24#)))) - i = MkInt (w2i ((i2w u) `and#` (i2w 16777215#){-``0x00ffffff''-})) + tag = C# (chr# (w2i ((i2w u) `shiftr` (i2w_s 24#)))) + i = I# (w2i ((i2w u) `and#` (i2w 16777215#){-``0x00ffffff''-})) in (tag, i) where