Changing foldRX to mapX

4 files changed, 49 insertions, 22 deletions

diff --git a/lib/ur/monad.ur b/lib/ur/monad.ur
index e15da523..689e6b26 100644
--- a/lib/ur/monad.ur
+++ b/lib/ur/monad.ur
@@ -51,6 +51,16 @@ fun foldR3 [K] [m] (_ : monad m) [tf1 :: K -> Type] [tf2 :: K -> Type] [tf3 :: K
      (fn _ _ _ => return i)
      fl
 
+fun mapR0 [K] [m] (_ : monad m) [tr :: K -> Type]
+         (f : nm :: Name -> t :: K -> m (tr t)) [r ::: {K}] (fl : folder r) =
+    @Top.fold [fn r => m ($(map tr r))]
+    (fn [nm :: Name] [t :: K] [rest :: {K}] [[nm] ~ rest] (acc : m ($(map tr rest))) =>
+        v <- f [nm] [t];
+        vs <- acc;
+        return (vs ++ {nm = v}))
+    (return {})
+    fl
+
 fun mapR [K] [m] (_ : monad m) [tf :: K -> Type] [tr :: K -> Type]
          (f : nm :: Name -> t :: K -> tf t -> m (tr t)) =
     @@foldR [m] _ [tf] [fn r => $(map tr r)]
diff --git a/lib/ur/monad.urs b/lib/ur/monad.urs
index 698a4b5b..05f201e0 100644
--- a/lib/ur/monad.urs
+++ b/lib/ur/monad.urs
@@ -34,6 +34,11 @@ val foldR3 : K --> m ::: (Type -> Type) -> monad m
              -> tr []
              -> r ::: {K} -> folder r -> $(map tf1 r) -> $(map tf2 r) -> $(map tf3 r) -> m (tr r)
 
+val mapR0 : K --> m ::: (Type -> Type) -> monad m
+           -> tr :: (K -> Type)
+           -> (nm :: Name -> t :: K -> m (tr t))
+           -> r ::: {K} -> folder r -> m ($(map tr r))
+
 val mapR : K --> m ::: (Type -> Type) -> monad m
            -> tf :: (K -> Type)
            -> tr :: (K -> Type)
diff --git a/lib/ur/top.ur b/lib/ur/top.ur
index 613f5ec5..703c7bae 100644
--- a/lib/ur/top.ur
+++ b/lib/ur/top.ur
@@ -179,7 +179,14 @@ fun foldR3 [K] [tf1 :: K -> Type] [tf2 :: K -> Type] [tf3 :: K -> Type] [tr :: {
            f [nm] [t] [rest] ! r1.nm r2.nm r3.nm (acc (r1 -- nm) (r2 -- nm) (r3 -- nm)))
        (fn _ _ _ => i)
 
-fun foldRX [K] [tf :: K -> Type] [ctx :: {Unit}]
+fun mapUX [tf :: Type] [ctx :: {Unit}]
+          (f : nm :: Name -> rest :: {Unit} -> [[nm] ~ rest] => tf -> xml ctx [] []) =
+    @@foldR [fn _ => tf] [fn _ => xml ctx [] []]
+      (fn [nm :: Name] [u :: Unit] [rest :: {Unit}] [[nm] ~ rest] r acc =>
+          <xml>{f [nm] [rest] ! r}{acc}</xml>)
+      <xml/>
+
+fun mapX [K] [tf :: K -> Type] [ctx :: {Unit}]
             (f : nm :: Name -> t :: K -> rest :: {K}
                  -> [[nm] ~ rest] =>
                        tf t -> xml ctx [] []) =
@@ -188,7 +195,7 @@ fun foldRX [K] [tf :: K -> Type] [ctx :: {Unit}]
           <xml>{f [nm] [t] [rest] ! r}{acc}</xml>)
       <xml/>
 
-fun foldRX2 [K] [tf1 :: K -> Type] [tf2 :: K -> Type] [ctx :: {Unit}]
+fun mapX2 [K] [tf1 :: K -> Type] [tf2 :: K -> Type] [ctx :: {Unit}]
              (f : nm :: Name -> t :: K -> rest :: {K}
                   -> [[nm] ~ rest] =>
                         tf1 t -> tf2 t -> xml ctx [] []) =
@@ -198,7 +205,7 @@ fun foldRX2 [K] [tf1 :: K -> Type] [tf2 :: K -> Type] [ctx :: {Unit}]
           <xml>{f [nm] [t] [rest] ! r1 r2}{acc}</xml>)
       <xml/>
 
