no idea why tuple doesn't work...

diff --git a/a3/mart/skeleton3a.icl b/a3/mart/skeleton3a.icl
index 709c60c..b741436 100644 (file)
--- a/a3/mart/skeleton3a.icl
+++ b/a3/mart/skeleton3a.icl
@@ -240,13 +240,13 @@ instance map1 [] where
 instance map1 Tree where\r
        map1 f t = toTree (map2 (map1 map0) (map1 (map2 f (map2 (map1 f) (map1 f)))) (fromTree t))\r
 \r
-//instance map2 (a, b) | map1 a & map1 a where\r
-//     map2 f1 f2 t = toTup (map1 (map2 f1 f2) (fromTup t))\r
+instance map2 (,) where\r
+       map2 f1 f2 t = toTup (map1 (map2 f1 f2) (fromTup t))\r
 \r
 Start = (\r
        map1 fac aTree,\r
        map1 fac aList,\r
-       //map2 fac fac (aList, aTree),\r
+       map2 fac fac (aList, aTree),\r
        map1 (\x.(x, fac x)) aList\r
        )\r
        where\r