# HG changeset patch # User Adam Chlipala # Date 1260633740 18000 # Node ID 757dbac0454df64823e4c025a9846a4da94454fc # Parent 50dd937c4cb9e110d3476506bdf49eff7efb747f Checked-ness of radio options; Option.get diff -r 50dd937c4cb9 -r 757dbac0454d lib/ur/basis.urs --- a/lib/ur/basis.urs Thu Dec 10 15:46:07 2009 -0500 +++ b/lib/ur/basis.urs Sat Dec 12 11:02:20 2009 -0500 @@ -680,7 +680,7 @@ con radio = [Body, Radio] val radio : formTag string radio [Id = string] -val radioOption : unit -> tag ([Value = string] ++ boxAttrs) radio [] [] [] +val radioOption : unit -> tag ([Value = string, Checked = bool] ++ boxAttrs) radio [] [] [] con select = [Select] val select : formTag string select ([Onchange = transaction unit] ++ boxAttrs) diff -r 50dd937c4cb9 -r 757dbac0454d lib/ur/option.ur --- a/lib/ur/option.ur Thu Dec 10 15:46:07 2009 -0500 +++ b/lib/ur/option.ur Sat Dec 12 11:02:20 2009 -0500 @@ -38,3 +38,8 @@ case x of None => None | Some y => f y + +fun get [a] (x : a) (o : option a) = + case o of + None => x + | Some v => v diff -r 50dd937c4cb9 -r 757dbac0454d lib/ur/option.urs --- a/lib/ur/option.urs Thu Dec 10 15:46:07 2009 -0500 +++ b/lib/ur/option.urs Sat Dec 12 11:02:20 2009 -0500 @@ -8,3 +8,5 @@ val mp : a ::: Type -> b ::: Type -> (a -> b) -> t a -> t b val bind : a ::: Type -> b ::: Type -> (a -> option b) -> t a -> t b + +val get : a ::: Type -> a -> option a -> a