diff --git a/MateFun/src/MateFun/Core.hs b/MateFun/src/MateFun/Core.hs index a99fb691fb2d5b6e26ccce521932f5ec0449f2a6..4b721d43ffac3f4a1f22c7919284f6349cb2a6a6 100644 --- a/MateFun/src/MateFun/Core.hs +++ b/MateFun/src/MateFun/Core.hs @@ -161,7 +161,7 @@ instance Show Ty where show (TyComp nm _ _) = nm show (TyProd ts ) = "(" ++ intercalate " X " (map show ts) ++ ")" show (TySec t ) = show t ++ "*" - show (TyAny ) = "Cualquier Conjunto" + show (TyAny ) = "A" -- "Cualquier Conjunto" show (TyAnyEnum ) = "Cualquier Enumerado" show (TyAnyProd ) = "Cualquier Tupla" @@ -226,7 +226,7 @@ rotar (VProd [VFig f, VR g]) = VFig $ D.rotate f g escalar (VProd [VFig f, VR e]) = VFig $ D.scale f e aFig (VFig x) = VFig x -aFig (x) = VFig $ D.textAt (show x) (0,0) +aFig (x) = VFig $ D.textAt (show x) (0,0) rango (VProd [VR ini, VR fin, VR paso]) = VSec (map vr [ini,ini+paso..fin]) R primero (VSec xs _) = head xs @@ -245,10 +245,10 @@ stdFT = [("-", (TyR,TyR)) ,("mover", (TyProd [TyFig, TyProd [TyR,TyR]],TyFig)) ,("rotar", (TyProd [TyFig, TyR],TyFig)) ,("escalar", (TyProd [TyFig, TyR],TyFig)) - ,("aFig", (TyAnyEnum,TyFig)) - ,("rango", (TyProd [TyR,TyR,TyR],TySec TyR)) ] --- ,("primero", ([TySec TyAny],TyAny)) --- ,("resto",([TySec TyAny],TySec TyAny))] + ,("aFig", (TyAny,TyFig)) + ,("rango", (TyProd [TyR,TyR,TyR],TySec TyR)) -- ] + ,("primero", (TySec TyAny,TyAny)) + ,("resto",(TySec TyAny,TySec TyAny))] stdF = [("-",men) ,("red", red)