demo/sum working with manual folders

2 files changed, 19 insertions, 0 deletions

diff --git a/lib/ur/top.ur b/lib/ur/top.ur
index 9016fd27..5d2ae606 100644
--- a/lib/ur/top.ur
+++ b/lib/ur/top.ur
@@ -6,6 +6,19 @@ con folder = K ==> fn r :: {K} =>
                           -> fn [[nm] ~ r] => tf ([nm = v] ++ r))
                       -> tf [] -> tf r
 
+structure Folder = struct
+    fun nil K (tf :: {K} -> Type)
+            (f : nm :: Name -> v :: K -> r :: {K} -> tf r
+                 -> fn [[nm] ~ r] => tf ([nm = v] ++ r))
+            (i : tf []) = i
+
+    fun cons K (r ::: {K}) (nm :: Name) (v :: K) [[nm] ~ r] (fold : folder r)
+             (tf :: {K} -> Type)
+             (f : nm :: Name -> v :: K -> r :: {K} -> tf r
+                  -> fn [[nm] ~ r] => tf ([nm = v] ++ r))
+             (i : tf []) = f [nm] [v] [r] (fold [tf] f i)
+end
+
 
 fun not b = if b then False else True
 
diff --git a/lib/ur/top.urs b/lib/ur/top.urs
index d891c80d..d4cd34f4 100644
--- a/lib/ur/top.urs
+++ b/lib/ur/top.urs
@@ -6,6 +6,12 @@ con folder = K ==> fn r :: {K} =>
                           -> fn [[nm] ~ r] => tf ([nm = v] ++ r))
                       -> tf [] -> tf r
 
+structure Folder : sig
+    val nil : K --> folder (([]) :: {K})
+    val cons : K --> r ::: {K} -> nm :: Name -> v :: K
+               -> fn [[nm] ~ r] => folder r -> folder ([nm = v] ++ r)
+end
+
 
 val not : bool -> bool