summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2009-04-13 08:44:32 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2009-04-13 08:44:32 -0400
commitf03c559d279c0026be2aa781fdef26ea9d5298b5 (patch)
treefbe06b63994c3d33b18a451146a7b57111e07359
parent9bcd129c579d210c2b45e93101f9ed1c6d3e9fe7 (diff)
Simplify type class requirement for tree demo
-rw-r--r--demo/prose2
-rw-r--r--demo/treeFun.ur3
-rw-r--r--demo/treeFun.urs3
3 files changed, 3 insertions, 5 deletions
diff --git a/demo/prose b/demo/prose
index d82ef7b5..1639301e 100644
--- a/demo/prose
+++ b/demo/prose
@@ -104,7 +104,7 @@ tree.urp
<li> SQL field names <tt>id</tt> (for primary keys) and <tt>parent</tt> (for parent links)</li>
<li> A type-level record <tt>cols</tt> of field names besides <tt>id</tt> and <tt>parent</tt></li>
<li> "Proofs" that <tt>id</tt> is distinct from <tt>parent</tt> and that neither of <tt>id</tt> and <tt>parent</tt> appears in <tt>cols</tt></li>
- <li> Witnesses that both <tt>key</tt> and <tt>option key</tt> belong to the type class <tt>sql_injectable</tt>, which indicates that they are fair game to use with SQL</li>
+ <li> A witness that <tt>key</tt> belongs to the type class <tt>sql_injectable_prim</tt>, which indicates that both <tt>key</tt> and <tt>option key</tt> are fair game to use with SQL</li>
<li> An SQL table <tt>tab</tt>, containing a field <tt>id</tt> of type <tt>key</tt>, a field <tt>parent</tt> of type <tt>option key</tt>, and every field of <tt>cols</tt></li>
</ol>
diff --git a/demo/treeFun.ur b/demo/treeFun.ur
index 25d11927..2d4ef739 100644
--- a/demo/treeFun.ur
+++ b/demo/treeFun.ur
@@ -6,8 +6,7 @@ functor Make(M : sig
constraint [id] ~ [parent]
constraint [id, parent] ~ cols
- val key_inj : sql_injectable key
- val option_key_inj : sql_injectable (option key)
+ val key_inj : sql_injectable_prim key
table tab : ([id = key, parent = option key] ++ cols)
end) = struct
diff --git a/demo/treeFun.urs b/demo/treeFun.urs
index 64a14f4f..323c2e5a 100644
--- a/demo/treeFun.urs
+++ b/demo/treeFun.urs
@@ -6,8 +6,7 @@ functor Make(M : sig
constraint [id] ~ [parent]
constraint [id, parent] ~ cols
- val key_inj : sql_injectable key
- val option_key_inj : sql_injectable (option key)
+ val key_inj : sql_injectable_prim key
table tab : ([id = key, parent = option key] ++ cols)
end) : sig