Mercurial > urweb

annotate src/cjrize.sml @ 288:4260ad920c36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Converting string to int
author Adam Chlipala <adamc@hcoop.net>
date Sun, 07 Sep 2008 11:33:13 -0400
parents c0e4ac23522d
children df00701f2323
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@29 42 end = struct
adamc@29 43
adamc@29 44 structure FM = BinaryMapFn(struct
adamc@29 45 type ord_key = L.typ
adamc@109 46 val compare = MonoUtil.Typ.compare
adamc@29 47 end)
adamc@29 48
adamc@29 49 type t = int * int FM.map * (int * (string * L'.typ) list) list
adamc@29 50
adamc@102 51 val empty : t = (1, FM.insert (FM.empty, (L.TRecord [], ErrorMsg.dummySpan), 0), [])
adamc@29 52
adamc@29 53 fun find ((n, m, ds), xts, xts') =
adamc@29 54 let
adamc@29 55 val t = (L.TRecord xts, ErrorMsg.dummySpan)
adamc@29 56 in
adamc@29 57 case FM.find (m, t) of
adamc@29 58 NONE => ((n+1, FM.insert (m, t, n), (n, xts') :: ds), n)
adamc@29 59 | SOME i => ((n, m, ds), i)
adamc@29 60 end
adamc@29 61
adamc@29 62 fun declares (_, _, ds) = ds
adamc@29 63
adamc@29 64 end
adamc@29 65
adamc@196 66 fun cifyTyp x =
adamc@196 67 let
adamc@196 68 fun cify dtmap ((t, loc), sm) =
adamc@196 69 case t of
adamc@196 70 L.TFun (t1, t2) =>
adamc@196 71 let
adamc@196 72 val (t1, sm) = cify dtmap (t1, sm)
adamc@196 73 val (t2, sm) = cify dtmap (t2, sm)
adamc@196 74 in
adamc@196 75 ((L'.TFun (t1, t2), loc), sm)
adamc@196 76 end
adamc@196 77 | L.TRecord xts =>
adamc@196 78 let
adamc@196 79 val old_xts = xts
adamc@196 80 val (xts, sm) = ListUtil.foldlMap (fn ((x, t), sm) =>
adamc@196 81 let
adamc@196 82 val (t, sm) = cify dtmap (t, sm)
adamc@196 83 in
adamc@196 84 ((x, t), sm)
adamc@196 85 end)
adamc@196 86 sm xts
adamc@196 87 val (sm, si) = Sm.find (sm, old_xts, xts)
adamc@196 88 in
adamc@196 89 ((L'.TRecord si, loc), sm)
adamc@196 90 end
adamc@196 91 | L.TDatatype (n, ref (dk, xncs)) =>
adamc@196 92 (case IM.find (dtmap, n) of
adamc@196 93 SOME r => ((L'.TDatatype (dk, n, r), loc), sm)
adamc@196 94 | NONE =>
adamc@196 95 let
adamc@196 96 val r = ref []
adamc@196 97 val dtmap = IM.insert (dtmap, n, r)
adamc@196 98
adamc@196 99 val (xncs, sm) = ListUtil.foldlMap (fn ((x, n, to), sm) =>
adamc@196 100 case to of
adamc@196 101 NONE => ((x, n, NONE), sm)
adamc@196 102 | SOME t =>
adamc@196 103 let
adamc@196 104 val (t, sm) = cify dtmap (t, sm)
adamc@196 105 in
adamc@196 106 ((x, n, SOME t), sm)
adamc@196 107 end)
adamc@196 108 sm xncs
adamc@196 109 in
adamc@196 110 r := xncs;
adamc@196 111 ((L'.TDatatype (dk, n, r), loc), sm)
adamc@196 112 end)
adamc@196 113 | L.TFfi mx => ((L'.TFfi mx, loc), sm)
adamc@288 114 | L.TOption t =>
adamc@288 115 let
adamc@288 116 val (t, sm) = cify dtmap (t, sm)
adamc@288 117 in
adamc@288 118 ((L'.TOption t, loc), sm)
adamc@288 119 end
adamc@196 120 in
adamc@196 121 cify IM.empty x
adamc@196 122 end
adamc@29 123
adamc@109 124 val dummye = (L'.EPrim (Prim.Int 0), ErrorMsg.dummySpan)
adamc@109 125
adamc@186 126 fun cifyPatCon (pc, sm) =
adamc@181 127 case pc of
adamc@186 128 L.PConVar n => (L'.PConVar n, sm)
adamc@186 129 | L.PConFfi {mod = m, datatyp, con, arg} =>
adamc@186 130 let
adamc@186 131 val (arg, sm) =
adamc@186 132 case arg of
adamc@186 133 NONE => (NONE, sm)
adamc@186 134 | SOME t =>
adamc@186 135 let
adamc@186 136 val (t, sm) = cifyTyp (t, sm)
adamc@186 137 in
adamc@186 138 (SOME t, sm)
adamc@186 139 end
adamc@186 140 in
adamc@186 141 (L'.PConFfi {mod = m, datatyp = datatyp, con = con, arg = arg}, sm)
adamc@186 142 end
adamc@181 143
adamc@182 144 fun cifyPat ((p, loc), sm) =
adamc@181 145 case p of
adamc@182 146 L.PWild => ((L'.PWild, loc), sm)
adamc@182 147 | L.PVar (x, t) =>
adamc@182 148 let
adamc@182 149 val (t, sm) = cifyTyp (t, sm)
adamc@182 150 in
adamc@182 151 ((L'.PVar (x, t), loc), sm)
adamc@182 152 end
adamc@182 153 | L.PPrim p => ((L'.PPrim p, loc), sm)
adamc@188 154 | L.PCon (dk, pc, NONE) =>
adamc@186 155 let
adamc@186 156 val (pc, sm) = cifyPatCon (pc, sm)
adamc@186 157 in
adamc@188 158 ((L'.PCon (dk, pc, NONE), loc), sm)
adamc@186 159 end
adamc@188 160 | L.PCon (dk, pc, SOME p) =>
adamc@182 161 let
adamc@186 162 val (pc, sm) = cifyPatCon (pc, sm)
adamc@182 163 val (p, sm) = cifyPat (p, sm)
adamc@182 164 in
adamc@188 165 ((L'.PCon (dk, pc, SOME p), loc), sm)
adamc@182 166 end
adamc@182 167 | L.PRecord xps =>
adamc@182 168 let
adamc@182 169 val (xps, sm) = ListUtil.foldlMap (fn ((x, p, t), sm) =>
adamc@182 170 let
adamc@182 171 val (p, sm) = cifyPat (p, sm)
adamc@182 172 val (t, sm) = cifyTyp (t, sm)
adamc@182 173 in
adamc@182 174 ((x, p, t), sm)
adamc@182 175 end) sm xps
adamc@182 176 in
adamc@182 177 ((L'.PRecord xps, loc), sm)
adamc@182 178 end
adamc@288 179 | L.PNone t =>
adamc@288 180 let
adamc@288 181 val (t, sm) = cifyTyp (t, sm)
adamc@288 182 in
adamc@288 183 ((L'.PNone t, loc), sm)
adamc@288 184 end
adamc@288 185 | L.PSome (t, p) =>
adamc@288 186 let
adamc@288 187 val (t, sm) = cifyTyp (t, sm)
adamc@288 188 val (p, sm) = cifyPat (p, sm)
adamc@288 189 in
adamc@288 190 ((L'.PSome (t, p), loc), sm)
adamc@288 191 end
adamc@288 192
adamc@181 193
adamc@280 194 fun cifyExp (eAll as (e, loc), sm) =
adamc@29 195 case e of
adamc@29 196 L.EPrim p => ((L'.EPrim p, loc), sm)
adamc@29 197 | L.ERel n => ((L'.ERel n, loc), sm)
adamc@29 198 | L.ENamed n => ((L'.ENamed n, loc), sm)
adamc@188 199 | L.ECon (dk, pc, eo) =>
adamc@181 200 let
adamc@181 201 val (eo, sm) =
adamc@181 202 case eo of
adamc@181 203 NONE => (NONE, sm)
adamc@181 204 | SOME e =>
adamc@181 205 let
adamc@181 206 val (e, sm) = cifyExp (e, sm)
adamc@181 207 in
adamc@181 208 (SOME e, sm)
adamc@181 209 end
adamc@186 210 val (pc, sm) = cifyPatCon (pc, sm)
adamc@181 211 in
adamc@188 212 ((L'.ECon (dk, pc, eo), loc), sm)
adamc@181 213 end
adamc@53 214 | L.EFfi mx => ((L'.EFfi mx, loc), sm)
adamc@53 215 | L.EFfiApp (m, x, es) =>
adamc@53 216 let
adamc@53 217 val (es, sm) = ListUtil.foldlMap cifyExp sm es
adamc@53 218 in
adamc@53 219 ((L'.EFfiApp (m, x, es), loc), sm)
adamc@53 220 end
adamc@29 221 | L.EApp (e1, e2) =>
adamc@29 222 let
adamc@29 223 val (e1, sm) = cifyExp (e1, sm)
adamc@29 224 val (e2, sm) = cifyExp (e2, sm)
adamc@29 225 in
adamc@29 226 ((L'.EApp (e1, e2), loc), sm)
adamc@29 227 end
adamc@109 228 | L.EAbs _ => (ErrorMsg.errorAt loc "Anonymous function remains at code generation";
adamc@280 229 Print.prefaces' [("Function", MonoPrint.p_exp MonoEnv.empty eAll)];
adamc@109 230 (dummye, sm))
adamc@29 231
adamc@29 232 | L.ERecord xes =>
adamc@29 233 let
adamc@29 234 val old_xts = map (fn (x, _, t) => (x, t)) xes
adamc@29 235
adamc@29 236 val (xets, sm) = ListUtil.foldlMap (fn ((x, e, t), sm) =>
adamc@29 237 let
adamc@29 238 val (e, sm) = cifyExp (e, sm)
adamc@29 239 val (t, sm) = cifyTyp (t, sm)
adamc@29 240 in
adamc@29 241 ((x, e, t), sm)
adamc@29 242 end)
adamc@29 243 sm xes
adamc@29 244
adamc@29 245 val (sm, si) = Sm.find (sm, old_xts, map (fn (x, _, t) => (x, t)) xets)
adamc@29 246
adamc@29 247 val xes = map (fn (x, e, _) => (x, e)) xets
adamc@29 248 val xes = ListMergeSort.sort (fn ((x1, _), (x2, _)) => String.compare (x1, x2) = GREATER) xes
adamc@29 249 in
adamc@29 250 ((L'.ERecord (si, xes), loc), sm)
adamc@29 251 end
adamc@29 252 | L.EField (e, x) =>
adamc@29 253 let
adamc@29 254 val (e, sm) = cifyExp (e, sm)
adamc@29 255 in
adamc@29 256 ((L'.EField (e, x), loc), sm)
adamc@29 257 end
adamc@29 258
adamc@182 259 | L.ECase (e, pes, {disc, result}) =>
adamc@181 260 let
adamc@181 261 val (e, sm) = cifyExp (e, sm)
adamc@181 262 val (pes, sm) = ListUtil.foldlMap
adamc@181 263 (fn ((p, e), sm) =>
adamc@181 264 let
adamc@181 265 val (e, sm) = cifyExp (e, sm)
adamc@182 266 val (p, sm) = cifyPat (p, sm)
adamc@181 267 in
adamc@182 268 ((p, e), sm)
adamc@181 269 end) sm pes
adamc@182 270 val (disc, sm) = cifyTyp (disc, sm)
adamc@182 271 val (result, sm) = cifyTyp (result, sm)
adamc@181 272 in
adamc@182 273 ((L'.ECase (e, pes, {disc = disc, result = result}), loc), sm)
adamc@181 274 end
adamc@178 275
adamc@283 276 | L.EError (e, t) =>
adamc@283 277 let
adamc@283 278 val (e, sm) = cifyExp (e, sm)
adamc@283 279 val (t, sm) = cifyTyp (t, sm)
adamc@283 280 in
adamc@283 281 ((L'.EError (e, t), loc), sm)
adamc@283 282 end
adamc@283 283
adamc@180 284 | L.EStrcat (e1, e2) =>
adamc@180 285 let
adamc@180 286 val (e1, sm) = cifyExp (e1, sm)
adamc@180 287 val (e2, sm) = cifyExp (e2, sm)
adamc@180 288 in
adamc@180 289 ((L'.EFfiApp ("Basis", "strcat", [e1, e2]), loc), sm)
adamc@180 290 end
adamc@102 291
adamc@102 292 | L.EWrite e =>
adamc@102 293 let
adamc@102 294 val (e, sm) = cifyExp (e, sm)
adamc@102 295 in
adamc@102 296 ((L'.EWrite e, loc), sm)
adamc@102 297 end
adamc@102 298
adamc@106 299 | L.ESeq (e1, e2) =>
adamc@106 300 let
adamc@106 301 val (e1, sm) = cifyExp (e1, sm)
adamc@106 302 val (e2, sm) = cifyExp (e2, sm)
adamc@106 303 in
adamc@106 304 ((L'.ESeq (e1, e2), loc), sm)
adamc@106 305 end
adamc@106 306
adamc@269 307 | L.ELet (x, t, e1, e2) =>
adamc@269 308 let
adamc@269 309 val (t, sm) = cifyTyp (t, sm)
adamc@269 310 val (e1, sm) = cifyExp (e1, sm)
adamc@269 311 val (e2, sm) = cifyExp (e2, sm)
adamc@269 312 in
adamc@269 313 ((L'.ELet (x, t, e1, e2), loc), sm)
adamc@269 314 end
adamc@251 315
adamc@111 316 | L.EClosure _ => (ErrorMsg.errorAt loc "Nested closure remains in code generation";
adamc@111 317 (dummye, sm))
adamc@111 318
adamc@269 319 | L.EQuery {exps, tables, state, query, body, initial} =>
adamc@269 320 let
adamc@269 321 val (exps', sm) = ListUtil.foldlMap (fn ((x, t), sm) =>
adamc@269 322 let
adamc@269 323 val (t, sm) = cifyTyp (t, sm)
adamc@269 324 in
adamc@269 325 ((x, t), sm)
adamc@269 326 end) sm exps
adamc@269 327 val (tables', sm) = ListUtil.foldlMap (fn ((x, xts), sm) =>
adamc@269 328 let
adamc@269 329 val (xts, sm) = ListUtil.foldlMap
adamc@269 330 (fn ((x, t), sm) =>
adamc@269 331 let
adamc@269 332 val (t, sm) = cifyTyp (t, sm)
adamc@269 333 in
adamc@269 334 ((x, t), sm)
adamc@269 335 end) sm xts
adamc@269 336 in
adamc@269 337 ((x, xts), sm)
adamc@269 338 end) sm tables
adamc@269 339
adamc@269 340 val row = exps @ map (fn (x, xts) => (x, (L.TRecord xts, loc))) tables
adamc@269 341 val row = ListMergeSort.sort (fn ((x, _), (y, _)) => String.compare (x, y) = GREATER) row
adamc@269 342
adamc@269 343 val (tableRows, sm) = ListUtil.foldlMap (fn (((x, xts), (_, xts')), sm) =>
adamc@269 344 let
adamc@269 345 val (sm, rnum) = Sm.find (sm, xts, xts')
adamc@269 346 in
adamc@269 347 ((x, rnum), sm)
adamc@269 348 end)
adamc@269 349 sm (ListPair.zip (tables, tables'))
adamc@269 350 val row' = exps' @ map (fn (x, n) => (x, (L'.TRecord n, loc))) tableRows
adamc@269 351 val row' = ListMergeSort.sort (fn ((x, _), (y, _)) => String.compare (x, y) = GREATER) row'
adamc@269 352
adamc@269 353 val (sm, rnum) = Sm.find (sm, row, row')
adamc@269 354
adamc@269 355 val (state, sm) = cifyTyp (state, sm)
adamc@269 356 val (query, sm) = cifyExp (query, sm)
adamc@269 357 val (body, sm) = cifyExp (body, sm)
adamc@269 358 val (initial, sm) = cifyExp (initial, sm)
adamc@269 359 in
adamc@269 360 ((L'.EQuery {exps = exps', tables = tables', rnum = rnum, state = state,
adamc@282 361 query = query, body = body, initial = initial, prepared = NONE}, loc), sm)
adamc@269 362 end
adamc@269 363
adamc@252 364
adamc@29 365 fun cifyDecl ((d, loc), sm) =
adamc@29 366 case d of
adamc@165 367 L.DDatatype (x, n, xncs) =>
adamc@165 368 let
adamc@198 369 val dk = ElabUtil.classifyDatatype xncs
adamc@165 370 val (xncs, sm) = ListUtil.foldlMap (fn ((x, n, to), sm) =>
adamc@165 371 case to of
adamc@165 372 NONE => ((x, n, NONE), sm)
adamc@165 373 | SOME t =>
adamc@165 374 let
adamc@165 375 val (t, sm) = cifyTyp (t, sm)
adamc@165 376 in
adamc@165 377 ((x, n, SOME t), sm)
adamc@165 378 end) sm xncs
adamc@165 379 in
adamc@188 380 (SOME (L'.DDatatype (dk, x, n, xncs), loc), NONE, sm)
adamc@165 381 end
adamc@164 382
adamc@164 383 | L.DVal (x, n, t, e, _) =>
adamc@29 384 let
adamc@29 385 val (t, sm) = cifyTyp (t, sm)
adamc@109 386
adamc@109 387 val (d, sm) = case #1 t of
adamc@121 388 L'.TFun _ =>
adamc@121 389 let
adamc@121 390 fun unravel (tAll as (t, _), eAll as (e, _)) =
adamc@121 391 case (t, e) of
adamc@121 392 (L'.TFun (dom, ran), L.EAbs (ax, _, _, e)) =>
adamc@121 393 let
adamc@121 394 val (args, t, e) = unravel (ran, e)
adamc@121 395 in
adamc@121 396 ((ax, dom) :: args, t, e)
adamc@121 397 end
adamc@121 398 | (L'.TFun _, _) =>
adamc@121 399 (ErrorMsg.errorAt loc "Function isn't explicit at code generation";
adamc@121 400 ([], tAll, eAll))
adamc@121 401 | _ => ([], tAll, eAll)
adamc@121 402
adamc@121 403 val (args, ran, e) = unravel (t, e)
adamc@121 404 val (e, sm) = cifyExp (e, sm)
adamc@121 405 in
adamc@121 406 (L'.DFun (x, n, args, ran, e), sm)
adamc@121 407 end
adamc@121 408
adamc@109 409 | _ =>
adamc@109 410 let
adamc@109 411 val (e, sm) = cifyExp (e, sm)
adamc@109 412 in
adamc@109 413 (L'.DVal (x, n, t, e), sm)
adamc@109 414 end
adamc@29 415 in
adamc@109 416 (SOME (d, loc), NONE, sm)
adamc@29 417 end
adamc@129 418 | L.DValRec vis =>
adamc@129 419 let
adamc@129 420 val (vis, sm) = ListUtil.foldlMap
adamc@129 421 (fn ((x, n, t, e, _), sm) =>
adamc@129 422 let
adamc@129 423 val (t, sm) = cifyTyp (t, sm)
adamc@129 424
adamc@129 425 fun unravel (tAll as (t, _), eAll as (e, _)) =
adamc@129 426 case (t, e) of
adamc@129 427 (L'.TFun (dom, ran), L.EAbs (ax, _, _, e)) =>
adamc@129 428 let
adamc@129 429 val (args, t, e) = unravel (ran, e)
adamc@129 430 in
adamc@129 431 ((ax, dom) :: args, t, e)
adamc@129 432 end
adamc@129 433 | (L'.TFun _, _) =>
adamc@129 434 (ErrorMsg.errorAt loc "Function isn't explicit at code generation";
adamc@129 435 ([], tAll, eAll))
adamc@129 436 | _ => ([], tAll, eAll)
adamc@129 437
adamc@129 438 val (args, ran, e) = unravel (t, e)
adamc@129 439 val (e, sm) = cifyExp (e, sm)
adamc@129 440 in
adamc@129 441 ((x, n, args, ran, e), sm)
adamc@129 442 end)
adamc@129 443 sm vis
adamc@129 444 in
adamc@129 445 (SOME (L'.DFunRec vis, loc), NONE, sm)
adamc@129 446 end
adamc@129 447
adamc@144 448 | L.DExport (ek, s, n, ts) =>
adamc@120 449 let
adamc@120 450 val (ts, sm) = ListUtil.foldlMap cifyTyp sm ts
adamc@120 451 in
adamc@144 452 (NONE, SOME (ek, "/" ^ s, n, ts), sm)
adamc@120 453 end
adamc@29 454
adamc@273 455 | L.DTable (s, xts) =>
adamc@273 456 let
adamc@273 457 val (xts, sm) = ListUtil.foldlMap (fn ((x, t), sm) =>
adamc@273 458 let
adamc@273 459 val (t, sm) = cifyTyp (t, sm)
adamc@273 460 in
adamc@273 461 ((x, t), sm)
adamc@273 462 end) sm xts
adamc@273 463 in
adamc@273 464 (SOME (L'.DTable (s, xts), loc), NONE, sm)
adamc@273 465 end
adamc@271 466 | L.DDatabase s => (SOME (L'.DDatabase s, loc), NONE, sm)
adamc@271 467
adamc@29 468 fun cjrize ds =
adamc@29 469 let
adamc@196 470 val (dsF, ds, ps, sm) = foldl (fn (d, (dsF, ds, ps, sm)) =>
adamc@196 471 let
adamc@196 472 val (dop, pop, sm) = cifyDecl (d, sm)
adamc@196 473 val (dsF, ds) = case dop of
adamc@196 474 NONE => (dsF, ds)
adamc@196 475 | SOME (d as (L'.DDatatype (dk, x, n, _), loc)) =>
adamc@196 476 ((L'.DDatatypeForward (dk, x, n), loc) :: dsF,
adamc@196 477 d :: ds)
adamc@196 478 | SOME d => (dsF, d :: ds)
adamc@196 479 val ps = case pop of
adamc@196 480 NONE => ps
adamc@196 481 | SOME p => p :: ps
adamc@196 482 in
adamc@196 483 (dsF, ds, ps, sm)
adamc@196 484 end)
adamc@196 485 ([], [], [], Sm.empty) ds
adamc@29 486 in
adamc@196 487 (List.revAppend (dsF,
adamc@196 488 List.revAppend (map (fn v => (L'.DStruct v, ErrorMsg.dummySpan)) (Sm.declares sm),
adamc@196 489 rev ds)),
adamc@101 490 ps)
adamc@29 491 end
adamc@29 492
adamc@29 493 end