From 44b4f917f8ee98dbb783a69f3498be6cc764c5cf Mon Sep 17 00:00:00 2001
From: Adam Chlipala <adam@chlipala.net>
Date: Fri, 20 Sep 2019 13:39:32 -0400
Subject: [PATCH] Add more kind annotations, following new Ur/Web wildcard
 restriction for signatures

---
 calendar.urs |  2 +-
 sql.urs      |  2 +-
 todo.urs     | 12 ++++++------
 ui.urs       |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/calendar.urs b/calendar.urs
index abb9680..4ee1b73 100644
--- a/calendar.urs
+++ b/calendar.urs
@@ -35,7 +35,7 @@ functor FromTable(M : sig
                       val kinds : $(mapU string times)
                       val sh : show $(map fst3 key)
                   end) : sig
-    con private
+    con private :: (Type * Type * Type)
     con tag = M.tag
     val cal : t (map fst3 M.key) [tag = private]
 end
diff --git a/sql.urs b/sql.urs
index 64afcdb..4e36595 100644
--- a/sql.urs
+++ b/sql.urs
@@ -36,7 +36,7 @@ val easy_select : fs ::: {Type}
                   -> qtablename :: Name
                   -> sql_table fs ks
                   -> sql_exp [qtablename = fs] [] [] bool
-                  -> sql_order_by [qtablename = _] []
+                  -> sql_order_by [qtablename = fs] []
                   -> sql_query [] [] [qtablename = fs] [] 
 
 (* Easy table insert with constants *)
diff --git a/todo.urs b/todo.urs
index d178ae2..ae89803 100644
--- a/todo.urs
+++ b/todo.urs
@@ -39,7 +39,7 @@ functor WithDueDate(M : sig
                         val allowAnyUser : bool
                         (* Only one user, not necessarily this one, needs to have done the task. *)
                     end) : sig
-    con private
+    type private
     con tag = M.tag
     val todo : t M.key [tag = private]
 end
@@ -87,7 +87,7 @@ functor WithForeignDueDate(M : sig
                                val title : string
                                val render : $(key ++ subkey) -> string (* username *) -> xbody
                            end) : sig
-    con private
+    type private
     con tag = M.tag
     val todo : t (M.key ++ M.subkey) [tag = private]
 end
@@ -120,7 +120,7 @@ functor WithCompletionFlag(M : sig
                                val title : string
                                val render : $(key ++ subkey) -> string (* username *) -> xbody
                     end) : sig
-    con private
+    type private
     con tag = M.tag
     val todo : t (M.key ++ M.subkey) [tag = private]
 end
@@ -154,7 +154,7 @@ functor WithCompletionFlagAndDueDate(M : sig
                                          val title : string
                                          val render : $(key ++ subkey) -> string (* username *) -> xbody
                     end) : sig
-    con private
+    type private
     con tag = M.tag
     val todo : t (M.key ++ M.subkey) [tag = private]
 end
@@ -184,7 +184,7 @@ functor Happenings(M : sig
                        val title : string
                        val render : $key -> xbody
                    end) : sig
-    con private
+    type private
     con tag = M.tag
     val todo : t M.key [tag = private]
 end
@@ -227,7 +227,7 @@ functor Grading(M : sig
                     val title : string
                     val render : $([guser = string] ++ akey) -> string (* username *) -> xbody
                 end) : sig
-    con private
+    type private
     con tag = M.tag
     con guser = M.guser
     val todo : t ([guser = string] ++ M.akey) [tag = private]
diff --git a/ui.urs b/ui.urs
index 082fb02..6cd6f13 100644
--- a/ui.urs
+++ b/ui.urs
@@ -3,7 +3,7 @@ type context
 
 (* A general type of GUI units, which can be composed and dropped into pages.
  * The parameter is the unit's state, which should be generated on the server. *)
-type t a = {
+type t (a :: Type) = {
      Create : transaction a,
      Onload : a -> transaction unit,
      Render : context -> a -> xbody