-fun foldRX3 [K] [tf1 :: K -> Type] [tf2 :: K -> Type] [tf3 :: K -> Type] [ctx :: {Unit}]
+fun mapX3 [K] [tf1 :: K -> Type] [tf2 :: K -> Type] [tf3 :: K -> Type] [ctx :: {Unit}]
              (f : nm :: Name -> t :: K -> rest :: {K}
                   -> [[nm] ~ rest] =>
                         tf1 t -> tf2 t -> tf3 t -> xml ctx [] []) =
diff --git a/lib/ur/top.urs b/lib/ur/top.urs
index 743669ce..de2ac03b 100644
--- a/lib/ur/top.urs
+++ b/lib/ur/top.urs
@@ -98,25 +98,30 @@ val foldR3 : K --> tf1 :: (K -> Type) -> tf2 :: (K -> Type) -> tf3 :: (K -> Type
              -> tr []
              -> r ::: {K} -> folder r -> $(map tf1 r) -> $(map tf2 r) -> $(map tf3 r) -> tr r
 
-val foldRX : K --> tf :: (K -> Type) -> ctx :: {Unit}
-             -> (nm :: Name -> t :: K -> rest :: {K}
-                 -> [[nm] ~ rest] =>
-                       tf t -> xml ctx [] [])
-             -> r ::: {K} -> folder r -> $(map tf r) -> xml ctx [] []
-
-val foldRX2 : K --> tf1 :: (K -> Type) -> tf2 :: (K -> Type) -> ctx :: {Unit}
-              -> (nm :: Name -> t :: K -> rest :: {K}
-                  -> [[nm] ~ rest] =>
-                        tf1 t -> tf2 t -> xml ctx [] [])
-              -> r ::: {K} -> folder r
-              -> $(map tf1 r) -> $(map tf2 r) -> xml ctx [] []
-
-val foldRX3 : K --> tf1 :: (K -> Type) -> tf2 :: (K -> Type) -> tf3 :: (K -> Type) -> ctx :: {Unit}
-              -> (nm :: Name -> t :: K -> rest :: {K}
-                  -> [[nm] ~ rest] =>
-                        tf1 t -> tf2 t -> tf3 t -> xml ctx [] [])
-              -> r ::: {K} -> folder r
-              -> $(map tf1 r) -> $(map tf2 r) -> $(map tf3 r) -> xml ctx [] []
+val mapUX : tf :: Type -> ctx :: {Unit}
+            -> (nm :: Name -> rest :: {Unit} -> [[nm] ~ rest] =>
+                tf -> xml ctx [] [])
+            -> r ::: {Unit} -> folder r -> $(mapU tf r) -> xml ctx [] []
+
+val mapX : K --> tf :: (K -> Type) -> ctx :: {Unit}
+           -> (nm :: Name -> t :: K -> rest :: {K}
+               -> [[nm] ~ rest] =>
+               tf t -> xml ctx [] [])
+           -> r ::: {K} -> folder r -> $(map tf r) -> xml ctx [] []
+
+val mapX2 : K --> tf1 :: (K -> Type) -> tf2 :: (K -> Type) -> ctx :: {Unit}
+            -> (nm :: Name -> t :: K -> rest :: {K}
+                -> [[nm] ~ rest] =>
+                tf1 t -> tf2 t -> xml ctx [] [])
+            -> r ::: {K} -> folder r
+            -> $(map tf1 r) -> $(map tf2 r) -> xml ctx [] []
+
+val mapX3 : K --> tf1 :: (K -> Type) -> tf2 :: (K -> Type) -> tf3 :: (K -> Type) -> ctx :: {Unit}
+            -> (nm :: Name -> t :: K -> rest :: {K}
+                -> [[nm] ~ rest] =>
+                tf1 t -> tf2 t -> tf3 t -> xml ctx [] [])
+            -> r ::: {K} -> folder r
+            -> $(map tf1 r) -> $(map tf2 r) -> $(map tf3 r) -> xml ctx [] []
 
 val queryL : tables ::: {{Type}} -> exps ::: {Type}
              -> [tables ~ exps] =>