Mercurial > urweb
diff src/core_util.sml @ 908:ed06e25c70ef
Convert to requiring explicit 'rpc' marker
| author | Adam Chlipala <adamc@hcoop.net> |
|---|---|
| date | Sat, 22 Aug 2009 12:55:18 -0400 |
| parents | 61a1f5c5ae2c |
| children | 2a50da66ffd8 |
line wrap: on
line diff
--- a/src/core_util.sml Tue Aug 11 12:01:54 2009 -0400 +++ b/src/core_util.sml Sat Aug 22 12:55:18 2009 -0400 @@ -532,7 +532,7 @@ | (ELet _, _) => LESS | (_, ELet _) => GREATER - | (EServerCall (n1, es1, e1, _), EServerCall (n2, es2, e2, _)) => + | (EServerCall (n1, es1, e1, _, _), EServerCall (n2, es2, e2, _, _)) => join (Int.compare (n1, n2), fn () => join (joinL compare (es1, es2), fn () => compare (e1, e2))) @@ -718,14 +718,16 @@ fn e2' => (ELet (x, t', e1', e2'), loc)))) - | EServerCall (n, es, e, t) => + | EServerCall (n, es, e, t1, t2) => S.bind2 (ListUtil.mapfold (mfe ctx) es, fn es' => S.bind2 (mfe ctx e, fn e' => - S.map2 (mfc ctx t, - fn t' => - (EServerCall (n, es', e', t'), loc)))) + S.bind2 (mfc ctx t1, + fn t1' => + S.map2 (mfc ctx t2, + fn t2' => + (EServerCall (n, es', e', t1', t2'), loc))))) | EKAbs (x, e) => S.map2 (mfe (bind (ctx, RelK x)) e,