Changeset 15381

Timestamp:

02/28/07 22:10:07 (21 months ago)

Author:

audreyt

Message:

* Pugs.Class: Make Show a superclass to Boxable.

Files:

• src/Pugs/Class.hs (modified) (5 diffs)

src/Pugs/Class.hs

@@ -24 +24 @@
 import MO.Util
 import Pugs.Internals
+import Pugs.AST.Eval
 
-class (Typeable a, Ord a, Typeable1 m, Monad m) => Boxable m a | a -> m where
+class (Show a, Typeable a, Ord a, Typeable1 m, Monad m) => Boxable m a | a -> m where
     classOf :: a -> MI m
-    classOf o = mkBoxClass ty ([] :: [(String, String -> m (Invocant m))])
+    classOf o = mkBoxClass ty ([] :: [(ID, ID -> m (Invocant m))])
         where
-        ty = takeTypeName "" . reverse . show $ typeOf o
+        ty = _cast . takeTypeName "" . reverse . show $ typeOf o
         -- Here we intuit "Str" from "Pugs.Val.Str.PureStr".
         takeTypeName acc [] = acc
@@ -39 +40 @@
     fromObj (MkInvocant x _) = fromTypeable x
 
-(...) :: forall t a b (m :: * -> *). (Show b, Boxable m b) => t -> (a -> b) -> (t, a -> m (Invocant m))
-(...) x y = (x, mkObj . y)
+(...) :: forall a b (m :: * -> *). (Boxable m b) => String -> (a -> b) -> (ID, a -> m (Invocant m))
+(...) x y = (_cast x, mkObj . y)
 
-(!!!) :: forall t a1 (m :: * -> *) a. (Show a, Boxable m a) => t -> (a1 -> m a) -> (t, a1 -> m (Invocant m))
-(!!!) x y = (x, mkObjM . y)
+(!!!) :: forall a1 (m :: * -> *) a. (Boxable m a) => String -> (a1 -> m a) -> (ID, a1 -> m (Invocant m))
+(!!!) x y = (_cast x, mkObjM . y)
 
-mkObj :: (Show a, Boxable m a) => a -> m (Invocant m)
+mkObj :: (Boxable m a) => a -> m (Invocant m)
 mkObj x = return $ MkInvocant x (class_interface (classOf x))
 
-mkObjM :: (Show a, Boxable m a) => m a -> m (Invocant m)
+mkObjM :: (Boxable m a) => m a -> m (Invocant m)
 mkObjM x = do
     x' <- x
@@ -61 +62 @@
     , Typeable1 m1
     , Method m1 (SimpleMethod m1)
-    ) => String -> [(String, t -> m (Invocant m))] -> MI m1
+    ) => String -> [(ID, t -> m (Invocant m))] -> MI m1
 mkBoxClass cls methods = newMI MkMI
     { clsParents        = []
@@ -68 +69 @@
     , clsPublicMethods  = newCollection' methodName $ map mkBoxMethod methods
     , clsPrivateMethods = newCollection []
-    , clsName = cls
+    , clsName           = _cast cls
     }
 
@@ -77 +78 @@
     , Typeable1 m1
     , Monad m1
-    ) => (String, t -> m1 (Invocant m1)) -> AnyMethod m
+    ) => (ID, t -> m1 (Invocant m1)) -> AnyMethod m
 mkBoxMethod (meth, fun) = AnyMethod $ MkSimpleMethod
     { smName = meth