[remove superfluous 'Atom' argument to the tyvar [binary format change]
John Meacham <john@repetae.net>**20090305110459
 Ignore-this: 7fd3ede126cafb0f9372c539154f9713
] hunk ./E/FromHs.hs 119
-fromTyvar (Tyvar _ n k) = tVr (toId n) (kind k)
+fromTyvar (Tyvar n k) = tVr (toId n) (kind k)
hunk ./FrontEnd/Class.hs 455
-    at (Tyvar _ n k) =  tyvar (updateName (++ foo) n) k
+    at (Tyvar n k) =  tyvar (updateName (++ foo) n) k
hunk ./FrontEnd/Representation.hs 119
-data Tyvar = Tyvar { tyvarAtom :: {-# UNPACK #-} !Atom, tyvarName ::  !Name, tyvarKind :: Kind }
+data Tyvar = Tyvar { tyvarName ::  !Name, tyvarKind :: Kind }
hunk ./FrontEnd/Representation.hs 135
-tyvar n k = Tyvar (toAtom $ show n) n k
+tyvar n k = Tyvar n k
hunk ./FrontEnd/Representation.hs 138
-    Tyvar { tyvarAtom = x } == Tyvar { tyvarAtom = y } = x == y
-    Tyvar { tyvarAtom = x } /= Tyvar { tyvarAtom = y } = x /= y
+    Tyvar { tyvarName = x } == Tyvar { tyvarName = y } = x == y
+    Tyvar { tyvarName = x } /= Tyvar { tyvarName = y } = x /= y
hunk ./FrontEnd/Representation.hs 142
-    compare (Tyvar { tyvarAtom = x }) (Tyvar { tyvarAtom = y }) = compare x y
-    (Tyvar { tyvarAtom = x }) <= (Tyvar { tyvarAtom = y }) = x <= y
-    (Tyvar { tyvarAtom = x }) >= (Tyvar { tyvarAtom = y }) = x >= y
-    (Tyvar { tyvarAtom = x }) <  (Tyvar { tyvarAtom = y })  = x < y
-    (Tyvar { tyvarAtom = x }) >  (Tyvar { tyvarAtom = y })  = x > y
+    compare (Tyvar { tyvarName = x }) (Tyvar { tyvarName = y }) = compare x y
+    (Tyvar { tyvarName = x }) <= (Tyvar { tyvarName = y }) = x <= y
+    (Tyvar { tyvarName = x }) >= (Tyvar { tyvarName = y }) = x >= y
+    (Tyvar { tyvarName = x }) <  (Tyvar { tyvarName = y })  = x < y
+    (Tyvar { tyvarName = x }) >  (Tyvar { tyvarName = y })  = x > y
hunk ./FrontEnd/Representation.hs 199
-    put (Tyvar aa ab ac) = do
+    put (Tyvar aa ab) = do
hunk ./FrontEnd/Representation.hs 202
-        put ac
hunk ./FrontEnd/Representation.hs 205
-        ac <- get
-        return (Tyvar aa ab ac)
+        return (Tyvar aa ab)
hunk ./FrontEnd/Representation.hs 287
-            Nothing -> return $ atom $ tshow (tyvarAtom tyvar)
+            Nothing -> return $ atom $ tshow (tyvarName tyvar)
hunk ./FrontEnd/Tc/Class.hs 121
-    return (map (inst mempty (Map.fromList [ (tyvarAtom mv,t) | (mv,t) <- u ])) ps)
+    return (map (inst mempty (Map.fromList [ (tyvarName mv,t) | (mv,t) <- u ])) ps)
hunk ./FrontEnd/Tc/Monad.hs 66
-import StringTable.Atom
hunk ./FrontEnd/Tc/Monad.hs 271
-    inst:: Map.Map Int Type -> Map.Map Atom Type -> a -> a
+    inst:: Map.Map Int Type -> Map.Map Name Type -> a -> a
hunk ./FrontEnd/Tc/Monad.hs 277
-    inst mm ts (TVar tv ) = case Map.lookup (tyvarAtom tv) ts of
+    inst mm ts (TVar tv ) = case Map.lookup (tyvarName tv) ts of
hunk ./FrontEnd/Tc/Monad.hs 280
-    inst mm ts (TForAll as qt) = TForAll as (inst mm (foldr Map.delete ts (map tyvarAtom as)) qt)
-    inst mm ts (TExists as qt) = TExists as (inst mm (foldr Map.delete ts (map tyvarAtom as)) qt)
+    inst mm ts (TForAll as qt) = TForAll as (inst mm (foldr Map.delete ts (map tyvarName as)) qt)
+    inst mm ts (TExists as qt) = TExists as (inst mm (foldr Map.delete ts (map tyvarName as)) qt)
hunk ./FrontEnd/Tc/Monad.hs 378
-    addPreds $ inst mempty (Map.fromList [ (tyvarAtom bt,s) | (bt,s) <- vs ]) ps
+    addPreds $ inst mempty (Map.fromList [ (tyvarName bt,s) | (bt,s) <- vs ]) ps
hunk ./FrontEnd/Tc/Type.hs 79
-    initMp = Map.fromList [ (tyvarAtom v,t) | (v,t) <- ts ]
+    initMp = Map.fromList [ (tyvarName v,t) | (v,t) <- ts ]
hunk ./FrontEnd/Tc/Type.hs 81
-    f mp (TForAll as qt) = TForAll as (fq (foldr Map.delete mp (map tyvarAtom as)) qt)
-    f mp (TExists as qt) = TExists as (fq (foldr Map.delete mp (map tyvarAtom as)) qt)
-    f mp (TVar tv) = case Map.lookup (tyvarAtom tv) mp of
+    f mp (TForAll as qt) = TForAll as (fq (foldr Map.delete mp (map tyvarName as)) qt)
+    f mp (TExists as qt) = TExists as (fq (foldr Map.delete mp (map tyvarName as)) qt)
+    f mp (TVar tv) = case Map.lookup (tyvarName tv) mp of
hunk ./FrontEnd/Tc/Unify.hs 217
-        let (ps2 :=> r2) = inst mempty (Map.fromList [ (tyvarAtom a2,TVar a1) | a1 <- as1 | a2 <- as2 ]) qt2
+        let (ps2 :=> r2) = inst mempty (Map.fromList [ (tyvarName a2,TVar a1) | a1 <- as1 | a2 <- as2 ]) qt2