Conversion of functions to CPS, to facilitate ServerCall

10 files changed, 338 insertions, 57 deletions

diff --git a/src/compiler.sig b/src/compiler.sig
index 1b4995ee..b7418f2a 100644
--- a/src/compiler.sig
+++ b/src/compiler.sig
@@ -94,11 +94,13 @@ signature COMPILER = sig
     val toCore_untangle : (string, Core.file) transform
     val toShake1 : (string, Core.file) transform
     val toRpcify : (string, Core.file) transform
+    val toCore_untangle2 : (string, Core.file) transform
+    val toShake2 : (string, Core.file) transform
     val toTag : (string, Core.file) transform
     val toReduce : (string, Core.file) transform
     val toUnpoly : (string, Core.file) transform 
     val toSpecialize : (string, Core.file) transform 
-    val toShake2 : (string, Core.file) transform
+    val toShake3 : (string, Core.file) transform
     val toMonoize : (string, Mono.file) transform
     val toMono_opt1 : (string, Mono.file) transform
     val toUntangle : (string, Mono.file) transform
diff --git a/src/compiler.sml b/src/compiler.sml
index a01dbe2b..d74da2a6 100644
--- a/src/compiler.sml
+++ b/src/compiler.sml
@@ -453,12 +453,15 @@ val rpcify = {
 
 val toRpcify = transform rpcify "rpcify" o toShake1
 
+val toCore_untangle2 = transform core_untangle "core_untangle2" o toRpcify
+val toShake2 = transform shake "shake2" o toCore_untangle2
+
 val tag = {
     func = Tag.tag,
     print = CorePrint.p_file CoreEnv.empty
 }
 
-val toTag = transform tag "tag" o toRpcify
+val toTag = transform tag "tag" o toCore_untangle2
 
 val reduce = {
     func = Reduce.reduce,
@@ -481,14 +484,14 @@ val specialize = {
 
 val toSpecialize = transform specialize "specialize" o toUnpoly
 
-val toShake2 = transform shake "shake2" o toSpecialize
+val toShake3 = transform shake "shake3" o toSpecialize
 
 val monoize = {
     func = Monoize.monoize CoreEnv.empty,
     print = MonoPrint.p_file MonoEnv.empty
 }
 
-val toMonoize = transform monoize "monoize" o toShake2
+val toMonoize = transform monoize "monoize" o toShake3
 
 val mono_opt = {
     func = MonoOpt.optimize,
diff --git a/src/core_env.sig b/src/core_env.sig
index 6b954c12..929e848d 100644
--- a/src/core_env.sig
+++ b/src/core_env.sig
@@ -65,5 +65,7 @@ signature CORE_ENV = sig
 
     val declBinds : env -> Core.decl -> env
     val patBinds : env -> Core.pat -> env
+
+    val patBindsN : Core.pat -> int
                                                  
 end
diff --git a/src/core_env.sml b/src/core_env.sml
index 2c100aa5..dd77e3fb 100644
--- a/src/core_env.sml
+++ b/src/core_env.sml
@@ -342,4 +342,13 @@ fun patBinds env (p, loc) =
       | PCon (_, _, _, SOME p) => patBinds env p
       | PRecord xps => foldl (fn ((_, p, _), env) => patBinds env p) env xps
 
+fun patBindsN (p, loc) =
+    case p of
+        PWild => 0
+      | PVar _ => 1
+      | PPrim _ => 0
+      | PCon (_, _, _, NONE) => 0
+      | PCon (_, _, _, SOME p) => patBindsN p
+      | PRecord xps => foldl (fn ((_, p, _), count) => count + patBindsN p) 0 xps
+
 end
diff --git a/src/mono_util.sml b/src/mono_util.sml
index 00113c9b..dd5107c6 100644
--- a/src/mono_util.sml
+++ b/src/mono_util.sml
@@ -350,12 +350,14 @@ fun mapfoldB {typ = fc, exp = fe, bind} =
                      fn e' =>
                         (ESignalSource e', loc))
 
-              | EServerCall (n, ek, t) =>
-                S.bind2 (mfe ctx ek,
-                      fn ek' =>
-                         S.map2 (mft t,
-                              fn t' =>
-                                 (EServerCall (n, ek', t'), loc)))
+              | EServerCall (s, ek, t) =>
+                S.bind2 (mfe ctx s,
+                         fn s' =>
+                            S.bind2 (mfe ctx ek,
+                                  fn ek' =>
+                                     S.map2 (mft t,
+                                          fn t' =>
+                                             (EServerCall (s', ek', t'), loc))))
     in
         mfe
     end
diff --git a/src/reduce_local.sig b/src/reduce_local.sig
index 3c76263a..64545a8e 100644
--- a/src/reduce_local.sig
+++ b/src/reduce_local.sig
@@ -30,5 +30,6 @@
 signature REDUCE_LOCAL = sig
 
     val reduce : Core.file -> Core.file
+    val reduceExp : Core.exp -> Core.exp
     
 end
diff --git a/src/reduce_local.sml b/src/reduce_local.sml
index 8b963e1b..a49d7115 100644
--- a/src/reduce_local.sml
+++ b/src/reduce_local.sml
@@ -51,7 +51,7 @@ fun exp env (all as (e, loc)) =
         let
             fun find (n', env, nudge, lift) =
                 case env of
-                    [] => raise Fail "ReduceLocal.exp: ERel"
+                    [] => (ERel (n + nudge), loc)
                   | Lift lift' :: rest => find (n', rest, nudge + lift', lift + lift')
                   | Unknown :: rest =>
                     if n' = 0 then
@@ -156,4 +156,6 @@ fun reduce file =
         map doDecl file
     end
 
+val reduceExp = exp []
+
 end
diff --git a/src/rpcify.sml b/src/rpcify.sml
index 6601a14b..0b336a3d 100644
--- a/src/rpcify.sml
+++ b/src/rpcify.sml
@@ -40,6 +40,12 @@ structure SS = BinarySetFn(struct
                            val compare = String.compare
                            end)
 
+fun multiLiftExpInExp n e =
+    if n = 0 then
+        e
+    else
+        multiLiftExpInExp (n - 1) (E.liftExpInExp 0 e)
+
 val ssBasis = SS.addList (SS.empty,
                           ["requestHeader",
                            "query",
@@ -54,10 +60,13 @@ val csBasis = SS.addList (SS.empty,
 
 type state = {
      cpsed : int IM.map,
+     cpsed_range : con IM.map,
      cps_decls : (string * int * con * exp * string) list,
 
      exported : IS.set,
-     export_decls : decl list
+     export_decls : decl list,
+
+     maxName : int
 }
 
 fun frob file =
@@ -95,21 +104,30 @@ fun frob file =
         val ssids = whichIds ssBasis
         val csids = whichIds csBasis
 
-        val serverSide = sideish (ssBasis, ssids)
-        val clientSide = sideish (csBasis, csids)
+        fun sideish' (basis, ids) extra =
+            sideish (basis, IM.foldli (fn (id, _, ids) => IS.add (ids, id)) ids extra)
+
+        val serverSide = sideish' (ssBasis, ssids)
+        val clientSide = sideish' (csBasis, csids)
 
         val tfuncs = foldl
                      (fn ((d, _), tfuncs) =>
                          let
-                             fun doOne ((_, n, t, _, _), tfuncs) =
+                             fun doOne ((x, n, t, e, _), tfuncs) =
                                  let
-                                     fun crawl (t, args) =
-                                         case #1 t of
-                                             CApp ((CFfi ("Basis", "transaction"), _), ran) => SOME (rev args, ran)
-                                           | TFun (arg, rest) => crawl (rest, arg :: args)
+                                     val loc = #2 e
+
+                                     fun crawl (t, e, args) =
+                                         case (#1 t, #1 e) of
+                                             (CApp (_, ran), _) =>
+                                             SOME (x, rev args, ran, e)
+                                           | (TFun (arg, rest), EAbs (x, _, _, e)) =>
+                                             crawl (rest, e, (x, arg) :: args)
+                                           | (TFun (arg, rest), _) =>
+                                             crawl (rest, (EApp (e, (ERel (length args), loc)), loc), ("x", arg) :: args)
                                            | _ => NONE
                                  in
-                                     case crawl (t, []) of
+                                     case crawl (t, e, []) of
                                          NONE => tfuncs
                                        | SOME sg => IM.insert (tfuncs, n, sg)
                                  end
@@ -127,44 +145,242 @@ fun frob file =
                 (EApp
                      ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), _), _), t1), _), t2), _),
                              (EFfi ("Basis", "transaction_monad"), _)), _),
-                      trans1), _),
+                      (ECase (ed, pes, {disc, ...}), _)), _),
+                trans2) =>
+                let
+                    val e' = (EFfi ("Basis", "bind"), loc)
+                    val e' = (ECApp (e', (CFfi ("Basis", "transaction"), loc)), loc)
+                    val e' = (ECApp (e', t1), loc)
+                    val e' = (ECApp (e', t2), loc)
+                    val e' = (EApp (e', (EFfi ("Basis", "transaction_monad"), loc)), loc)
+
+                    val (pes, st) = ListUtil.foldlMap (fn ((p, e), st) =>
+                                                          let
+                                                              val e' = (EApp (e', e), loc)
+                                                              val e' = (EApp (e',
+                                                                              multiLiftExpInExp (E.patBindsN p)
+                                                                                                trans2), loc)
+                                                              val (e', st) = doExp (e', st)
+                                                          in
+                                                              ((p, e'), st)
+                                                          end) st pes
+                in
+                    (ECase (ed, pes, {disc = disc,
+                                      result = (CApp ((CFfi ("Basis", "transaction"), loc), t2), loc)}),
+                     st)
+                end
+
+              | EApp (
+                (EApp
+                     ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), _), _), t1), _), t2), _),
+                             (EFfi ("Basis", "transaction_monad"), _)), _),
+                      (EServerCall (n, es, ke, t), _)), _),
                 trans2) =>
