[change more uses of LitCons to use record syntax
John Meacham <john@repetae.net>**20061012040809] hunk ./E/E.hs 42
+litCons = LitCons { litName = error "litName: name not set", litArgs = [], litType = error "litCons: type not set" }
hunk ./E/E.hs 177
-patToLitEE (LitCons n [a,b] t) | t == eStar, n == tc_Arrow = EPi (tVr 0 (EVar a)) (EVar b)
+patToLitEE LitCons { litName = n, litArgs = [a,b], litType = t } | t == eStar, n == tc_Arrow = EPi (tVr 0 (EVar a)) (EVar b)
hunk ./E/E.hs 214
-    tInt = ELit (LitCons tInt [] eStar)
-    tRational = ELit (LitCons tc_Ratio [tInteger] eStar)
-    tChar = ELit (LitCons tChar [] eStar)
-    tBool = ELit (LitCons tBool [] eStar)
-    tUnit = ELit (LitCons tUnit [] eStar)
-    tString =  (ELit (LitCons tc_List [tChar] eStar))
-    tInteger = ELit (LitCons tInteger [] eStar)
-    tWorld__ = ELit (LitCons tWorld__ [] eHash)
-    tIntzh = ELit (LitCons tIntzh [] eHash)
-    tIntegerzh = ELit (LitCons tIntegerzh [] eHash)
-    tCharzh = ELit (LitCons tCharzh [] eHash)
+    tInt = ELit (litCons { litName = tInt, litArgs = [], litType = eStar })
+    tRational = ELit (litCons { litName = tc_Ratio, litArgs = [tInteger], litType = eStar })
+    tChar = ELit (litCons { litName = tChar, litArgs = [], litType = eStar })
+    tBool = ELit (litCons { litName = tBool, litArgs = [], litType = eStar })
+    tUnit = ELit (litCons { litName = tUnit, litArgs = [], litType = eStar })
+    tString =  (ELit (litCons { litName = tc_List, litArgs = [tChar], litType = eStar }))
+    tInteger = ELit (litCons { litName = tInteger, litArgs = [], litType = eStar })
+    tWorld__ = ELit (litCons { litName = tWorld__, litArgs = [], litType = eHash })
+    tIntzh = ELit (litCons { litName = tIntzh, litArgs = [], litType = eHash })
+    tIntegerzh = ELit (litCons { litName = tIntegerzh, litArgs = [], litType = eHash })
+    tCharzh = ELit (litCons { litName = tCharzh, litArgs = [], litType = eHash })
hunk ./E/E.hs 232
-    vTrue  = (LitCons dc_Boolzh [ELit (LitInt 1 tIntzh)] tBool)
-    vFalse = (LitCons dc_Boolzh [ELit (LitInt 0 tIntzh)] tBool)
-    vUnit  = (LitCons vUnit [] tUnit)
+    vTrue  = (litCons { litName = dc_Boolzh, litArgs = [ELit (LitInt 1 tIntzh)], litType = tBool })
+    vFalse = (litCons { litName = dc_Boolzh, litArgs = [ELit (LitInt 0 tIntzh)], litType = tBool })
+    vUnit  = (litCons { litName = vUnit, litArgs = [], litType = tUnit })
hunk ./E/E.hs 237
-tBox = ELit (LitCons tc_Box [] eStar)
+tBox = ELit (litCons { litName = tc_Box, litArgs = [], litType = eStar })
hunk ./E/E.hs 318
-toList (ELit (LitCons n [e,b] _)) | vCons == n = toList b >>= \x -> return (e:x)
+toList (ELit LitCons { litName = n, litArgs = [e,b] }) | vCons == n = toList b >>= \x -> return (e:x)
hunk ./E/E.hs 323
-    fromChar (ELit (LitCons dc [ELit (LitInt ch t)] _ot)) | dc == dc_Char && t == tCharzh = return (chr $ fromIntegral ch)
+    fromChar (ELit (LitCons { litName = dc, litArgs = [ELit (LitInt ch t)], litType = _ot })) | dc == dc_Char && t == tCharzh = return (chr $ fromIntegral ch)
hunk ./E/E.hs 327
-tAbsurd k = ELit (LitCons tc_Absurd [] k)
-tPtr t = ELit (LitCons tc_Ptr [t] eStar)
+tAbsurd k = ELit (litCons { litName = tc_Absurd, litArgs = [], litType = k })
+tPtr t = ELit (litCons { litName = tc_Ptr, litArgs = [t], litType = eStar })
hunk ./E/E.hs 331
-tCont = ELit (LitCons tc_IOErrorCont [] eStar)
+tCont = ELit (litCons { litName = tc_IOErrorCont, litArgs = [], litType = eStar })
hunk ./E/Eval.hs 76
-        return $ ELit $ LitCons n es' t'
+        return $ ELit $ litCons { litName = n, litArgs = es', litType = t' }
hunk ./E/FromHs.hs 85
-    res = eCase e [Alt (LitCons dc_Boolzh [tv] tBool) ic] Unknown
+    res = eCase e [Alt (litCons { litName = dc_Boolzh, litArgs = [tv], litType = tBool }) ic] Unknown
hunk ./E/FromHs.hs 102
-    f (TCon (Tycon n k)) | n == tc_World__ =  ELit (LitCons rt_Worldzh [] eHash)
+    f (TCon (Tycon n k)) | n == tc_World__ =  ELit (litCons { litName = rt_Worldzh, litArgs = [], litType = eHash })
hunk ./E/FromHs.hs 233
-        valToPat' (ELit LitCons { litName = x, litArgs = ts, litType = t }) = ELit $ LitCons x [ EVar (tVr j (getType z)) | z <- ts | j <- [2,4 ..], j `notElem` map tvrIdent args]  t
-        valToPat' (EPi (TVr { tvrType =  a}) b)  = ELit $ LitCons tc_Arrow [ EVar (tVr j (getType z)) | z <- [a,b] | j <- [2,4 ..], j `notElem` map tvrIdent args]  eStar
+        valToPat' (ELit LitCons { litName = x, litArgs = ts, litType = t }) = ELit $ litCons { litName = x, litArgs = [ EVar (tVr j (getType z)) | z <- ts | j <- [2,4 ..], j `notElem` map tvrIdent args], litType = t }
+        valToPat' (EPi (TVr { tvrType =  a}) b)  = ELit $ litCons { litName = tc_Arrow, litArgs = [ EVar (tVr j (getType z)) | z <- [a,b] | j <- [2,4 ..], j `notElem` map tvrIdent args], litType = eStar }
hunk ./E/FromHs.hs 274
-            calt e =  Alt (LitCons x [ case e of EVar tvr -> tvr; _ -> error $ "createMethods: "++ show e | e <- vs ]  ct)  e
+            calt e =  Alt (litCons { litName = x, litArgs = [ case e of EVar tvr -> tvr; _ -> error $ "createMethods: "++ show e | e <- vs ], litType = ct })  e
hunk ./E/FromHs.hs 291
-unbox dataTable e vn wtd = eCase e [Alt (LitCons cna [tvra] te) (wtd tvra)] Unknown where
+unbox dataTable e vn wtd = eCase e [Alt (litCons { litName = cna, litArgs = [tvra], litType = te }) (wtd tvra)] Unknown where
hunk ./E/FromHs.hs 306
-        esr (tvr,(tvr',_),(cn,_,_)) e = eCase (EVar tvr) [Alt (LitCons cn [tvr'] te) e] Unknown  where
+        esr (tvr,(tvr',_),(cn,_,_)) e = eCase (EVar tvr) [Alt (litCons { litName = cn, litArgs = [tvr'], litType = te }) e] Unknown  where
hunk ./E/FromHs.hs 413
-        expr $ eStrictLet uvar (EPrim prim [] st) (ELit (LitCons cn [EVar uvar] rt))
+        expr $ eStrictLet uvar (EPrim prim [] st) (ELit (litCons { litName = cn, litArgs = [EVar uvar], litType = rt }))
hunk ./E/FromHs.hs 419
-                ELit (LitCons c [x] _) | c == tc_IO -> (True,x)
+                ELit (litCons { litName = c, litArgs = [x], litType = _ }) | c == tc_IO -> (True,x)
hunk ./E/FromHs.hs 436
-                    False -> cFun $ \rs -> (,) id $ eStrictLet rtVar' (prim False rs rtt [ EVar t | (t,_) <- rs ] rtt') (ELit $ LitCons cn [EVar rtVar'] rt')
+                    False -> cFun $ \rs -> (,) id $ eStrictLet rtVar' (prim False rs rtt [ EVar t | (t,_) <- rs ] rtt') (ELit $ litCons { litName = cn, litArgs = [EVar rtVar'], litType = rt' })
hunk ./E/FromHs.hs 438
-                                eCaseTup' (prim True rs rtt (EVar tvrWorld:[EVar t | (t,_) <- rs ]) rttIO')  [tvrWorld2,rtVar'] (eLet rtVar (ELit $ LitCons cn [EVar rtVar'] rt') (eJustIO (EVar tvrWorld2) (EVar rtVar)))
+                                eCaseTup' (prim True rs rtt (EVar tvrWorld:[EVar t | (t,_) <- rs ]) rttIO')  [tvrWorld2,rtVar'] (eLet rtVar (ELit $ litCons { litName = cn, litArgs = [EVar rtVar'], litType = rt' }) (eJustIO (EVar tvrWorld2) (EVar rtVar)))
hunk ./E/FromHs.hs 489
-            Just (cn,st,_it) -> return $ ELit (LitCons cn [ELit (LitInt (fromIntegral i) st)] ty)
+            Just (cn,st,_it) -> return $ ELit (litCons { litName = cn, litArgs = [ELit (LitInt (fromIntegral i) st)], litType = ty })
hunk ./E/FromHs.hs 645
-intConvert i | abs i > integer_cutoff  =  ELit (LitCons dc_Integer [ELit $ LitInt (fromInteger i) (rawType "intmax_t")] tInteger)
-intConvert i =  ELit (LitCons dc_Int [ELit $ LitInt (fromInteger i) (rawType "int")] tInt)
+intConvert i | abs i > integer_cutoff  =  ELit (litCons { litName = dc_Integer, litArgs = [ELit $ LitInt (fromInteger i) (rawType "intmax_t")], litType = tInteger })
+intConvert i =  ELit (litCons { litName = dc_Int, litArgs = [ELit $ LitInt (fromInteger i) (rawType "int")], litType = tInt })
hunk ./E/FromHs.hs 648
-intConvert' funcs typ i = EAp (EAp fun typ) (ELit (LitCons con [ELit $ LitInt (fromInteger i) (rawType rawtyp)] ltype))  where
+intConvert' funcs typ i = EAp (EAp fun typ) (ELit (litCons { litName = con, litArgs = [ELit $ LitInt (fromInteger i) (rawType rawtyp)], litType = ltype }))  where
hunk ./E/FromHs.hs 744
-                        return $ eCase b [Alt (LitCons vCons [z] (getType b)) (eCase (EVar z) as err')] Unknown
+                        return $ eCase b [Alt (litCons { litName = vCons, litArgs = [z] (getType b)) (eCase (EVar z) as err')], litType = Unknown }
hunk ./E/FromHs.hs 799
-    f ECase { eCaseScrutinee = e, eCaseAlts =  ((Alt (LitCons n [v] t) z):_) } | alias == ErasedAlias = eLet v (f e)  (f z) where
+    f ECase { eCaseScrutinee = e, eCaseAlts =  ((Alt (litCons { litName = n, litArgs = [v], litType = t }) z):_) } | alias == ErasedAlias = eLet v (f e)  (f z) where
hunk ./E/FromHs.hs 801
-    f ECase { eCaseScrutinee = e, eCaseAlts =  ((Alt (LitCons n [v] t) z):_) } | alias == RecursiveAlias = eLet v (prim_unsafeCoerce (f e) (getType v)) (f z) where
+    f ECase { eCaseScrutinee = e, eCaseAlts =  ((Alt (litCons { litName = n, litArgs = [v], litType = t }) z):_) } | alias == RecursiveAlias = eLet v (prim_unsafeCoerce (f e) (getType v)) (f z) where
hunk ./E/LetFloat.hs 72
-        return (ELit (LitCons n xs' t), concat dss)
+        return (ELit (litCons { litName = n, litArgs = xs', litType = t }), concat dss)
hunk ./E/PrimOpt.hs 32
-create_integralCast dataTable e t = eCase e [Alt (LitCons cna [tvra] te) cc] Unknown  where
+create_integralCast dataTable e t = eCase e [Alt (litCons { litName = cna, litArgs = [tvra], litType = te }) cc] Unknown  where
hunk ./E/PrimOpt.hs 39
-    cc = if ta == tb then ELit (LitCons cnb [EVar tvra] t) else
-        eStrictLet  tvrb (EPrim (APrim (CCast ta tb) mempty) [EVar tvra] stb)  (ELit (LitCons cnb [EVar tvrb] t))
+    cc = if ta == tb then ELit (litCons { litName = cnb, litArgs = [EVar tvra], litType = t }) else
+        eStrictLet  tvrb (EPrim (APrim (CCast ta tb) mempty) [EVar tvra] stb)  (ELit (litCons { litName = cnb, litArgs = [EVar tvrb], litType = t }))
hunk ./E/PrimOpt.hs 43
-unbox dataTable e vn wtd = eCase e  [Alt (LitCons cna [tvra] te) (wtd tvra)] Unknown where
+unbox dataTable e vn wtd = eCase e  [Alt (litCons { litName = cna, litArgs = [tvra], litType = te }) (wtd tvra)] Unknown where
hunk ./E/PrimOpt.hs 150
-                        eStrictLet (tVr varc sta) (EPrim (APrim (Operator "/" [ta,ta] ta) mempty) [EVar tvra, EVar tvrb] sta) (ELit (LitCons cna [EVar (tVr varc sta)] t))
+                        eStrictLet (tVr varc sta) (EPrim (APrim (Operator "/" [ta,ta] ta) mempty) [EVar tvra, EVar tvrb] sta) (ELit (litCons { litName = cna, litArgs = [EVar (tVr varc sta)], litType = t }))
hunk ./E/PrimOpt.hs 157
-            return $ eStrictLet (tVr var st) (EPrim (APrim (CConst c ct) mempty) [] st) (ELit (LitCons cn [EVar $ tVr var st] t))
+            return $ eStrictLet (tVr var st) (EPrim (APrim (CConst c ct) mempty) [] st) (ELit (litCons { litName = cn, litArgs = [EVar $ tVr var st], litType = t }))