From 52c51b876af9e05d8eec78c356419c0c4a811ff5 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Tue, 21 Oct 2008 11:04:24 -0400 Subject: gt, ge --- src/monoize.sml | 32 ++++++++++++++++++++++++++++++++ tests/ord.ur | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/monoize.sml b/src/monoize.sml index 8c9094b6..4e92c02e 100644 --- a/src/monoize.sml +++ b/src/monoize.sml @@ -683,6 +683,38 @@ fun monoExp (env, st, fm) (all as (e, loc)) = ((L'.EAbs ("r", ordTy t, (L'.TFun (t, (L'.TFun (t, (L'.TFfi ("Basis", "bool"), loc)), loc)), loc), (L'.EField ((L'.ERel 0, loc), "Le"), loc)), loc), fm) end + | L.ECApp ((L.EFfi ("Basis", "gt"), _), t) => + let + val t = monoType env t + val b = (L'.TFfi ("Basis", "bool"), loc) + in + ((L'.EAbs ("f", ordTy t, (L'.TFun (t, (L'.TFun (t, b), loc)), loc), + (L'.EAbs ("x", t, (L'.TFun (t, b), loc), + (L'.EAbs ("y", t, b, + (L'.EUnop ("!", + (L'.EApp ((L'.EApp ((L'.EField ((L'.ERel 2, loc), + "Le"), loc), + (L'.ERel 1, loc)), loc), + (L'.ERel 0, loc)), loc)), loc)), loc)), + loc)), + loc), fm) + end + | L.ECApp ((L.EFfi ("Basis", "ge"), _), t) => + let + val t = monoType env t + val b = (L'.TFfi ("Basis", "bool"), loc) + in + ((L'.EAbs ("f", ordTy t, (L'.TFun (t, (L'.TFun (t, b), loc)), loc), + (L'.EAbs ("x", t, (L'.TFun (t, b), loc), + (L'.EAbs ("y", t, b, + (L'.EUnop ("!", + (L'.EApp ((L'.EApp ((L'.EField ((L'.ERel 2, loc), + "Lt"), loc), + (L'.ERel 1, loc)), loc), + (L'.ERel 0, loc)), loc)), loc)), loc)), + loc)), + loc), fm) + end | L.EFfi ("Basis", "ord_int") => let fun intBin s = diff --git a/tests/ord.ur b/tests/ord.ur index 4bca682b..c5dac100 100644 --- a/tests/ord.ur +++ b/tests/ord.ur @@ -1,3 +1,3 @@ fun main () : transaction page = return - {[ 1 < 1 ]}, {[ 1 < 2 ]}, {[ 1 <= 1 ]}, {[ 2 <= 1 ]} + {[ 1 < 1 ]}, {[ 1 < 2 ]}, {[ 1 <= 1 ]}, {[ 2 <= 1 ]}, {[ 1 > 1 ]}, {[ 2 > 1 ]}, {[ 0 >= 1 ]}, {[ 2 >= 1 ]} -- cgit v1.2.3