diff src/core_util.sml @ 609:56aaa1941dad

First gimpy RPC
author Adam Chlipala <adamc@hcoop.net>
date Sun, 15 Feb 2009 10:32:50 -0500
parents 0dd40b6bfdf3
children 8998114760c1
line wrap: on
line diff
--- a/src/core_util.sml	Sun Feb 15 09:27:36 2009 -0500
+++ b/src/core_util.sml	Sun Feb 15 10:32:50 2009 -0500
@@ -482,7 +482,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)))
@@ -660,12 +660,14 @@
                                           fn e2' =>
                                              (ELet (x, t', e1', e2'), loc))))
 
-              | EServerCall (n, es, e) =>
+              | EServerCall (n, es, e, t) =>
                 S.bind2 (ListUtil.mapfold (mfe ctx) es,
                       fn es' =>
-                         S.map2 (mfe ctx e,
+                         S.bind2 (mfe ctx e,
                                  fn e' =>
-                                    (EServerCall (n, es', e'), loc)))
+                                    S.map2 (mfc ctx t,
+                                            fn t' =>
+                                               (EServerCall (n, es', e', t'), loc))))
                          
         and mfp ctx (pAll as (p, loc)) =
             case p of