-                (case (serverSide trans1, clientSide trans1, serverSide trans2, clientSide trans2) of
-                     (true, false, false, true) =>
-                     let
-                         fun getApp (e, args) =
-                             case #1 e of
-                                 ENamed n => (n, args)
-                               | EApp (e1, e2) => getApp (e1, e2 :: args)
-                               | _ => (ErrorMsg.errorAt loc "Mixed client/server code doesn't use a named function for server part";
-                                       (0, []))
-
-                         val (n, args) = getApp (trans1, [])
-
-                         val (exported, export_decls) =
-                             if IS.member (#exported st, n) then
-                                 (#exported st, #export_decls st)
-                             else
-                                 (IS.add (#exported st, n),
-                                  (DExport (Rpc, n), loc) :: #export_decls st)
-
-                         val st = {cpsed = #cpsed st,
-                                   cps_decls = #cps_decls st,
-
-                                   exported = exported,
-                                   export_decls = export_decls}
-
-                         val ran =
-                             case IM.find (tfuncs, n) of
-                                 NONE => (Print.prefaces "BAD" [("e", CorePrint.p_exp CoreEnv.empty (e, loc))];
-                                          raise Fail "Rpcify: Undetected transaction function")
-                               | SOME (_, ran) => ran
-                     in
-                         (EServerCall (n, args, trans2, ran), st)
-                     end
-                   | _ => (e, st))
+                let
+                    val e' = (EFfi ("Basis", "bind"), loc)
+                    val e' = (ECApp (e', (CFfi ("Basis", "transaction"), loc)), loc)
+                    val e' = (ECApp (e', t), loc)
+                    val e' = (ECApp (e', t2), loc)
+                    val e' = (EApp (e', (EFfi ("Basis", "transaction_monad"), loc)), loc)
+                    val e' = (EApp (e', (EApp (E.liftExpInExp 0 ke, (ERel 0, loc)), loc)), loc)
+                    val e' = (EApp (e', E.liftExpInExp 0 trans2), loc)
+                    val e' = (EAbs ("x", t, t2, e'), loc)
+                    val e' = (EServerCall (n, es, e', t), loc)
+                    val (e', st) = doExp (e', st)
+                in
+                    (#1 e', st)
+                end
+
+              | EApp (
+                (EApp
+                     ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), _), _), _), _), t3), _),
+                             (EFfi ("Basis", "transaction_monad"), _)), _),
+                      (EApp ((EApp
+                                  ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), _), _), _), t1), _), t2), _),
+                                          (EFfi ("Basis", "transaction_monad"), _)), _),
+                                   trans1), _), trans2), _)), _),
+                trans3) =>
+                let
+                    val e'' = (EFfi ("Basis", "bind"), loc)
+                    val e'' = (ECApp (e'', (CFfi ("Basis", "transaction"), loc)), loc)
+                    val e'' = (ECApp (e'', t2), loc)
+                    val e'' = (ECApp (e'', t3), loc)
+                    val e'' = (EApp (e'', (EFfi ("Basis", "transaction_monad"), loc)), loc)
+                    val e'' = (EApp (e'', (EApp (E.liftExpInExp 0 trans2, (ERel 0, loc)), loc)), loc)
+                    val e'' = (EApp (e'', E.liftExpInExp 0 trans3), loc)
+                    val e'' = (EAbs ("x", t1, (CApp ((CFfi ("Basis", "transaction"), loc), t3), loc), e''), loc)
+
+                    val e' = (EFfi ("Basis", "bind"), loc)
+                    val e' = (ECApp (e', (CFfi ("Basis", "transaction"), loc)), loc)
+                    val e' = (ECApp (e', t1), loc)
+                    val e' = (ECApp (e', t3), loc)
+                    val e' = (EApp (e', (EFfi ("Basis", "transaction_monad"), loc)), loc)
+                    val e' = (EApp (e', trans1), loc)
+                    val e' = (EApp (e', e''), loc)
+                    val (e', st) = doExp (e', st)
+                in
+                    (#1 e', st)
+                end
+
+              | EApp (
+                (EApp
+                     ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), _), _), _), _), _), _), _),
+                             (EFfi ("Basis", "transaction_monad"), _)), _),
+                      _), loc),
+                (EAbs (_, _, _, (EWrite _, _)), _)) => (e, st)
+
+              | EApp (
+                (EApp
+                     ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), _), _), _), t1), _), t2), _),
+                             (EFfi ("Basis", "transaction_monad"), _)), _),
+                      trans1), loc),
+                trans2) =>
+                let
+                    (*val () = Print.prefaces "Default"
+                                            [("e", CorePrint.p_exp CoreEnv.empty (e, ErrorMsg.dummySpan))]*)
+
+                    fun getApp (e', args) =
+                        case #1 e' of
+                            ENamed n => (n, args)
+                          | EApp (e1, e2) => getApp (e1, e2 :: args)
+                          | _ => (ErrorMsg.errorAt loc "Mixed client/server code doesn't use a named function for server part";
+                                  Print.prefaces "Bad" [("e", CorePrint.p_exp CoreEnv.empty (e, ErrorMsg.dummySpan))];
+                                  (0, []))
+                in
+                    case (serverSide (#cpsed_range st) trans1, clientSide (#cpsed_range st) trans1,
+                          serverSide (#cpsed_range st) trans2, clientSide (#cpsed_range st) trans2) of
+                        (true, false, _, true) =>
+                        let
+                            val (n, args) = getApp (trans1, [])
+
+                            val (exported, export_decls) =
+                                if IS.member (#exported st, n) then
+                                    (#exported st, #export_decls st)
+                                else
+                                    (IS.add (#exported st, n),
+                                     (DExport (Rpc, n), loc) :: #export_decls st)
+
+                            val st = {cpsed = #cpsed st,
+                                      cpsed_range = #cpsed_range st,
+                                      cps_decls = #cps_decls st,
+
+                                      exported = exported,
+                                      export_decls = export_decls,
+
+                                      maxName = #maxName st}
+
+                            val ran =
+                                case IM.find (tfuncs, n) of
+                                    NONE => (Print.prefaces "BAD" [("e", CorePrint.p_exp CoreEnv.empty (e, loc))];
+                                             raise Fail ("Rpcify: Undetected transaction function " ^ Int.toString n))
+                                  | SOME (_, _, ran, _) => ran
+
+                            val e' = EServerCall (n, args, trans2, ran)
+                        in
+                            (EServerCall (n, args, trans2, ran), st)
+                        end
+                      | (true, true, _, _) =>
+                        let
+                            val (n, args) = getApp (trans1, [])
+
+                            fun makeCall n' =
+                                let
+                                    val e = (ENamed n', loc)
+                                    val e = (EApp (e, trans2), loc)
+                                in
+                                    #1 (foldl (fn (arg, e) => (EApp (e, arg), loc)) e args)
+                                end
+                        in
+                            case IM.find (#cpsed_range st, n) of
+                                SOME kdom =>
+                                (case args of
+                                     [] => raise Fail "Rpcify: cps'd function lacks first argument"
+                                   | ke :: args =>
+                                     let
+                                         val ke' = (EFfi ("Basis", "bind"), loc)
+                                         val ke' = (ECApp (ke', (CFfi ("Basis", "transaction"), loc)), loc)
+                                         val ke' = (ECApp (ke', kdom), loc)
+                                         val ke' = (ECApp (ke', t2), loc)
+                                         val ke' = (EApp (ke', (EFfi ("Basis", "transaction_monad"), loc)), loc)
+                                         val ke' = (EApp (ke', (EApp (E.liftExpInExp 0 ke, (ERel 0, loc)), loc)), loc)
+                                         val ke' = (EApp (ke', E.liftExpInExp 0 trans2), loc)
+                                         val ke' = (EAbs ("x", kdom,
+                                                          (CApp ((CFfi ("Basis", "transaction"), loc), t2), loc),
+                                                          ke'), loc)
+
+                                         val e' = (ENamed n, loc)
+                                         val e' = (EApp (e', ke'), loc)
+                                         val e' = foldl (fn (arg, e') => (EApp (e', arg), loc)) e' args
+                                         val (e', st) = doExp (e', st)
+                                     in
+                                         (#1 e', st)
+                                     end)
+                              | NONE =>
+                                case IM.find (#cpsed st, n) of
+                                    SOME n' => (makeCall n', st)
+                                  | NONE =>
+                                    let
+                                        val (name, fargs, ran, e) =
+                                            case IM.find (tfuncs, n) of
+                                                NONE => (Print.prefaces "BAD" [("e",
+                                                                                CorePrint.p_exp CoreEnv.empty (e, loc))];
+                                                         raise Fail "Rpcify: Undetected transaction function [2]")
+                                              | SOME x => x
+
+                                        val n' = #maxName st
+
+                                        val st = {cpsed = IM.insert (#cpsed st, n, n'),
+                                                  cpsed_range = IM.insert (#cpsed_range st, n', ran),
+                                                  cps_decls = #cps_decls st,
+                                                  exported = #exported st,
+                                                  export_decls = #export_decls st,
+                                                  maxName = n' + 1}
+
+                                        val unit = (TRecord (CRecord ((KType, loc), []), loc), loc)
+                                        val body = (EFfi ("Basis", "bind"), loc)
+                                        val body = (ECApp (body, (CFfi ("Basis", "transaction"), loc)), loc)
+                                        val body = (ECApp (body, t1), loc)
+                                        val body = (ECApp (body, unit), loc)
+                                        val body = (EApp (body, (EFfi ("Basis", "transaction_monad"), loc)), loc)
+                                        val body = (EApp (body, e), loc)
+                                        val body = (EApp (body, (ERel (length args), loc)), loc)
+                                        val bt = (CApp ((CFfi ("Basis", "transaction"), loc), unit), loc)
+                                        val (body, bt) = foldr (fn ((x, t), (body, bt)) =>
+                                                                   ((EAbs (x, t, bt, body), loc),
+                                                                    (TFun (t, bt), loc)))
+                                                               (body, bt) fargs
+                                        val kt = (TFun (ran, (CApp ((CFfi ("Basis", "transaction"), loc),
+                                                                    unit),
+                                                              loc)), loc)
+                                        val body = (EAbs ("k", kt, bt, body), loc)
+                                        val bt = (TFun (kt, bt), loc)
+
+                                        val (body, st) = doExp (body, st)
+
+                                        val vi = (name ^ "_cps",
+                                                  n',
+                                                  bt,
+                                                  body,
+                                                  "")
+
+                                        val st = {cpsed = #cpsed st,
+                                                  cpsed_range = #cpsed_range st,
+                                                  cps_decls = vi :: #cps_decls st,
+                                                  exported = #exported st,
+                                                  export_decls = #export_decls st,
+                                                  maxName = #maxName st}
+                                    in
+                                        (makeCall n', st)
+                                    end
+                        end
+                      | _ => (e, st)
+                end
               | _ => (e, st)
 
+        and doExp (e, st) = U.Exp.foldMap {kind = fn x => x,
+                                           con = fn x => x,
+                                           exp = exp} st (ReduceLocal.reduceExp e)
+
         fun decl (d, st : state) =
             let
                 val (d, st) = U.Decl.foldMap {kind = fn x => x,
@@ -181,18 +397,24 @@ fun frob file =
                                        | (_, loc) => [d, (DValRec ds, loc)],
                                  #export_decls st),
                  {cpsed = #cpsed st,
+                  cpsed_range = #cpsed_range st,
                   cps_decls = [],
                   
                   exported = #exported st,
-                  export_decls = []})
+                  export_decls = [],
+
+                  maxName = #maxName st})
             end
 
         val (file, _) = ListUtil.foldlMapConcat decl
                         {cpsed = IM.empty,
+                         cpsed_range = IM.empty,
                          cps_decls = [],
 
                          exported = IS.empty,
-                         export_decls = []}
+                         export_decls = [],
+
+                         maxName = U.File.maxName file + 1}
                         file
     in
         file
diff --git a/tests/rpcM.ur b/tests/rpcM.ur
new file mode 100644
index 00000000..4cd4b86b
--- /dev/null
+++ b/tests/rpcM.ur
@@ -0,0 +1,33 @@
+datatype list t = Nil | Cons of t * list t
+
+sequence s
+
+fun main () : transaction page =
+    let
+        fun getIndices srcs =
+            case srcs of
+                Nil => return Nil
+              | Cons (src, srcs') =>
+                i <- nextval s;
+                set src i;
+                ls <- getIndices srcs';
+                return (Cons (i, ls))
+
+        fun show ls =
+            case ls of
+                Nil => <xml/>
+              | Cons (x, ls') => <xml>{[x]}<br/>{show ls'}</xml>
+    in
+        src1 <- source 0;
+        src2 <- source 1;
+        s <- source Nil;
+        return <xml><body>
+          <button value="Get It On!"
+                  onclick={ns <- getIndices (Cons (src1, Cons (src2, Nil)));
+                           set s ns}/><br/>
+          <br/>
+          #1: <dyn signal={n <- signal src1; return <xml>{[n]}</xml>}/><br/>
+          #2: <dyn signal={n <- signal src2; return <xml>{[n]}</xml>}/><br/>
+          Current: <dyn signal={ns <- signal s; return (show ns)}/>
+        </body></xml>
+    end
diff --git a/tests/rpcM.urp b/tests/rpcM.urp
new file mode 100644
index 00000000..a1eec77d
--- /dev/null
+++ b/tests/rpcM.urp
@@ -0,0 +1,5 @@
+debug
+sql rpcM.sql
+database dbname=rpcm
+
+rpcM