[get rid of built in storable support, fix some remaining references to 'Addr'.
John Meacham <john@repetae.net>**20090822042242
 Ignore-this: 7f7d2dde8d8e16aadb9e5d0b9af97524
] hunk ./src/DataConstructors.hs 895
-    (tc_Addr, "HsPtr"),
-    (tc_FunAddr, "HsFunPtr"),
+    (tc_Ptr, "HsPtr"),
+    (tc_FunPtr, "HsFunPtr"),
hunk ./src/data/PrimitiveOperators-in.hs 33
-tPtr t = ELit (litCons { litName = tc_Ptr
-                       , litArgs = [t]
-                       , litType = eStar
-                       , litAliasFor = Just (ELam tvr { tvrIdent = va1
-                                                      , tvrType = eStar}
-                                             (ELit litCons { litName = tc_Addr, litType = eStar })) })
hunk ./src/data/PrimitiveOperators-in.hs 154
-buildPeek cn t p = ELam tvr $ ELam tvrWorld (unbox' (EVar tvr) dc_Addr tvr' rest)  where
-    tvr = (tVr va1 (tPtr t))
-    tvr' = tVr va2 (rawType "bits<ptr>")
-    tvrWorld2 = tVr (anonymous 258) tWorld__
-    tvrWorld = tVr (anonymous 256) tWorld__
-    rtVar = tVr (anonymous 260) (rawType p)
-    rtVar' = tVr (anonymous 262) t
-    rest = eCaseTup' (EPrim (APrim (Peek (stringToOpTy p)) mempty) [EVar tvrWorld, EVar tvr'] (ltTuple' [tWorld__,rawType p])) [tvrWorld2,rtVar] (eLet rtVar' (ELit $ litCons { litName = cn, litArgs = [EVar rtVar], litType = t }) $ eJustIO (EVar tvrWorld2) (EVar rtVar') )
-
-
-buildPoke cn t p = ELam ptr_tvr $ ELam v_tvr $ createIO_ $ (\tw -> unbox' (EVar ptr_tvr) dc_Addr ptr_tvr' $ unbox' (EVar v_tvr) cn v_tvr' $ EPrim (APrim (Poke (stringToOpTy p)) mempty) [EVar tw, EVar ptr_tvr', EVar v_tvr'] tWorld__) where
-    ptr_tvr =  (tVr va1 (tPtr t))
-    v_tvr = tVr va2 t
-    ptr_tvr' =  (tVr va3 (rawType "bits<ptr>"))
-    v_tvr' = tVr va4 (rawType p)
hunk ./src/data/names.txt 11
-Addr      Jhc.Addr.Addr
-FunAddr   Jhc.Addr.FunAddr
+FunPtr    Jhc.Addr.FunPtr