Mercurial > urweb

annotate src/rpcify.sml @ 844:74a1e3bdf430

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix datatype import bug in Elaborate; fix server-side source setting; more standard library stuff
author Adam Chlipala <adamc@hcoop.net>
date Sun, 07 Jun 2009 16:45:00 -0400
parents a28982de5645
children ed06e25c70ef
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 type state = {
adamc@608 50 cpsed : int IM.map,
adamc@642 51 cpsed_range : con IM.map,
adamc@608 52 cps_decls : (string * int * con * exp * string) list,
adamc@608 53
adamc@608 54 exported : IS.set,
adamc@642 55 export_decls : decl list,
adamc@642 56
adamc@642 57 maxName : int
adamc@607 58 }
adamc@607 59
adamc@607 60 fun frob file =
adamc@607 61 let
adamc@650 62 fun sideish (basis, ssids) e =
adamc@679 63 U.Exp.exists {kind = fn _ => false,
adamc@679 64 con = fn _ => false,
adamc@679 65 exp = fn ENamed n => IS.member (ssids, n)
adamc@765 66 | EFfi x => basis x
adamc@765 67 | EFfiApp (m, x, _) => basis (m, x)
adamc@679 68 | _ => false}
adamc@679 69 (U.Exp.map {kind = fn x => x,
adamc@679 70 con = fn x => x,
adamc@679 71 exp = fn ERecord _ => ERecord []
adamc@679 72 | x => x} e)
adamc@607 73
adamc@607 74 fun whichIds basis =
adamc@607 75 let
adamc@607 76 fun decl ((d, _), ssids) =
adamc@607 77 let
adamc@607 78 val impure = sideish (basis, ssids)
adamc@607 79 in
adamc@607 80 case d of
adamc@607 81 DVal (_, n, _, e, _) => if impure e then
adamc@607 82 IS.add (ssids, n)
adamc@607 83 else
adamc@607 84 ssids
adamc@607 85 | DValRec xes => if List.exists (fn (_, _, _, e, _) => impure e) xes then
adamc@607 86 foldl (fn ((_, n, _, _, _), ssids) => IS.add (ssids, n))
adamc@607 87 ssids xes
adamc@607 88 else
adamc@607 89 ssids
adamc@607 90 | _ => ssids
adamc@607 91 end
adamc@607 92 in
adamc@607 93 foldl decl IS.empty file
adamc@607 94 end
adamc@607 95
adamc@765 96 val ssids = whichIds Settings.isServerOnly
adamc@765 97 val csids = whichIds Settings.isClientOnly
adamc@607 98
adamc@642 99 fun sideish' (basis, ids) extra =
adamc@642 100 sideish (basis, IM.foldli (fn (id, _, ids) => IS.add (ids, id)) ids extra)
adamc@642 101
adamc@765 102 val serverSide = sideish' (Settings.isServerOnly, ssids)
adamc@765 103 val clientSide = sideish' (Settings.isClientOnly, csids)
adamc@607 104
adamc@609 105 val tfuncs = foldl
adamc@609 106 (fn ((d, _), tfuncs) =>
adamc@609 107 let
adamc@642 108 fun doOne ((x, n, t, e, _), tfuncs) =
adamc@609 109 let
adamc@642 110 val loc = #2 e
adamc@642 111
adamc@642 112 fun crawl (t, e, args) =
adamc@642 113 case (#1 t, #1 e) of
adamc@642 114 (CApp (_, ran), _) =>
adamc@642 115 SOME (x, rev args, ran, e)
adamc@642 116 | (TFun (arg, rest), EAbs (x, _, _, e)) =>
adamc@642 117 crawl (rest, e, (x, arg) :: args)
adamc@642 118 | (TFun (arg, rest), _) =>
adamc@642 119 crawl (rest, (EApp (e, (ERel (length args), loc)), loc), ("x", arg) :: args)
adamc@609 120 | _ => NONE
adamc@609 121 in
adamc@642 122 case crawl (t, e, []) of
adamc@609 123 NONE => tfuncs
adamc@609 124 | SOME sg => IM.insert (tfuncs, n, sg)
adamc@609 125 end
adamc@609 126 in
adamc@609 127 case d of
adamc@609 128 DVal vi => doOne (vi, tfuncs)
adamc@609 129 | DValRec vis => foldl doOne tfuncs vis
adamc@609 130 | _ => tfuncs
adamc@609 131 end)
adamc@609 132 IM.empty file
adamc@609 133
adamc@607 134 fun exp (e, st) =
adamc@649 135 let
adamc@649 136 fun getApp (e', args) =
adamc@649 137 let
adamc@649 138 val loc = #2 e'
adamc@649 139 in
adamc@642 140 case #1 e' of
adamc@642 141 ENamed n => (n, args)
adamc@642 142 | EApp (e1, e2) => getApp (e1, e2 :: args)
adamc@642 143 | _ => (ErrorMsg.errorAt loc "Mixed client/server code doesn't use a named function for server part";
adamc@679 144 (*Print.prefaces "Bad" [("e", CorePrint.p_exp CoreEnv.empty (e, ErrorMsg.dummySpan))];*)
adamc@642 145 (0, []))
adamc@649 146 end
adamc@642 147
adamc@649 148 fun newRpc (trans1, trans2, st : state) =
adamc@649 149 let
adamc@649 150 val loc = #2 trans1
adamc@642 151
adamc@649 152 val (n, args) = getApp (trans1, [])
adamc@642 153
adamc@649 154 val (exported, export_decls) =
adamc@649 155 if IS.member (#exported st, n) then
adamc@649 156 (#exported st, #export_decls st)
adamc@649 157 else
adamc@649 158 (IS.add (#exported st, n),
adamc@731 159 (DExport (Rpc ReadWrite, n), loc) :: #export_decls st)
adamc@642 160
adamc@649 161 val st = {cpsed = #cpsed st,
adamc@649 162 cpsed_range = #cpsed_range st,
adamc@649 163 cps_decls = #cps_decls st,
adamc@642 164
adamc@649 165 exported = exported,
adamc@649 166 export_decls = export_decls,
adamc@642 167
adamc@649 168 maxName = #maxName st}
adamc@642 169
adamc@649 170 val ran =
adamc@649 171 case IM.find (tfuncs, n) of
adamc@679 172 NONE => ((*Print.prefaces "BAD" [("e", CorePrint.p_exp CoreEnv.empty (e, loc))];*)
adamc@649 173 raise Fail ("Rpcify: Undetected transaction function " ^ Int.toString n))
adamc@649 174 | SOME (_, _, ran, _) => ran
adamc@649 175
adamc@649 176 val e' = EServerCall (n, args, trans2, ran)
adamc@649 177 in
adamc@649 178 (e', st)
adamc@649 179 end
adamc@651 180
adamc@651 181 fun newCps (t1, t2, trans1, trans2, st) =
adamc@651 182 let
adamc@651 183 val loc = #2 trans1
adamc@651 184
adamc@651 185 val (n, args) = getApp (trans1, [])
adamc@651 186
adamc@651 187 fun makeCall n' =
adamc@651 188 let
adamc@651 189 val e = (ENamed n', loc)
adamc@651 190 val e = (EApp (e, trans2), loc)
adamc@651 191 in
adamc@651 192 #1 (foldl (fn (arg, e) => (EApp (e, arg), loc)) e args)
adamc@651 193 end
adamc@651 194 in
adamc@651 195 case IM.find (#cpsed_range st, n) of
adamc@651 196 SOME kdom =>
adamc@651 197 (case args of
adamc@651 198 [] => raise Fail "Rpcify: cps'd function lacks first argument"
adamc@651 199 | ke :: args =>
adamc@651 200 let
adamc@651 201 val ke' = (EFfi ("Basis", "bind"), loc)
adamc@651 202 val ke' = (ECApp (ke', (CFfi ("Basis", "transaction"), loc)), loc)
adamc@651 203 val ke' = (ECApp (ke', kdom), loc)
adamc@651 204 val ke' = (ECApp (ke', t2), loc)
adamc@651 205 val ke' = (EApp (ke', (EFfi ("Basis", "transaction_monad"), loc)), loc)
adamc@651 206 val ke' = (EApp (ke', (EApp (E.liftExpInExp 0 ke, (ERel 0, loc)), loc)), loc)
adamc@651 207 val ke' = (EApp (ke', E.liftExpInExp 0 trans2), loc)
adamc@651 208 val ke' = (EAbs ("x", kdom,
adamc@651 209 (CApp ((CFfi ("Basis", "transaction"), loc), t2), loc),
adamc@651 210 ke'), loc)
adamc@651 211
adamc@651 212 val e' = (ENamed n, loc)
adamc@651 213 val e' = (EApp (e', ke'), loc)
adamc@651 214 val e' = foldl (fn (arg, e') => (EApp (e', arg), loc)) e' args
adamc@651 215 val (e', st) = doExp (e', st)
adamc@651 216 in
adamc@651 217 (#1 e', st)
adamc@651 218 end)
adamc@651 219 | NONE =>
adamc@651 220 case IM.find (#cpsed st, n) of
adamc@651 221 SOME n' => (makeCall n', st)
adamc@651 222 | NONE =>
adamc@651 223 let
adamc@651 224 val (name, fargs, ran, e) =
adamc@651 225 case IM.find (tfuncs, n) of
adamc@651 226 NONE => (Print.prefaces "BAD" [("e",
adamc@651 227 CorePrint.p_exp CoreEnv.empty (e, loc))];
adamc@651 228 raise Fail "Rpcify: Undetected transaction function [2]")
adamc@651 229 | SOME x => x
adamc@651 230
adamc@651 231 val n' = #maxName st
adamc@651 232
adamc@651 233 val st = {cpsed = IM.insert (#cpsed st, n, n'),
adamc@651 234 cpsed_range = IM.insert (#cpsed_range st, n', ran),
adamc@651 235 cps_decls = #cps_decls st,
adamc@651 236 exported = #exported st,
adamc@651 237 export_decls = #export_decls st,
adamc@651 238 maxName = n' + 1}
adamc@651 239
adamc@651 240 val unit = (TRecord (CRecord ((KType, loc), []), loc), loc)
adamc@651 241 val body = (EFfi ("Basis", "bind"), loc)
adamc@651 242 val body = (ECApp (body, (CFfi ("Basis", "transaction"), loc)), loc)
adamc@651 243 val body = (ECApp (body, t1), loc)
adamc@651 244 val body = (ECApp (body, unit), loc)
adamc@651 245 val body = (EApp (body, (EFfi ("Basis", "transaction_monad"), loc)), loc)
adamc@651 246 val body = (EApp (body, e), loc)
adamc@651 247 val body = (EApp (body, (ERel (length args), loc)), loc)
adamc@651 248 val bt = (CApp ((CFfi ("Basis", "transaction"), loc), unit), loc)
adamc@651 249 val (body, bt) = foldr (fn ((x, t), (body, bt)) =>
adamc@651 250 ((EAbs (x, t, bt, body), loc),
adamc@651 251 (TFun (t, bt), loc)))
adamc@651 252 (body, bt) fargs
adamc@651 253 val kt = (TFun (ran, (CApp ((CFfi ("Basis", "transaction"), loc),
adamc@651 254 unit),
adamc@651 255 loc)), loc)
adamc@651 256 val body = (EAbs ("k", kt, bt, body), loc)
adamc@651 257 val bt = (TFun (kt, bt), loc)
adamc@651 258
adamc@651 259 val (body, st) = doExp (body, st)
adamc@651 260
adamc@651 261 val vi = (name ^ "_cps",
adamc@651 262 n',
adamc@651 263 bt,
adamc@651 264 body,
adamc@651 265 "")
adamc@651 266
adamc@651 267 val st = {cpsed = #cpsed st,
adamc@651 268 cpsed_range = #cpsed_range st,
adamc@651 269 cps_decls = vi :: #cps_decls st,
adamc@651 270 exported = #exported st,
adamc@651 271 export_decls = #export_decls st,
adamc@651 272 maxName = #maxName st}
adamc@651 273 in
adamc@651 274 (makeCall n', st)
adamc@651 275 end
adamc@651 276 end
adamc@651 277
adamc@651 278 fun dummyK loc =
adamc@651 279 let
adamc@651 280 val unit = (TRecord (CRecord ((KType, loc), []), loc), loc)
adamc@651 281
adamc@651 282 val k = (EFfi ("Basis", "return"), loc)
adamc@651 283 val k = (ECApp (k, (CFfi ("Basis", "transaction"), loc)), loc)
adamc@651 284 val k = (ECApp (k, unit), loc)
adamc@651 285 val k = (EApp (k, (EFfi ("Basis", "transaction_monad"), loc)), loc)
adamc@651 286 val k = (EApp (k, (ERecord [], loc)), loc)
adamc@651 287 in
adamc@651 288 (EAbs ("_", unit, unit, k), loc)
adamc@651 289 end
adamc@649 290 in
adamc@649 291 case e of
adamc@649 292 EApp (
adamc@649 293 (EApp
adamc@649 294 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), _), _), t1), _), t2), _),
adamc@649 295 (EFfi ("Basis", "transaction_monad"), _)), _),
adamc@649 296 (ECase (ed, pes, {disc, ...}), _)), _),
adamc@649 297 trans2) =>
adamc@649 298 let
adamc@649 299 val e' = (EFfi ("Basis", "bind"), loc)
adamc@649 300 val e' = (ECApp (e', (CFfi ("Basis", "transaction"), loc)), loc)
adamc@649 301 val e' = (ECApp (e', t1), loc)
adamc@649 302 val e' = (ECApp (e', t2), loc)
adamc@649 303 val e' = (EApp (e', (EFfi ("Basis", "transaction_monad"), loc)), loc)
adamc@649 304
adamc@649 305 val (pes, st) = ListUtil.foldlMap (fn ((p, e), st) =>
adamc@649 306 let
adamc@649 307 val e' = (EApp (e', e), loc)
adamc@649 308 val e' = (EApp (e',
adamc@649 309 multiLiftExpInExp (E.patBindsN p)
adamc@649 310 trans2), loc)
adamc@649 311 val (e', st) = doExp (e', st)
adamc@649 312 in
adamc@649 313 ((p, e'), st)
adamc@649 314 end) st pes
adamc@649 315 in
adamc@649 316 (ECase (ed, pes, {disc = disc,
adamc@649 317 result = (CApp ((CFfi ("Basis", "transaction"), loc), t2), loc)}),
adamc@649 318 st)
adamc@649 319 end
adamc@649 320
adamc@649 321 | EApp (
adamc@649 322 (EApp
adamc@649 323 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), _), _), t1), _), t2), _),
adamc@649 324 (EFfi ("Basis", "transaction_monad"), _)), _),
adamc@649 325 (EServerCall (n, es, ke, t), _)), _),
adamc@649 326 trans2) =>
adamc@649 327 let
adamc@649 328 val e' = (EFfi ("Basis", "bind"), loc)
adamc@649 329 val e' = (ECApp (e', (CFfi ("Basis", "transaction"), loc)), loc)
adamc@649 330 val e' = (ECApp (e', t), loc)
adamc@649 331 val e' = (ECApp (e', t2), loc)
adamc@649 332 val e' = (EApp (e', (EFfi ("Basis", "transaction_monad"), loc)), loc)
adamc@649 333 val e' = (EApp (e', (EApp (E.liftExpInExp 0 ke, (ERel 0, loc)), loc)), loc)
adamc@649 334 val e' = (EApp (e', E.liftExpInExp 0 trans2), loc)
adamc@649 335 val e' = (EAbs ("x", t, t2, e'), loc)
adamc@649 336 val e' = (EServerCall (n, es, e', t), loc)
adamc@649 337 val (e', st) = doExp (e', st)
adamc@649 338 in
adamc@649 339 (#1 e', st)
adamc@649 340 end
adamc@649 341
adamc@649 342 | EApp (
adamc@649 343 (EApp
adamc@649 344 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), _), _), _), _), t3), _),
adamc@649 345 (EFfi ("Basis", "transaction_monad"), _)), _),
adamc@649 346 (EApp ((EApp
adamc@649 347 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), _), _), _), t1), _), t2), _),
adamc@649 348 (EFfi ("Basis", "transaction_monad"), _)), _),
adamc@649 349 trans1), _), trans2), _)), _),
adamc@649 350 trans3) =>
adamc@649 351 let
adamc@649 352 val e'' = (EFfi ("Basis", "bind"), loc)
adamc@649 353 val e'' = (ECApp (e'', (CFfi ("Basis", "transaction"), loc)), loc)
adamc@649 354 val e'' = (ECApp (e'', t2), loc)
adamc@649 355 val e'' = (ECApp (e'', t3), loc)
adamc@649 356 val e'' = (EApp (e'', (EFfi ("Basis", "transaction_monad"), loc)), loc)
adamc@649 357 val e'' = (EApp (e'', (EApp (E.liftExpInExp 0 trans2, (ERel 0, loc)), loc)), loc)
adamc@649 358 val e'' = (EApp (e'', E.liftExpInExp 0 trans3), loc)
adamc@649 359 val e'' = (EAbs ("x", t1, (CApp ((CFfi ("Basis", "transaction"), loc), t3), loc), e''), loc)
adamc@649 360
adamc@649 361 val e' = (EFfi ("Basis", "bind"), loc)
adamc@649 362 val e' = (ECApp (e', (CFfi ("Basis", "transaction"), loc)), loc)
adamc@649 363 val e' = (ECApp (e', t1), loc)
adamc@649 364 val e' = (ECApp (e', t3), loc)
adamc@649 365 val e' = (EApp (e', (EFfi ("Basis", "transaction_monad"), loc)), loc)
adamc@649 366 val e' = (EApp (e', trans1), loc)
adamc@649 367 val e' = (EApp (e', e''), loc)
adamc@649 368 val (e', st) = doExp (e', st)
adamc@649 369 in
adamc@649 370 (#1 e', st)
adamc@649 371 end
adamc@649 372
adamc@649 373 | EApp (
adamc@649 374 (EApp
adamc@649 375 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), _), _), _), _), _), _), _),
adamc@649 376 (EFfi ("Basis", "transaction_monad"), _)), _),
adamc@649 377 _), loc),
adamc@649 378 (EAbs (_, _, _, (EWrite _, _)), _)) => (e, st)
adamc@649 379
adamc@649 380 | EApp (
adamc@649 381 (EApp
adamc@649 382 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), _), _), _), t1), _), t2), _),
adamc@649 383 (EFfi ("Basis", "transaction_monad"), _)), _),
adamc@649 384 trans1), loc),
adamc@649 385 trans2) =>
adamc@649 386 (case (serverSide (#cpsed_range st) trans1, clientSide (#cpsed_range st) trans1,
adamc@649 387 serverSide (#cpsed_range st) trans2, clientSide (#cpsed_range st) trans2) of
adamc@649 388 (true, false, _, true) => newRpc (trans1, trans2, st)
adamc@651 389 | (_, true, true, false) =>
adamc@651 390 (case #1 trans2 of
adamc@651 391 EAbs (x, dom, ran, trans2) =>
adamc@651 392 let
adamc@651 393 val (trans2, st) = newRpc (trans2, dummyK loc, st)
adamc@651 394 val trans2 = (EAbs (x, dom, ran, (trans2, loc)), loc)
adamc@649 395
adamc@651 396 val e = (EFfi ("Basis", "bind"), loc)
adamc@651 397 val e = (ECApp (e, (CFfi ("Basis", "transaction"), loc)), loc)
adamc@651 398 val e = (ECApp (e, t1), loc)
adamc@651 399 val e = (ECApp (e, t2), loc)
adamc@651 400 val e = (EApp (e, (EFfi ("Basis", "transaction_monad"), loc)), loc)
adamc@651 401 val e = (EApp (e, trans1), loc)
adamc@651 402 val e = EApp (e, trans2)
adamc@651 403 in
adamc@651 404 (e, st)
adamc@651 405 end
adamc@651 406 | _ => (e, st))
adamc@651 407 | (true, true, _, _) => newCps (t1, t2, trans1, trans2, st)
adamc@649 408
adamc@649 409 | _ => (e, st))
adamc@642 410
adamc@649 411 | ERecord xes =>
adamc@649 412 let
adamc@649 413 val loc = case xes of
adamc@649 414 [] => ErrorMsg.dummySpan
adamc@649 415 | (_, (_, loc), _) :: _ => loc
adamc@642 416
adamc@649 417 fun candidate (x, e) =
adamc@649 418 String.isPrefix "On" x
adamc@649 419 andalso serverSide (#cpsed_range st) e
adamc@649 420 andalso not (clientSide (#cpsed_range st) e)
adamc@649 421 in
adamc@649 422 if List.exists (fn ((CName x, _), e, _) => candidate (x, e)
adamc@649 423 | _ => false) xes then
adamc@649 424 let
adamc@649 425 val (xes, st) = ListUtil.foldlMap
adamc@649 426 (fn (y as (nm as (CName x, _), e, t), st) =>
adamc@649 427 if candidate (x, e) then
adamc@649 428 let
adamc@651 429 val (e, st) = newRpc (e, dummyK loc, st)
adamc@649 430 in
adamc@649 431 ((nm, (e, loc), t), st)
adamc@649 432 end
adamc@649 433 else
adamc@649 434 (y, st)
adamc@649 435 | y => y)
adamc@649 436 st xes
adamc@649 437 in
adamc@649 438 (ERecord xes, st)
adamc@649 439 end
adamc@649 440 else
adamc@649 441 (e, st)
adamc@649 442 end
adamc@642 443
adamc@649 444 | _ => (e, st)
adamc@649 445 end
adamc@607 446
adamc@642 447 and doExp (e, st) = U.Exp.foldMap {kind = fn x => x,
adamc@642 448 con = fn x => x,
adamc@642 449 exp = exp} st (ReduceLocal.reduceExp e)
adamc@642 450
adamc@607 451 fun decl (d, st : state) =
adamc@607 452 let
adamc@607 453 val (d, st) = U.Decl.foldMap {kind = fn x => x,
adamc@607 454 con = fn x => x,
adamc@607 455 exp = exp,
adamc@607 456 decl = fn x => x}
adamc@607 457 st d
adamc@607 458 in
adamc@608 459 (List.revAppend (case #cps_decls st of
adamc@608 460 [] => [d]
adamc@608 461 | ds =>
adamc@608 462 case d of
adamc@608 463 (DValRec vis, loc) => [(DValRec (ds @ vis), loc)]
adamc@608 464 | (_, loc) => [d, (DValRec ds, loc)],
adamc@608 465 #export_decls st),
adamc@608 466 {cpsed = #cpsed st,
adamc@642 467 cpsed_range = #cpsed_range st,
adamc@608 468 cps_decls = [],
adamc@608 469
adamc@608 470 exported = #exported st,
adamc@642 471 export_decls = [],
adamc@642 472
adamc@642 473 maxName = #maxName st})
adamc@607 474 end
adamc@607 475
adamc@607 476 val (file, _) = ListUtil.foldlMapConcat decl
adamc@608 477 {cpsed = IM.empty,
adamc@642 478 cpsed_range = IM.empty,
adamc@608 479 cps_decls = [],
adamc@608 480
adamc@608 481 exported = IS.empty,
adamc@642 482 export_decls = [],
adamc@642 483
adamc@642 484 maxName = U.File.maxName file + 1}
adamc@607 485 file
adamc@607 486 in
adamc@607 487 file
adamc@607 488 end
adamc@607 489
adamc@607 490 end