From 2eca16323e58b01a70ea734e2825765ebe239dc0 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Sat, 4 Oct 2008 15:50:28 -0400 Subject: Merge CDisjoint and TDisjoint --- src/elab_util.sml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/elab_util.sml') diff --git a/src/elab_util.sml b/src/elab_util.sml index cc4fbe4a..69ed3248 100644 --- a/src/elab_util.sml +++ b/src/elab_util.sml @@ -119,14 +119,14 @@ fun mapfoldB {kind = fk, con = fc, bind} = S.map2 (mfc (bind (ctx, Rel (x, k))) c, fn c' => (TCFun (e, x, k', c'), loc))) - | TDisjoint (ai, c1, c2, c3) => + | CDisjoint (ai, c1, c2, c3) => S.bind2 (mfc ctx c1, fn c1' => S.bind2 (mfc ctx c2, fn c2' => S.map2 (mfc ctx c3, fn c3' => - (TDisjoint (ai, c1', c2', c3'), loc)))) + (CDisjoint (ai, c1', c2', c3'), loc)))) | TRecord c => S.map2 (mfc ctx c, fn c' => @@ -147,14 +147,6 @@ fun mapfoldB {kind = fk, con = fc, bind} = S.map2 (mfc (bind (ctx, Rel (x, k))) c, fn c' => (CAbs (x, k', c'), loc))) - | CDisjoint (c1, c2, c3) => - S.bind2 (mfc ctx c1, - fn c1' => - S.bind2 (mfc ctx c2, - fn c2' => - S.map2 (mfc ctx c3, - fn c3' => - (CDisjoint (c1', c2', c3'), loc)))) | CName _ => S.return2 cAll -- cgit v1.2.3