Mercurial > urweb

annotate src/rpcify.sml @ 658:81c5c2674215

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update old Ur/Web library section, before adding new stuff
author Adam Chlipala <adamc@hcoop.net>
date Thu, 12 Mar 2009 11:56:10 -0400
parents bab524996fca
children b0c1a46b1f15
rev   line source
adamc@607 1 (* Copyright (c) 2009, Adam Chlipala
adamc@607 2 * All rights reserved.
adamc@607 3 *
adamc@607 4 * Redistribution and use in source and binary forms, with or without
adamc@607 5 * modification, are permitted provided that the following conditions are met:
adamc@607 6 *
adamc@607 7 * - Redistributions of source code must retain the above copyright notice,
adamc@607 8 * this list of conditions and the following disclaimer.
adamc@607 9 * - Redistributions in binary form must reproduce the above copyright notice,
adamc@607 10 * this list of conditions and the following disclaimer in the documentation
adamc@607 11 * and/or other materials provided with the distribution.
adamc@607 12 * - The names of contributors may not be used to endorse or promote products
adamc@607 13 * derived from this software without specific prior written permission.
adamc@607 14 *
adamc@607 15 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
adamc@607 16 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
adamc@607 17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
adamc@607 18 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
adamc@607 19 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
adamc@607 20 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
adamc@607 21 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
adamc@607 22 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
adamc@607 23 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
adamc@607 24 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
adamc@607 25 * POSSIBILITY OF SUCH DAMAGE.
adamc@607 26 *)
adamc@607 27
adamc@607 28 structure Rpcify :> RPCIFY = struct
adamc@607 29
adamc@607 30 open Core
adamc@607 31
adamc@607 32 structure U = CoreUtil
adamc@607 33 structure E = CoreEnv
adamc@607 34
adamc@607 35 structure IS = IntBinarySet
adamc@607 36 structure IM = IntBinaryMap
adamc@607 37
adamc@607 38 structure SS = BinarySetFn(struct
adamc@607 39 type ord_key = string
adamc@607 40 val compare = String.compare
adamc@607 41 end)
adamc@607 42
adamc@642 43 fun multiLiftExpInExp n e =
adamc@642 44 if n = 0 then
adamc@642 45 e
adamc@642 46 else
adamc@642 47 multiLiftExpInExp (n - 1) (E.liftExpInExp 0 e)
adamc@642 48
adamc@607 49 val ssBasis = SS.addList (SS.empty,
adamc@607 50 ["requestHeader",
adamc@607 51 "query",
adamc@607 52 "dml",
adamc@607 53 "nextval"])
adamc@607 54
adamc@607 55 val csBasis = SS.addList (SS.empty,
adamc@607 56 ["source",
adamc@607 57 "get",
adamc@607 58 "set",
adamc@607 59 "alert"])
adamc@607 60
adamc@607 61 type state = {
adamc@608 62 cpsed : int IM.map,
adamc@642 63 cpsed_range : con IM.map,
adamc@608 64 cps_decls : (string * int * con * exp * string) list,
adamc@608 65
adamc@608 66 exported : IS.set,
adamc@642 67 export_decls : decl list,
adamc@642 68
adamc@642 69 maxName : int
adamc@607 70 }
adamc@607 71
adamc@607 72 fun frob file =
adamc@607 73 let
adamc@650 74 fun sideish (basis, ssids) e =
adamc@650 75 case #1 e of
adamc@650 76 ERecord _ => false
adamc@650 77 | _ =>
adamc@650 78 U.Exp.exists {kind = fn _ => false,
adamc@650 79 con = fn _ => false,
adamc@650 80 exp = fn ENamed n => IS.member (ssids, n)
adamc@650 81 | EFfi ("Basis", x) => SS.member (basis, x)
adamc@650 82 | EFfiApp ("Basis", x, _) => SS.member (basis, x)
adamc@650 83 | _ => false} e
adamc@607 84
adamc@607 85 fun whichIds basis =
adamc@607 86 let
adamc@607 87 fun decl ((d, _), ssids) =
adamc@607 88 let
adamc@607 89 val impure = sideish (basis, ssids)
adamc@607 90 in
adamc@607 91 case d of
adamc@607 92 DVal (_, n, _, e, _) => if impure e then
adamc@607 93 IS.add (ssids, n)
adamc@607 94 else
adamc@607 95 ssids
adamc@607 96 | DValRec xes => if List.exists (fn (_, _, _, e, _) => impure e) xes then
adamc@607 97 foldl (fn ((_, n, _, _, _), ssids) => IS.add (ssids, n))
adamc@607 98 ssids xes
adamc@607 99 else
adamc@607 100 ssids
adamc@607 101 | _ => ssids
adamc@607 102 end
adamc@607 103 in
adamc@607 104 foldl decl IS.empty file
adamc@607 105 end
adamc@607 106
adamc@607 107 val ssids = whichIds ssBasis
adamc@607 108 val csids = whichIds csBasis
adamc@607 109
adamc@642 110 fun sideish' (basis, ids) extra =
adamc@642 111 sideish (basis, IM.foldli (fn (id, _, ids) => IS.add (ids, id)) ids extra)
adamc@642 112
adamc@642 113 val serverSide = sideish' (ssBasis, ssids)
adamc@642 114 val clientSide = sideish' (csBasis, csids)
adamc@607 115
adamc@609 116 val tfuncs = foldl
adamc@609 117 (fn ((d, _), tfuncs) =>
adamc@609 118 let
adamc@642 119 fun doOne ((x, n, t, e, _), tfuncs) =
adamc@609 120 let
adamc@642 121 val loc = #2 e
adamc@642 122
adamc@642 123 fun crawl (t, e, args) =
adamc@642 124 case (#1 t, #1 e) of
adamc@642 125 (CApp (_, ran), _) =>
adamc@642 126 SOME (x, rev args, ran, e)
adamc@642 127 | (TFun (arg, rest), EAbs (x, _, _, e)) =>
adamc@642 128 crawl (rest, e, (x, arg) :: args)
adamc@642 129 | (TFun (arg, rest), _) =>
adamc@642 130 crawl (rest, (EApp (e, (ERel (length args), loc)), loc), ("x", arg) :: args)
adamc@609 131 | _ => NONE
adamc@609 132 in
adamc@642 133 case crawl (t, e, []) of
adamc@609 134 NONE => tfuncs
adamc@609 135 | SOME sg => IM.insert (tfuncs, n, sg)
adamc@609 136 end
adamc@609 137 in
adamc@609 138 case d of
adamc@609 139 DVal vi => doOne (vi, tfuncs)
adamc@609 140 | DValRec vis => foldl doOne tfuncs vis
adamc@609 141 | _ => tfuncs
adamc@609 142 end)
adamc@609 143 IM.empty file
adamc@609 144
adamc@607 145 fun exp (e, st) =
adamc@649 146 let
adamc@649 147 fun getApp (e', args) =
adamc@649 148 let
adamc@649 149 val loc = #2 e'
adamc@649 150 in
adamc@642 151 case #1 e' of
adamc@642 152 ENamed n => (n, args)
adamc@642 153 | EApp (e1, e2) => getApp (e1, e2 :: args)
adamc@642 154 | _ => (ErrorMsg.errorAt loc "Mixed client/server code doesn't use a named function for server part";
adamc@642 155 Print.prefaces "Bad" [("e", CorePrint.p_exp CoreEnv.empty (e, ErrorMsg.dummySpan))];
adamc@642 156 (0, []))
adamc@649 157 end
adamc@642 158
adamc@649 159 fun newRpc (trans1, trans2, st : state) =
adamc@649 160 let
adamc@649 161 val loc = #2 trans1
adamc@642 162
adamc@649 163 val (n, args) = getApp (trans1, [])
adamc@642 164
adamc@649 165 val (exported, export_decls) =
adamc@649 166 if IS.member (#exported st, n) then
adamc@649 167 (#exported st, #export_decls st)
adamc@649 168 else
adamc@649 169 (IS.add (#exported st, n),
adamc@649 170 (DExport (Rpc, n), loc) :: #export_decls st)
adamc@642 171
adamc@649 172 val st = {cpsed = #cpsed st,
adamc@649 173 cpsed_range = #cpsed_range st,
adamc@649 174 cps_decls = #cps_decls st,
adamc@642 175
adamc@649 176 exported = exported,
adamc@649 177 export_decls = export_decls,
adamc@642 178
adamc@649 179 maxName = #maxName st}
adamc@642 180
adamc@649 181 val ran =
adamc@649 182 case IM.find (tfuncs, n) of
adamc@649 183 NONE => (Print.prefaces "BAD" [("e", CorePrint.p_exp CoreEnv.empty (e, loc))];
adamc@649 184 raise Fail ("Rpcify: Undetected transaction function " ^ Int.toString n))
adamc@649 185 | SOME (_, _, ran, _) => ran
adamc@649 186
adamc@649 187 val e' = EServerCall (n, args, trans2, ran)
adamc@649 188 in
adamc@649 189 (e', st)
adamc@649 190 end
adamc@651 191
adamc@651 192 fun newCps (t1, t2, trans1, trans2, st) =
adamc@651 193 let
adamc@651 194 val loc = #2 trans1
adamc@651 195
adamc@651 196 val (n, args) = getApp (trans1, [])
adamc@651 197
adamc@651 198 fun makeCall n' =
adamc@651 199 let
adamc@651 200 val e = (ENamed n', loc)
adamc@651 201 val e = (EApp (e, trans2), loc)
adamc@651 202 in
adamc@651 203 #1 (foldl (fn (arg, e) => (EApp (e, arg), loc)) e args)
adamc@651 204 end
adamc@651 205 in
adamc@651 206 case IM.find (#cpsed_range st, n) of
adamc@651 207 SOME kdom =>
adamc@651 208 (case args of
adamc@651 209 [] => raise Fail "Rpcify: cps'd function lacks first argument"
adamc@651 210 | ke :: args =>
adamc@651 211 let
adamc@651 212 val ke' = (EFfi ("Basis", "bind"), loc)
adamc@651 213 val ke' = (ECApp (ke', (CFfi ("Basis", "transaction"), loc)), loc)
adamc@651 214 val ke' = (ECApp (ke', kdom), loc)
adamc@651 215 val ke' = (ECApp (ke', t2), loc)
adamc@651 216 val ke' = (EApp (ke', (EFfi ("Basis", "transaction_monad"), loc)), loc)
adamc@651 217 val ke' = (EApp (ke', (EApp (E.liftExpInExp 0 ke, (ERel 0, loc)), loc)), loc)
adamc@651 218 val ke' = (EApp (ke', E.liftExpInExp 0 trans2), loc)
adamc@651 219 val ke' = (EAbs ("x", kdom,
adamc@651 220 (CApp ((CFfi ("Basis", "transaction"), loc), t2), loc),
adamc@651 221 ke'), loc)
adamc@651 222
adamc@651 223 val e' = (ENamed n, loc)
adamc@651 224 val e' = (EApp (e', ke'), loc)
adamc@651 225 val e' = foldl (fn (arg, e') => (EApp (e', arg), loc)) e' args
adamc@651 226 val (e', st) = doExp (e', st)
adamc@651 227 in
adamc@651 228 (#1 e', st)
adamc@651 229 end)
adamc@651 230 | NONE =>
adamc@651 231 case IM.find (#cpsed st, n) of
adamc@651 232 SOME n' => (makeCall n', st)
adamc@651 233 | NONE =>
adamc@651 234 let
adamc@651 235 val (name, fargs, ran, e) =
adamc@651 236 case IM.find (tfuncs, n) of
adamc@651 237 NONE => (Print.prefaces "BAD" [("e",
adamc@651 238 CorePrint.p_exp CoreEnv.empty (e, loc))];
adamc@651 239 raise Fail "Rpcify: Undetected transaction function [2]")
adamc@651 240 | SOME x => x
adamc@651 241
adamc@651 242 val n' = #maxName st
adamc@651 243
adamc@651 244 val st = {cpsed = IM.insert (#cpsed st, n, n'),
adamc@651 245 cpsed_range = IM.insert (#cpsed_range st, n', ran),
adamc@651 246 cps_decls = #cps_decls st,
adamc@651 247 exported = #exported st,
adamc@651 248 export_decls = #export_decls st,
adamc@651 249 maxName = n' + 1}
adamc@651 250
adamc@651 251 val unit = (TRecord (CRecord ((KType, loc), []), loc), loc)
adamc@651 252 val body = (EFfi ("Basis", "bind"), loc)
adamc@651 253 val body = (ECApp (body, (CFfi ("Basis", "transaction"), loc)), loc)
adamc@651 254 val body = (ECApp (body, t1), loc)
adamc@651 255 val body = (ECApp (body, unit), loc)
adamc@651 256 val body = (EApp (body, (EFfi ("Basis", "transaction_monad"), loc)), loc)
adamc@651 257 val body = (EApp (body, e), loc)
adamc@651 258 val body = (EApp (body, (ERel (length args), loc)), loc)
adamc@651 259 val bt = (CApp ((CFfi ("Basis", "transaction"), loc), unit), loc)
adamc@651 260 val (body, bt) = foldr (fn ((x, t), (body, bt)) =>
adamc@651 261 ((EAbs (x, t, bt, body), loc),
adamc@651 262 (TFun (t, bt), loc)))
adamc@651 263 (body, bt) fargs
adamc@651 264 val kt = (TFun (ran, (CApp ((CFfi ("Basis", "transaction"), loc),
adamc@651 265 unit),
adamc@651 266 loc)), loc)
adamc@651 267 val body = (EAbs ("k", kt, bt, body), loc)
adamc@651 268 val bt = (TFun (kt, bt), loc)
adamc@651 269
adamc@651 270 val (body, st) = doExp (body, st)
adamc@651 271
adamc@651 272 val vi = (name ^ "_cps",
adamc@651 273 n',
adamc@651 274 bt,
adamc@651 275 body,
adamc@651 276 "")
adamc@651 277
adamc@651 278 val st = {cpsed = #cpsed st,
adamc@651 279 cpsed_range = #cpsed_range st,
adamc@651 280 cps_decls = vi :: #cps_decls st,
adamc@651 281 exported = #exported st,
adamc@651 282 export_decls = #export_decls st,
adamc@651 283 maxName = #maxName st}
adamc@651 284 in
adamc@651 285 (makeCall n', st)
adamc@651 286 end
adamc@651 287 end
adamc@651 288
adamc@651 289 fun dummyK loc =
adamc@651 290 let
adamc@651 291 val unit = (TRecord (CRecord ((KType, loc), []), loc), loc)
adamc@651 292
adamc@651 293 val k = (EFfi ("Basis", "return"), loc)
adamc@651 294 val k = (ECApp (k, (CFfi ("Basis", "transaction"), loc)), loc)
adamc@651 295 val k = (ECApp (k, unit), loc)
adamc@651 296 val k = (EApp (k, (EFfi ("Basis", "transaction_monad"), loc)), loc)
adamc@651 297 val k = (EApp (k, (ERecord [], loc)), loc)
adamc@651 298 in
adamc@651 299 (EAbs ("_", unit, unit, k), loc)
adamc@651 300 end
adamc@649 301 in
adamc@649 302 case e of
adamc@649 303 EApp (
adamc@649 304 (EApp
adamc@649 305 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), _), _), t1), _), t2), _),
adamc@649 306 (EFfi ("Basis", "transaction_monad"), _)), _),
adamc@649 307 (ECase (ed, pes, {disc, ...}), _)), _),
adamc@649 308 trans2) =>
adamc@649 309 let
adamc@649 310 val e' = (EFfi ("Basis", "bind"), loc)
adamc@649 311 val e' = (ECApp (e', (CFfi ("Basis", "transaction"), loc)), loc)
adamc@649 312 val e' = (ECApp (e', t1), loc)
adamc@649 313 val e' = (ECApp (e', t2), loc)
adamc@649 314 val e' = (EApp (e', (EFfi ("Basis", "transaction_monad"), loc)), loc)
adamc@649 315
adamc@649 316 val (pes, st) = ListUtil.foldlMap (fn ((p, e), st) =>
adamc@649 317 let
adamc@649 318 val e' = (EApp (e', e), loc)
adamc@649 319 val e' = (EApp (e',
adamc@649 320 multiLiftExpInExp (E.patBindsN p)
adamc@649 321 trans2), loc)
adamc@649 322 val (e', st) = doExp (e', st)
adamc@649 323 in
adamc@649 324 ((p, e'), st)
adamc@649 325 end) st pes
adamc@649 326 in
adamc@649 327 (ECase (ed, pes, {disc = disc,
adamc@649 328 result = (CApp ((CFfi ("Basis", "transaction"), loc), t2), loc)}),
adamc@649 329 st)
adamc@649 330 end
adamc@649 331
adamc@649 332 | EApp (
adamc@649 333 (EApp
adamc@649 334 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), _), _), t1), _), t2), _),
adamc@649 335 (EFfi ("Basis", "transaction_monad"), _)), _),
adamc@649 336 (EServerCall (n, es, ke, t), _)), _),
adamc@649 337 trans2) =>
adamc@649 338 let
adamc@649 339 val e' = (EFfi ("Basis", "bind"), loc)
adamc@649 340 val e' = (ECApp (e', (CFfi ("Basis", "transaction"), loc)), loc)
adamc@649 341 val e' = (ECApp (e', t), loc)
adamc@649 342 val e' = (ECApp (e', t2), loc)
adamc@649 343 val e' = (EApp (e', (EFfi ("Basis", "transaction_monad"), loc)), loc)
adamc@649 344 val e' = (EApp (e', (EApp (E.liftExpInExp 0 ke, (ERel 0, loc)), loc)), loc)
adamc@649 345 val e' = (EApp (e', E.liftExpInExp 0 trans2), loc)
adamc@649 346 val e' = (EAbs ("x", t, t2, e'), loc)
adamc@649 347 val e' = (EServerCall (n, es, e', t), loc)
adamc@649 348 val (e', st) = doExp (e', st)
adamc@649 349 in
adamc@649 350 (#1 e', st)
adamc@649 351 end
adamc@649 352
adamc@649 353 | EApp (
adamc@649 354 (EApp
adamc@649 355 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), _), _), _), _), t3), _),
adamc@649 356 (EFfi ("Basis", "transaction_monad"), _)), _),
adamc@649 357 (EApp ((EApp
adamc@649 358 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), _), _), _), t1), _), t2), _),
adamc@649 359 (EFfi ("Basis", "transaction_monad"), _)), _),
adamc@649 360 trans1), _), trans2), _)), _),
adamc@649 361 trans3) =>
adamc@649 362 let
adamc@649 363 val e'' = (EFfi ("Basis", "bind"), loc)
adamc@649 364 val e'' = (ECApp (e'', (CFfi ("Basis", "transaction"), loc)), loc)
adamc@649 365 val e'' = (ECApp (e'', t2), loc)
adamc@649 366 val e'' = (ECApp (e'', t3), loc)
adamc@649 367 val e'' = (EApp (e'', (EFfi ("Basis", "transaction_monad"), loc)), loc)
adamc@649 368 val e'' = (EApp (e'', (EApp (E.liftExpInExp 0 trans2, (ERel 0, loc)), loc)), loc)
adamc@649 369 val e'' = (EApp (e'', E.liftExpInExp 0 trans3), loc)
adamc@649 370 val e'' = (EAbs ("x", t1, (CApp ((CFfi ("Basis", "transaction"), loc), t3), loc), e''), loc)
adamc@649 371
adamc@649 372 val e' = (EFfi ("Basis", "bind"), loc)
adamc@649 373 val e' = (ECApp (e', (CFfi ("Basis", "transaction"), loc)), loc)
adamc@649 374 val e' = (ECApp (e', t1), loc)
adamc@649 375 val e' = (ECApp (e', t3), loc)
adamc@649 376 val e' = (EApp (e', (EFfi ("Basis", "transaction_monad"), loc)), loc)
adamc@649 377 val e' = (EApp (e', trans1), loc)
adamc@649 378 val e' = (EApp (e', e''), loc)
adamc@649 379 val (e', st) = doExp (e', st)
adamc@649 380 in
adamc@649 381 (#1 e', st)
adamc@649 382 end
adamc@649 383
adamc@649 384 | EApp (
adamc@649 385 (EApp
adamc@649 386 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), _), _), _), _), _), _), _),
adamc@649 387 (EFfi ("Basis", "transaction_monad"), _)), _),
adamc@649 388 _), loc),
adamc@649 389 (EAbs (_, _, _, (EWrite _, _)), _)) => (e, st)
adamc@649 390
adamc@649 391 | EApp (
adamc@649 392 (EApp
adamc@649 393 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), _), _), _), t1), _), t2), _),
adamc@649 394 (EFfi ("Basis", "transaction_monad"), _)), _),
adamc@649 395 trans1), loc),
adamc@649 396 trans2) =>
adamc@649 397 (case (serverSide (#cpsed_range st) trans1, clientSide (#cpsed_range st) trans1,
adamc@649 398 serverSide (#cpsed_range st) trans2, clientSide (#cpsed_range st) trans2) of
adamc@649 399 (true, false, _, true) => newRpc (trans1, trans2, st)
adamc@651 400 | (_, true, true, false) =>
adamc@651 401 (case #1 trans2 of
adamc@651 402 EAbs (x, dom, ran, trans2) =>
adamc@651 403 let
adamc@651 404 val (trans2, st) = newRpc (trans2, dummyK loc, st)
adamc@651 405 val trans2 = (EAbs (x, dom, ran, (trans2, loc)), loc)
adamc@649 406
adamc@651 407 val e = (EFfi ("Basis", "bind"), loc)
adamc@651 408 val e = (ECApp (e, (CFfi ("Basis", "transaction"), loc)), loc)
adamc@651 409 val e = (ECApp (e, t1), loc)
adamc@651 410 val e = (ECApp (e, t2), loc)
adamc@651 411 val e = (EApp (e, (EFfi ("Basis", "transaction_monad"), loc)), loc)
adamc@651 412 val e = (EApp (e, trans1), loc)
adamc@651 413 val e = EApp (e, trans2)
adamc@651 414 in
adamc@651 415 (e, st)
adamc@651 416 end
adamc@651 417 | _ => (e, st))
adamc@651 418 | (true, true, _, _) => newCps (t1, t2, trans1, trans2, st)
adamc@649 419
adamc@649 420 | _ => (e, st))
adamc@642 421
adamc@649 422 | ERecord xes =>
adamc@649 423 let
adamc@649 424 val loc = case xes of
adamc@649 425 [] => ErrorMsg.dummySpan
adamc@649 426 | (_, (_, loc), _) :: _ => loc
adamc@642 427
adamc@649 428 fun candidate (x, e) =
adamc@649 429 String.isPrefix "On" x
adamc@649 430 andalso serverSide (#cpsed_range st) e
adamc@649 431 andalso not (clientSide (#cpsed_range st) e)
adamc@649 432 in
adamc@649 433 if List.exists (fn ((CName x, _), e, _) => candidate (x, e)
adamc@649 434 | _ => false) xes then
adamc@649 435 let
adamc@649 436 val (xes, st) = ListUtil.foldlMap
adamc@649 437 (fn (y as (nm as (CName x, _), e, t), st) =>
adamc@649 438 if candidate (x, e) then
adamc@649 439 let
adamc@651 440 val (e, st) = newRpc (e, dummyK loc, st)
adamc@649 441 in
adamc@649 442 ((nm, (e, loc), t), st)
adamc@649 443 end
adamc@649 444 else
adamc@649 445 (y, st)
adamc@649 446 | y => y)
adamc@649 447 st xes
adamc@649 448 in
adamc@649 449 (ERecord xes, st)
adamc@649 450 end
adamc@649 451 else
adamc@649 452 (e, st)
adamc@649 453 end
adamc@642 454
adamc@649 455 | _ => (e, st)
adamc@649 456 end
adamc@607 457
adamc@642 458 and doExp (e, st) = U.Exp.foldMap {kind = fn x => x,
adamc@642 459 con = fn x => x,
adamc@642 460 exp = exp} st (ReduceLocal.reduceExp e)
adamc@642 461
adamc@607 462 fun decl (d, st : state) =
adamc@607 463 let
adamc@607 464 val (d, st) = U.Decl.foldMap {kind = fn x => x,
adamc@607 465 con = fn x => x,
adamc@607 466 exp = exp,
adamc@607 467 decl = fn x => x}
adamc@607 468 st d
adamc@607 469 in
adamc@608 470 (List.revAppend (case #cps_decls st of
adamc@608 471 [] => [d]
adamc@608 472 | ds =>
adamc@608 473 case d of
adamc@608 474 (DValRec vis, loc) => [(DValRec (ds @ vis), loc)]
adamc@608 475 | (_, loc) => [d, (DValRec ds, loc)],
adamc@608 476 #export_decls st),
adamc@608 477 {cpsed = #cpsed st,
adamc@642 478 cpsed_range = #cpsed_range st,
adamc@608 479 cps_decls = [],
adamc@608 480
adamc@608 481 exported = #exported st,
adamc@642 482 export_decls = [],
adamc@642 483
adamc@642 484 maxName = #maxName st})
adamc@607 485 end
adamc@607 486
adamc@607 487 val (file, _) = ListUtil.foldlMapConcat decl
adamc@608 488 {cpsed = IM.empty,
adamc@642 489 cpsed_range = IM.empty,
adamc@608 490 cps_decls = [],
adamc@608 491
adamc@608 492 exported = IS.empty,
adamc@642 493 export_decls = [],
adamc@642 494
adamc@642 495 maxName = U.File.maxName file + 1}
adamc@607 496 file
adamc@607 497 in
adamc@607 498 file
adamc@607 499 end
adamc@607 500
adamc@607 501 end