Mercurial > urweb

annotate src/cjrize.sml @ 456:1a4fa157fedd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Monoizing FFI transactions correctly
author Adam Chlipala <adamc@hcoop.net>
date Thu, 06 Nov 2008 09:21:34 -0500
parents 787d4931fb07
children bb27c7efcd90
rev   line source
adamc@29 1 (* Copyright (c) 2008, Adam Chlipala
adamc@29 2 * All rights reserved.
adamc@29 3 *
adamc@29 4 * Redistribution and use in source and binary forms, with or without
adamc@29 5 * modification, are permitted provided that the following conditions are met:
adamc@29 6 *
adamc@29 7 * - Redistributions of source code must retain the above copyright notice,
adamc@29 8 * this list of conditions and the following disclaimer.
adamc@29 9 * - Redistributions in binary form must reproduce the above copyright notice,
adamc@29 10 * this list of conditions and the following disclaimer in the documentation
adamc@29 11 * and/or other materials provided with the distribution.
adamc@29 12 * - The names of contributors may not be used to endorse or promote products
adamc@29 13 * derived from this software without specific prior written permission.
adamc@29 14 *
adamc@29 15 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
adamc@29 16 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
adamc@29 17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
adamc@29 18 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
adamc@29 19 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
adamc@29 20 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
adamc@29 21 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
adamc@29 22 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
adamc@29 23 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
adamc@29 24 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
adamc@29 25 * POSSIBILITY OF SUCH DAMAGE.
adamc@29 26 *)
adamc@29 27
adamc@29 28 structure Cjrize :> CJRIZE = struct
adamc@29 29
adamc@109 30 structure L = Mono
adamc@29 31 structure L' = Cjr
adamc@29 32
adamc@196 33 structure IM = IntBinaryMap
adamc@196 34
adamc@29 35 structure Sm :> sig
adamc@29 36 type t
adamc@29 37
adamc@29 38 val empty : t
adamc@29 39 val find : t * (string * L.typ) list * (string * L'.typ) list -> t * int
adamc@29 40
adamc@29 41 val declares : t -> (int * (string * L'.typ) list) list
adamc@453 42 val clearDeclares : t -> t
adamc@29 43 end = struct
adamc@29 44
adamc@29 45 structure FM = BinaryMapFn(struct
adamc@29 46 type ord_key = L.typ
adamc@109 47 val compare = MonoUtil.Typ.compare
adamc@29 48 end)
adamc@29 49
adamc@29 50 type t = int * int FM.map * (int * (string * L'.typ) list) list
adamc@29 51
adamc@102 52 val empty : t = (1, FM.insert (FM.empty, (L.TRecord [], ErrorMsg.dummySpan), 0), [])
adamc@29 53
adamc@29 54 fun find ((n, m, ds), xts, xts') =
adamc@29 55 let
adamc@29 56 val t = (L.TRecord xts, ErrorMsg.dummySpan)
adamc@29 57 in
adamc@29 58 case FM.find (m, t) of
adamc@29 59 NONE => ((n+1, FM.insert (m, t, n), (n, xts') :: ds), n)
adamc@29 60 | SOME i => ((n, m, ds), i)
adamc@29 61 end
adamc@29 62
adamc@29 63 fun declares (_, _, ds) = ds
adamc@29 64
adamc@453 65 fun clearDeclares (n, m, _) = (n, m, [])
adamc@453 66
adamc@29 67 end
adamc@29 68
adamc@196 69 fun cifyTyp x =
adamc@196 70 let
adamc@196 71 fun cify dtmap ((t, loc), sm) =
adamc@196 72 case t of
adamc@196 73 L.TFun (t1, t2) =>
adamc@196 74 let
adamc@196 75 val (t1, sm) = cify dtmap (t1, sm)
adamc@196 76 val (t2, sm) = cify dtmap (t2, sm)
adamc@196 77 in
adamc@196 78 ((L'.TFun (t1, t2), loc), sm)
adamc@196 79 end
adamc@196 80 | L.TRecord xts =>
adamc@196 81 let
adamc@196 82 val old_xts = xts
adamc@196 83 val (xts, sm) = ListUtil.foldlMap (fn ((x, t), sm) =>
adamc@196 84 let
adamc@196 85 val (t, sm) = cify dtmap (t, sm)
adamc@196 86 in
adamc@196 87 ((x, t), sm)
adamc@196 88 end)
adamc@196 89 sm xts
adamc@196 90 val (sm, si) = Sm.find (sm, old_xts, xts)
adamc@196 91 in
adamc@196 92 ((L'.TRecord si, loc), sm)
adamc@196 93 end
adamc@196 94 | L.TDatatype (n, ref (dk, xncs)) =>
adamc@196 95 (case IM.find (dtmap, n) of
adamc@196 96 SOME r => ((L'.TDatatype (dk, n, r), loc), sm)
adamc@196 97 | NONE =>
adamc@196 98 let
adamc@196 99 val r = ref []
adamc@196 100 val dtmap = IM.insert (dtmap, n, r)
adamc@196 101
adamc@196 102 val (xncs, sm) = ListUtil.foldlMap (fn ((x, n, to), sm) =>
adamc@196 103 case to of
adamc@196 104 NONE => ((x, n, NONE), sm)
adamc@196 105 | SOME t =>
adamc@196 106 let
adamc@196 107 val (t, sm) = cify dtmap (t, sm)
adamc@196 108 in
adamc@196 109 ((x, n, SOME t), sm)
adamc@196 110 end)
adamc@196 111 sm xncs
adamc@196 112 in
adamc@196 113 r := xncs;
adamc@196 114 ((L'.TDatatype (dk, n, r), loc), sm)
adamc@196 115 end)
adamc@196 116 | L.TFfi mx => ((L'.TFfi mx, loc), sm)
adamc@288 117 | L.TOption t =>
adamc@288 118 let
adamc@288 119 val (t, sm) = cify dtmap (t, sm)
adamc@288 120 in
adamc@288 121 ((L'.TOption t, loc), sm)
adamc@288 122 end
adamc@196 123 in
adamc@196 124 cify IM.empty x
adamc@196 125 end
adamc@29 126
adamc@109 127 val dummye = (L'.EPrim (Prim.Int 0), ErrorMsg.dummySpan)
adamc@109 128
adamc@186 129 fun cifyPatCon (pc, sm) =
adamc@181 130 case pc of
adamc@186 131 L.PConVar n => (L'.PConVar n, sm)
adamc@186 132 | L.PConFfi {mod = m, datatyp, con, arg} =>
adamc@186 133 let
adamc@186 134 val (arg, sm) =
adamc@186 135 case arg of
adamc@186 136 NONE => (NONE, sm)
adamc@186 137 | SOME t =>
adamc@186 138 let
adamc@186 139 val (t, sm) = cifyTyp (t, sm)
adamc@186 140 in
adamc@186 141 (SOME t, sm)
adamc@186 142 end
adamc@186 143 in
adamc@186 144 (L'.PConFfi {mod = m, datatyp = datatyp, con = con, arg = arg}, sm)
adamc@186 145 end
adamc@181 146
adamc@182 147 fun cifyPat ((p, loc), sm) =
adamc@181 148 case p of
adamc@182 149 L.PWild => ((L'.PWild, loc), sm)
adamc@182 150 | L.PVar (x, t) =>
adamc@182 151 let
adamc@182 152 val (t, sm) = cifyTyp (t, sm)
adamc@182 153 in
adamc@182 154 ((L'.PVar (x, t), loc), sm)
adamc@182 155 end
adamc@182 156 | L.PPrim p => ((L'.PPrim p, loc), sm)
adamc@188 157 | L.PCon (dk, pc, NONE) =>
adamc@186 158 let
adamc@186 159 val (pc, sm) = cifyPatCon (pc, sm)
adamc@186 160 in
adamc@188 161 ((L'.PCon (dk, pc, NONE), loc), sm)
adamc@186 162 end
adamc@188 163 | L.PCon (dk, pc, SOME p) =>
adamc@182 164 let
adamc@186 165 val (pc, sm) = cifyPatCon (pc, sm)
adamc@182 166 val (p, sm) = cifyPat (p, sm)
adamc@182 167 in
adamc@188 168 ((L'.PCon (dk, pc, SOME p), loc), sm)
adamc@182 169 end
adamc@182 170 | L.PRecord xps =>
adamc@182 171 let
adamc@182 172 val (xps, sm) = ListUtil.foldlMap (fn ((x, p, t), sm) =>
adamc@182 173 let
adamc@182 174 val (p, sm) = cifyPat (p, sm)
adamc@182 175 val (t, sm) = cifyTyp (t, sm)
adamc@182 176 in
adamc@182 177 ((x, p, t), sm)
adamc@182 178 end) sm xps
adamc@182 179 in
adamc@182 180 ((L'.PRecord xps, loc), sm)
adamc@182 181 end
adamc@288 182 | L.PNone t =>
adamc@288 183 let
adamc@288 184 val (t, sm) = cifyTyp (t, sm)
adamc@288 185 in
adamc@288 186 ((L'.PNone t, loc), sm)
adamc@288 187 end
adamc@288 188 | L.PSome (t, p) =>
adamc@288 189 let
adamc@288 190 val (t, sm) = cifyTyp (t, sm)
adamc@288 191 val (p, sm) = cifyPat (p, sm)
adamc@288 192 in
adamc@288 193 ((L'.PSome (t, p), loc), sm)
adamc@288 194 end
adamc@288 195
adamc@181 196
adamc@280 197 fun cifyExp (eAll as (e, loc), sm) =
adamc@29 198 case e of
adamc@29 199 L.EPrim p => ((L'.EPrim p, loc), sm)
adamc@29 200 | L.ERel n => ((L'.ERel n, loc), sm)
adamc@29 201 | L.ENamed n => ((L'.ENamed n, loc), sm)
adamc@188 202 | L.ECon (dk, pc, eo) =>
adamc@181 203 let
adamc@181 204 val (eo, sm) =
adamc@181 205 case eo of
adamc@181 206 NONE => (NONE, sm)
adamc@181 207 | SOME e =>
adamc@181 208 let
adamc@181 209 val (e, sm) = cifyExp (e, sm)
adamc@181 210 in
adamc@181 211 (SOME e, sm)
adamc@181 212 end
adamc@186 213 val (pc, sm) = cifyPatCon (pc, sm)
adamc@181 214 in
adamc@188 215 ((L'.ECon (dk, pc, eo), loc), sm)
adamc@181 216 end
adamc@297 217 | L.ENone t =>
adamc@297 218 let
adamc@297 219 val (t, sm) = cifyTyp (t, sm)
adamc@297 220 in
adamc@297 221 ((L'.ENone t, loc), sm)
adamc@297 222 end
adamc@290 223 | L.ESome (t, e) =>
adamc@290 224 let
adamc@290 225 val (t, sm) = cifyTyp (t, sm)
adamc@290 226 val (e, sm) = cifyExp (e, sm)
adamc@290 227 in
adamc@290 228 ((L'.ESome (t, e), loc), sm)
adamc@290 229 end
adamc@53 230 | L.EFfi mx => ((L'.EFfi mx, loc), sm)
adamc@53 231 | L.EFfiApp (m, x, es) =>
adamc@53 232 let
adamc@53 233 val (es, sm) = ListUtil.foldlMap cifyExp sm es
adamc@53 234 in
adamc@53 235 ((L'.EFfiApp (m, x, es), loc), sm)
adamc@53 236 end
adamc@29 237 | L.EApp (e1, e2) =>
adamc@29 238 let
adamc@316 239 fun unravel (e, args) =
adamc@316 240 case e of
adamc@316 241 (L.EApp (e1, e2), _) => unravel (e1, e2 :: args)
adamc@316 242 | _ => (e, args)
adamc@316 243
adamc@316 244 val (f, es) = unravel (e1, [e2])
adamc@316 245
adamc@316 246 val (f, sm) = cifyExp (f, sm)
adamc@316 247 val (es, sm) = ListUtil.foldlMap cifyExp sm es
adamc@29 248 in
adamc@316 249 ((L'.EApp (f, es), loc), sm)
adamc@29 250 end
adamc@109 251 | L.EAbs _ => (ErrorMsg.errorAt loc "Anonymous function remains at code generation";
adamc@280 252 Print.prefaces' [("Function", MonoPrint.p_exp MonoEnv.empty eAll)];
adamc@109 253 (dummye, sm))
adamc@29 254
adamc@387 255 | L.EUnop (s, e1) =>
adamc@387 256 let
adamc@387 257 val (e1, sm) = cifyExp (e1, sm)
adamc@387 258 in
adamc@387 259 ((L'.EUnop (s, e1), loc), sm)
adamc@387 260 end
adamc@387 261 | L.EBinop (s, e1, e2) =>
adamc@387 262 let
adamc@387 263 val (e1, sm) = cifyExp (e1, sm)
adamc@387 264 val (e2, sm) = cifyExp (e2, sm)
adamc@387 265 in
adamc@387 266 ((L'.EBinop (s, e1, e2), loc), sm)
adamc@387 267 end
adamc@387 268
adamc@29 269 | L.ERecord xes =>
adamc@29 270 let
adamc@29 271 val old_xts = map (fn (x, _, t) => (x, t)) xes
adamc@29 272
adamc@29 273 val (xets, sm) = ListUtil.foldlMap (fn ((x, e, t), sm) =>
adamc@29 274 let
adamc@29 275 val (e, sm) = cifyExp (e, sm)
adamc@29 276 val (t, sm) = cifyTyp (t, sm)
adamc@29 277 in
adamc@29 278 ((x, e, t), sm)
adamc@29 279 end)
adamc@29 280 sm xes
adamc@29 281
adamc@29 282 val (sm, si) = Sm.find (sm, old_xts, map (fn (x, _, t) => (x, t)) xets)
adamc@29 283
adamc@29 284 val xes = map (fn (x, e, _) => (x, e)) xets
adamc@29 285 val xes = ListMergeSort.sort (fn ((x1, _), (x2, _)) => String.compare (x1, x2) = GREATER) xes
adamc@29 286 in
adamc@29 287 ((L'.ERecord (si, xes), loc), sm)
adamc@29 288 end
adamc@29 289 | L.EField (e, x) =>
adamc@29 290 let
adamc@29 291 val (e, sm) = cifyExp (e, sm)
adamc@29 292 in
adamc@29 293 ((L'.EField (e, x), loc), sm)
adamc@29 294 end
adamc@29 295
adamc@182 296 | L.ECase (e, pes, {disc, result}) =>
adamc@181 297 let
adamc@181 298 val (e, sm) = cifyExp (e, sm)
adamc@181 299 val (pes, sm) = ListUtil.foldlMap
adamc@181 300 (fn ((p, e), sm) =>
adamc@181 301 let
adamc@181 302 val (e, sm) = cifyExp (e, sm)
adamc@182 303 val (p, sm) = cifyPat (p, sm)
adamc@181 304 in
adamc@182 305 ((p, e), sm)
adamc@181 306 end) sm pes
adamc@182 307 val (disc, sm) = cifyTyp (disc, sm)
adamc@182 308 val (result, sm) = cifyTyp (result, sm)
adamc@181 309 in
adamc@182 310 ((L'.ECase (e, pes, {disc = disc, result = result}), loc), sm)
adamc@181 311 end
adamc@178 312
adamc@283 313 | L.EError (e, t) =>
adamc@283 314 let
adamc@283 315 val (e, sm) = cifyExp (e, sm)
adamc@283 316 val (t, sm) = cifyTyp (t, sm)
adamc@283 317 in
adamc@283 318 ((L'.EError (e, t), loc), sm)
adamc@283 319 end
adamc@283 320
adamc@180 321 | L.EStrcat (e1, e2) =>
adamc@180 322 let
adamc@180 323 val (e1, sm) = cifyExp (e1, sm)
adamc@180 324 val (e2, sm) = cifyExp (e2, sm)
adamc@180 325 in
adamc@180 326 ((L'.EFfiApp ("Basis", "strcat", [e1, e2]), loc), sm)
adamc@180 327 end
adamc@102 328
adamc@102 329 | L.EWrite e =>
adamc@102 330 let
adamc@102 331 val (e, sm) = cifyExp (e, sm)
adamc@102 332 in
adamc@102 333 ((L'.EWrite e, loc), sm)
adamc@102 334 end
adamc@102 335
adamc@106 336 | L.ESeq (e1, e2) =>
adamc@106 337 let
adamc@106 338 val (e1, sm) = cifyExp (e1, sm)
adamc@106 339 val (e2, sm) = cifyExp (e2, sm)
adamc@106 340 in
adamc@106 341 ((L'.ESeq (e1, e2), loc), sm)
adamc@106 342 end
adamc@106 343
adamc@269 344 | L.ELet (x, t, e1, e2) =>
adamc@269 345 let
adamc@269 346 val (t, sm) = cifyTyp (t, sm)
adamc@269 347 val (e1, sm) = cifyExp (e1, sm)
adamc@269 348 val (e2, sm) = cifyExp (e2, sm)
adamc@269 349 in
adamc@269 350 ((L'.ELet (x, t, e1, e2), loc), sm)
adamc@269 351 end
adamc@251 352
adamc@111 353 | L.EClosure _ => (ErrorMsg.errorAt loc "Nested closure remains in code generation";
adamc@111 354 (dummye, sm))
adamc@111 355
adamc@269 356 | L.EQuery {exps, tables, state, query, body, initial} =>
adamc@269 357 let
adamc@269 358 val (exps', sm) = ListUtil.foldlMap (fn ((x, t), sm) =>
adamc@269 359 let
adamc@269 360 val (t, sm) = cifyTyp (t, sm)
adamc@269 361 in
adamc@269 362 ((x, t), sm)
adamc@269 363 end) sm exps
adamc@269 364 val (tables', sm) = ListUtil.foldlMap (fn ((x, xts), sm) =>
adamc@269 365 let
adamc@269 366 val (xts, sm) = ListUtil.foldlMap
adamc@269 367 (fn ((x, t), sm) =>
adamc@269 368 let
adamc@269 369 val (t, sm) = cifyTyp (t, sm)
adamc@269 370 in
adamc@269 371 ((x, t), sm)
adamc@269 372 end) sm xts
adamc@269 373 in
adamc@269 374 ((x, xts), sm)
adamc@269 375 end) sm tables
adamc@269 376
adamc@269 377 val row = exps @ map (fn (x, xts) => (x, (L.TRecord xts, loc))) tables
adamc@269 378 val row = ListMergeSort.sort (fn ((x, _), (y, _)) => String.compare (x, y) = GREATER) row
adamc@269 379
adamc@269 380 val (tableRows, sm) = ListUtil.foldlMap (fn (((x, xts), (_, xts')), sm) =>
adamc@269 381 let
adamc@269 382 val (sm, rnum) = Sm.find (sm, xts, xts')
adamc@269 383 in
adamc@269 384 ((x, rnum), sm)
adamc@269 385 end)
adamc@269 386 sm (ListPair.zip (tables, tables'))
adamc@269 387 val row' = exps' @ map (fn (x, n) => (x, (L'.TRecord n, loc))) tableRows
adamc@269 388 val row' = ListMergeSort.sort (fn ((x, _), (y, _)) => String.compare (x, y) = GREATER) row'
adamc@269 389
adamc@269 390 val (sm, rnum) = Sm.find (sm, row, row')
adamc@269 391
adamc@269 392 val (state, sm) = cifyTyp (state, sm)
adamc@269 393 val (query, sm) = cifyExp (query, sm)
adamc@269 394 val (body, sm) = cifyExp (body, sm)
adamc@269 395 val (initial, sm) = cifyExp (initial, sm)
adamc@269 396 in
adamc@269 397 ((L'.EQuery {exps = exps', tables = tables', rnum = rnum, state = state,
adamc@282 398 query = query, body = body, initial = initial, prepared = NONE}, loc), sm)
adamc@269 399 end
adamc@269 400
adamc@307 401 | L.EDml e =>
adamc@307 402 let
adamc@307 403 val (e, sm) = cifyExp (e, sm)
adamc@307 404 in
adamc@307 405 ((L'.EDml {dml = e, prepared = NONE}, loc), sm)
adamc@307 406 end
adamc@307 407
adamc@338 408 | L.ENextval e =>
adamc@338 409 let
adamc@338 410 val (e, sm) = cifyExp (e, sm)
adamc@338 411 in
adamc@338 412 ((L'.ENextval {seq = e, prepared = NONE}, loc), sm)
adamc@338 413 end
adamc@338 414
adamc@252 415
adamc@29 416 fun cifyDecl ((d, loc), sm) =
adamc@29 417 case d of
adamc@165 418 L.DDatatype (x, n, xncs) =>
adamc@165 419 let
adamc@198 420 val dk = ElabUtil.classifyDatatype xncs
adamc@165 421 val (xncs, sm) = ListUtil.foldlMap (fn ((x, n, to), sm) =>
adamc@165 422 case to of
adamc@165 423 NONE => ((x, n, NONE), sm)
adamc@165 424 | SOME t =>
adamc@165 425 let
adamc@165 426 val (t, sm) = cifyTyp (t, sm)
adamc@165 427 in
adamc@165 428 ((x, n, SOME t), sm)
adamc@165 429 end) sm xncs
adamc@165 430 in
adamc@188 431 (SOME (L'.DDatatype (dk, x, n, xncs), loc), NONE, sm)
adamc@165 432 end
adamc@164 433
adamc@164 434 | L.DVal (x, n, t, e, _) =>
adamc@29 435 let
adamc@29 436 val (t, sm) = cifyTyp (t, sm)
adamc@109 437
adamc@109 438 val (d, sm) = case #1 t of
adamc@121 439 L'.TFun _ =>
adamc@121 440 let
adamc@121 441 fun unravel (tAll as (t, _), eAll as (e, _)) =
adamc@121 442 case (t, e) of
adamc@121 443 (L'.TFun (dom, ran), L.EAbs (ax, _, _, e)) =>
adamc@121 444 let
adamc@121 445 val (args, t, e) = unravel (ran, e)
adamc@121 446 in
adamc@121 447 ((ax, dom) :: args, t, e)
adamc@121 448 end
adamc@121 449 | (L'.TFun _, _) =>
adamc@121 450 (ErrorMsg.errorAt loc "Function isn't explicit at code generation";
adamc@121 451 ([], tAll, eAll))
adamc@121 452 | _ => ([], tAll, eAll)
adamc@121 453
adamc@121 454 val (args, ran, e) = unravel (t, e)
adamc@121 455 val (e, sm) = cifyExp (e, sm)
adamc@121 456 in
adamc@121 457 (L'.DFun (x, n, args, ran, e), sm)
adamc@121 458 end
adamc@121 459
adamc@109 460 | _ =>
adamc@109 461 let
adamc@109 462 val (e, sm) = cifyExp (e, sm)
adamc@109 463 in
adamc@109 464 (L'.DVal (x, n, t, e), sm)
adamc@109 465 end
adamc@29 466 in
adamc@109 467 (SOME (d, loc), NONE, sm)
adamc@29 468 end
adamc@129 469 | L.DValRec vis =>
adamc@129 470 let
adamc@129 471 val (vis, sm) = ListUtil.foldlMap
adamc@129 472 (fn ((x, n, t, e, _), sm) =>
adamc@129 473 let
adamc@129 474 val (t, sm) = cifyTyp (t, sm)
adamc@129 475
adamc@129 476 fun unravel (tAll as (t, _), eAll as (e, _)) =
adamc@129 477 case (t, e) of
adamc@129 478 (L'.TFun (dom, ran), L.EAbs (ax, _, _, e)) =>
adamc@129 479 let
adamc@129 480 val (args, t, e) = unravel (ran, e)
adamc@129 481 in
adamc@129 482 ((ax, dom) :: args, t, e)
adamc@129 483 end
adamc@129 484 | (L'.TFun _, _) =>
adamc@129 485 (ErrorMsg.errorAt loc "Function isn't explicit at code generation";
adamc@129 486 ([], tAll, eAll))
adamc@129 487 | _ => ([], tAll, eAll)
adamc@129 488
adamc@129 489 val (args, ran, e) = unravel (t, e)
adamc@129 490 val (e, sm) = cifyExp (e, sm)
adamc@129 491 in
adamc@129 492 ((x, n, args, ran, e), sm)
adamc@129 493 end)
adamc@129 494 sm vis
adamc@129 495 in
adamc@129 496 (SOME (L'.DFunRec vis, loc), NONE, sm)
adamc@129 497 end
adamc@129 498
adamc@144 499 | L.DExport (ek, s, n, ts) =>
adamc@120 500 let
adamc@120 501 val (ts, sm) = ListUtil.foldlMap cifyTyp sm ts
adamc@120 502 in
adamc@144 503 (NONE, SOME (ek, "/" ^ s, n, ts), sm)
adamc@120 504 end
adamc@29 505
adamc@273 506 | L.DTable (s, xts) =>
adamc@273 507 let
adamc@273 508 val (xts, sm) = ListUtil.foldlMap (fn ((x, t), sm) =>
adamc@273 509 let
adamc@273 510 val (t, sm) = cifyTyp (t, sm)
adamc@273 511 in
adamc@273 512 ((x, t), sm)
adamc@273 513 end) sm xts
adamc@273 514 in
adamc@273 515 (SOME (L'.DTable (s, xts), loc), NONE, sm)
adamc@273 516 end
adamc@338 517 | L.DSequence s =>
adamc@338 518 (SOME (L'.DSequence s, loc), NONE, sm)
adamc@271 519 | L.DDatabase s => (SOME (L'.DDatabase s, loc), NONE, sm)
adamc@271 520
adamc@29 521 fun cjrize ds =
adamc@29 522 let
adamc@196 523 val (dsF, ds, ps, sm) = foldl (fn (d, (dsF, ds, ps, sm)) =>
adamc@196 524 let
adamc@196 525 val (dop, pop, sm) = cifyDecl (d, sm)
adamc@453 526
adamc@196 527 val (dsF, ds) = case dop of
adamc@196 528 NONE => (dsF, ds)
adamc@453 529 | SOME (d as (L'.DDatatype _, loc)) =>
adamc@453 530 (d :: dsF, ds)
adamc@196 531 | SOME d => (dsF, d :: ds)
adamc@453 532
adamc@453 533 val dsF = map (fn v => (L'.DStruct v, ErrorMsg.dummySpan)) (Sm.declares sm)
adamc@453 534 @ dsF
adamc@453 535
adamc@196 536 val ps = case pop of
adamc@196 537 NONE => ps
adamc@196 538 | SOME p => p :: ps
adamc@196 539 in
adamc@453 540 (dsF, ds, ps, Sm.clearDeclares sm)
adamc@196 541 end)
adamc@196 542 ([], [], [], Sm.empty) ds
adamc@29 543 in
adamc@453 544 (List.revAppend (dsF, rev ds),
adamc@101 545 ps)
adamc@29 546 end
adamc@29 547
adamc@29 548 end