From c87bb7427ff06f241ec33c970d9f2e2762c0cbe4 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Wed, 3 Jun 2015 09:55:37 -0400 Subject: Adjust new [assert] to work properly from top.ur --- lib/ur/top.ur | 2 +- lib/ur/top.urs | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/ur/top.ur b/lib/ur/top.ur index 06dcab5f..e831b4f7 100644 --- a/lib/ur/top.ur +++ b/lib/ur/top.ur @@ -412,4 +412,4 @@ fun min [t] ( _ : ord t) (x : t) (y : t) : t = if x < y then x else y fun assert [a] (cond: bool) (msg: string) (loc: string) (x:a): a = - if cond then x else error {[msg]} at {[loc]} + if cond then x else error {txt msg} at {txt loc} diff --git a/lib/ur/top.urs b/lib/ur/top.urs index 15bc6a22..907b28b2 100644 --- a/lib/ur/top.urs +++ b/lib/ur/top.urs @@ -35,7 +35,7 @@ con snd3 = K1 ==> K2 ==> K3 ==> fn t :: (K1 * K2 * K3) => t.2 con thd3 = K1 ==> K2 ==> K3 ==> fn t :: (K1 * K2 * K3) => t.3 (* Convert a record of n Units into a type-level record where - each field has the same value (which describes a uniformly +o each field has the same value (which describes a uniformly typed record) *) con mapU = K ==> fn f :: K => map (fn _ :: Unit => f) @@ -290,3 +290,10 @@ val postFields : postBody -> list (string * string) val max : t ::: Type -> ord t -> t -> t -> t val min : t ::: Type -> ord t -> t -> t -> t + +val assert : t ::: Type + -> bool (* Did we avoid something bad? *) + -> string (* Explanation of the bad thing *) + -> string (* Source location of the bad thing *) + -> t (* Return this value if all went well. *) + -> t -- cgit v1.2.3