summaryrefslogtreecommitdiff
path: root/src/core_util.sml
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2009-08-22 12:55:18 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2009-08-22 12:55:18 -0400
commitf79732bbf16467ecf40c6068bac93502aa49e9d2 (patch)
tree1d7e3ef3f5bbca99b53ac3ee3b66d934c22f1d0d /src/core_util.sml
parent28f2c29dd98659f00e4d7bc3147c2fc2e5320f34 (diff)
Convert to requiring explicit 'rpc' marker
Diffstat (limited to 'src/core_util.sml')
-rw-r--r--src/core_util.sml12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core_util.sml b/src/core_util.sml
index db1eab1a..197f688a 100644
--- a/src/core_util.sml
+++ b/src/core_util.sml
@@ -532,7 +532,7 @@ fun compare ((e1, _), (e2, _)) =
| (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 @@ fun mapfoldB {kind = fk, con = fc, exp = fe, bind} =
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,