Mercurial > urweb

annotate src/mono_reduce.sml @ 565:74800be65591

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Creation of sources in server code
author Adam Chlipala <adamc@hcoop.net>
date Fri, 19 Dec 2008 11:47:18 -0500
parents 463dad880470
children a152905c3c3b
rev   line source
adamc@133 1 (* Copyright (c) 2008, Adam Chlipala
adamc@133 2 * All rights reserved.
adamc@133 3 *
adamc@133 4 * Redistribution and use in source and binary forms, with or without
adamc@133 5 * modification, are permitted provided that the following conditions are met:
adamc@133 6 *
adamc@133 7 * - Redistributions of source code must retain the above copyright notice,
adamc@133 8 * this list of conditions and the following disclaimer.
adamc@133 9 * - Redistributions in binary form must reproduce the above copyright notice,
adamc@133 10 * this list of conditions and the following disclaimer in the documentation
adamc@133 11 * and/or other materials provided with the distribution.
adamc@133 12 * - The names of contributors may not be used to endorse or promote products
adamc@133 13 * derived from this software without specific prior written permission.
adamc@133 14 *
adamc@133 15 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
adamc@133 16 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
adamc@133 17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
adamc@133 18 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
adamc@133 19 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
adamc@133 20 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
adamc@133 21 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
adamc@133 22 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
adamc@133 23 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
adamc@133 24 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
adamc@133 25 * POSSIBILITY OF SUCH DAMAGE.
adamc@133 26 *)
adamc@133 27
adamc@133 28 (* Simplify a Mono program algebraically *)
adamc@133 29
adamc@133 30 structure MonoReduce :> MONO_REDUCE = struct
adamc@133 31
adamc@133 32 open Mono
adamc@133 33
adamc@133 34 structure E = MonoEnv
adamc@133 35 structure U = MonoUtil
adamc@133 36
adamc@470 37 structure IM = IntBinaryMap
adamc@470 38
adamc@133 39
adamc@252 40 fun impure (e, _) =
adamc@252 41 case e of
adamc@252 42 EWrite _ => true
adamc@252 43 | EQuery _ => true
adamc@307 44 | EDml _ => true
adamc@338 45 | ENextval _ => true
adamc@463 46 | EUnurlify _ => true
adamc@252 47 | EAbs _ => false
adamc@252 48
adamc@252 49 | EPrim _ => false
adamc@252 50 | ERel _ => false
adamc@252 51 | ENamed _ => false
adamc@252 52 | ECon (_, _, eo) => (case eo of NONE => false | SOME e => impure e)
adamc@297 53 | ENone _ => false
adamc@290 54 | ESome (_, e) => impure e
adamc@252 55 | EFfi _ => false
adamc@462 56 | EFfiApp ("Basis", "set_cookie", _) => true
adamc@565 57 | EFfiApp ("Basis", "new_client_source", _) => true
adamc@252 58 | EFfiApp _ => false
adamc@252 59 | EApp ((EFfi _, _), _) => false
adamc@252 60 | EApp _ => true
adamc@252 61
adamc@387 62 | EUnop (_, e) => impure e
adamc@387 63 | EBinop (_, e1, e2) => impure e1 orelse impure e2
adamc@387 64
adamc@252 65 | ERecord xes => List.exists (fn (_, e, _) => impure e) xes
adamc@252 66 | EField (e, _) => impure e
adamc@252 67
adamc@252 68 | ECase (e, pes, _) => impure e orelse List.exists (fn (_, e) => impure e) pes
adamc@252 69
adamc@283 70 | EError (e, _) => impure e
adamc@283 71
adamc@252 72 | EStrcat (e1, e2) => impure e1 orelse impure e2
adamc@252 73
adamc@252 74 | ESeq (e1, e2) => impure e1 orelse impure e2
adamc@252 75 | ELet (_, _, e1, e2) => impure e1 orelse impure e2
adamc@252 76
adamc@252 77 | EClosure (_, es) => List.exists impure es
adamc@252 78
adamc@252 79
adamc@252 80 val liftExpInExp = Monoize.liftExpInExp
adamc@252 81
adamc@252 82 val subExpInExp' =
adamc@133 83 U.Exp.mapB {typ = fn t => t,
adamc@133 84 exp = fn (xn, rep) => fn e =>
adamc@133 85 case e of
adamc@133 86 ERel xn' =>
adamc@133 87 (case Int.compare (xn', xn) of
adamc@133 88 EQUAL => #1 rep
adamc@133 89 | GREATER=> ERel (xn' - 1)
adamc@133 90 | LESS => e)
adamc@133 91 | _ => e,
adamc@133 92 bind = fn ((xn, rep), U.Exp.RelE _) => (xn+1, liftExpInExp 0 rep)
adamc@133 93 | (ctx, _) => ctx}
adamc@133 94
adamc@252 95 fun subExpInExp (n, e1) e2 =
adamc@252 96 let
adamc@252 97 val r = subExpInExp' (n, e1) e2
adamc@252 98 in
adamc@252 99 (*Print.prefaces "subExpInExp" [("e1", MonoPrint.p_exp MonoEnv.empty e1),
adamc@252 100 ("e2", MonoPrint.p_exp MonoEnv.empty e2),
adamc@252 101 ("r", MonoPrint.p_exp MonoEnv.empty r)];*)
adamc@252 102 r
adamc@252 103 end
adamc@133 104
adamc@133 105 fun typ c = c
adamc@133 106
adamc@316 107 val swapExpVars =
adamc@316 108 U.Exp.mapB {typ = fn t => t,
adamc@316 109 exp = fn lower => fn e =>
adamc@316 110 case e of
adamc@316 111 ERel xn =>
adamc@316 112 if xn = lower then
adamc@316 113 ERel (lower + 1)
adamc@316 114 else if xn = lower + 1 then
adamc@316 115 ERel lower
adamc@316 116 else
adamc@316 117 e
adamc@316 118 | _ => e,
adamc@316 119 bind = fn (lower, U.Exp.RelE _) => lower+1
adamc@316 120 | (lower, _) => lower}
adamc@316 121
adamc@341 122 val swapExpVarsPat =
adamc@341 123 U.Exp.mapB {typ = fn t => t,
adamc@341 124 exp = fn (lower, len) => fn e =>
adamc@341 125 case e of
adamc@341 126 ERel xn =>
adamc@341 127 if xn = lower then
adamc@341 128 ERel (lower + 1)
adamc@341 129 else if xn >= lower + 1 andalso xn < lower + 1 + len then
adamc@341 130 ERel (xn - 1)
adamc@341 131 else
adamc@341 132 e
adamc@341 133 | _ => e,
adamc@341 134 bind = fn ((lower, len), U.Exp.RelE _) => (lower+1, len)
adamc@341 135 | (st, _) => st}
adamc@341 136
adamc@258 137 datatype result = Yes of E.env | No | Maybe
adamc@258 138
adamc@183 139 fun match (env, p : pat, e : exp) =
adamc@183 140 case (#1 p, #1 e) of
adamc@258 141 (PWild, _) => Yes env
adamc@258 142 | (PVar (x, t), _) => Yes (E.pushERel env x t (SOME e))
adamc@183 143
adamc@280 144 | (PPrim (Prim.String s), EStrcat ((EPrim (Prim.String s'), _), _)) =>
adamc@280 145 if String.isPrefix s' s then
adamc@280 146 Maybe
adamc@280 147 else
adamc@280 148 No
adamc@280 149
adamc@183 150 | (PPrim p, EPrim p') =>
adamc@183 151 if Prim.equal (p, p') then
adamc@258 152 Yes env
adamc@183 153 else
adamc@258 154 No
adamc@183 155
adamc@188 156 | (PCon (_, PConVar n1, NONE), ECon (_, PConVar n2, NONE)) =>
adamc@183 157 if n1 = n2 then
adamc@258 158 Yes env
adamc@183 159 else
adamc@258 160 No
adamc@183 161
adamc@188 162 | (PCon (_, PConVar n1, SOME p), ECon (_, PConVar n2, SOME e)) =>
adamc@183 163 if n1 = n2 then
adamc@183 164 match (env, p, e)
adamc@183 165 else
adamc@258 166 No
adamc@183 167
adamc@188 168 | (PCon (_, PConFfi {mod = m1, con = con1, ...}, NONE), ECon (_, PConFfi {mod = m2, con = con2, ...}, NONE)) =>
adamc@185 169 if m1 = m2 andalso con1 = con2 then
adamc@258 170 Yes env
adamc@185 171 else
adamc@258 172 No
adamc@185 173
adamc@188 174 | (PCon (_, PConFfi {mod = m1, con = con1, ...}, SOME ep), ECon (_, PConFfi {mod = m2, con = con2, ...}, SOME e)) =>
adamc@185 175 if m1 = m2 andalso con1 = con2 then
adamc@185 176 match (env, p, e)
adamc@185 177 else
adamc@258 178 No
adamc@185 179
adamc@183 180 | (PRecord xps, ERecord xes) =>
adamc@183 181 let
adamc@183 182 fun consider (xps, env) =
adamc@183 183 case xps of
adamc@258 184 [] => Yes env
adamc@183 185 | (x, p, _) :: rest =>
adamc@183 186 case List.find (fn (x', _, _) => x' = x) xes of
adamc@258 187 NONE => No
adamc@183 188 | SOME (_, e, _) =>
adamc@183 189 case match (env, p, e) of
adamc@258 190 No => No
adamc@258 191 | Maybe => Maybe
adamc@258 192 | Yes env => consider (rest, env)
adamc@183 193 in
adamc@183 194 consider (xps, env)
adamc@183 195 end
adamc@183 196
adamc@258 197 | _ => Maybe
adamc@183 198
adamc@318 199 datatype event =
adamc@318 200 WritePage
adamc@318 201 | ReadDb
adamc@318 202 | WriteDb
adamc@481 203 | UseRel
adamc@318 204 | Unsure
adamc@318 205
adamc@318 206 fun p_event e =
adamc@318 207 let
adamc@318 208 open Print.PD
adamc@318 209 in
adamc@318 210 case e of
adamc@318 211 WritePage => string "WritePage"
adamc@318 212 | ReadDb => string "ReadDb"
adamc@318 213 | WriteDb => string "WriteDb"
adamc@481 214 | UseRel => string "UseRel"
adamc@318 215 | Unsure => string "Unsure"
adamc@318 216 end
adamc@318 217
adamc@470 218 val p_events = Print.p_list p_event
adamc@470 219
adamc@318 220 fun patBinds (p, _) =
adamc@318 221 case p of
adamc@318 222 PWild => 0
adamc@318 223 | PVar _ => 1
adamc@318 224 | PPrim _ => 0
adamc@318 225 | PCon (_, _, NONE) => 0
adamc@318 226 | PCon (_, _, SOME p) => patBinds p
adamc@318 227 | PRecord xpts => foldl (fn ((_, p, _), n) => n + patBinds p) 0 xpts
adamc@318 228 | PNone _ => 0
adamc@318 229 | PSome (_, p) => patBinds p
adamc@318 230
adamc@470 231 fun reduce file =
adamc@470 232 let
adamc@470 233 fun countAbs (e, _) =
adamc@470 234 case e of
adamc@470 235 EAbs (_, _, _, e) => 1 + countAbs e
adamc@470 236 | _ => 0
adamc@318 237
adamc@470 238 val absCounts =
adamc@470 239 foldl (fn ((d, _), absCounts) =>
adamc@470 240 case d of
adamc@470 241 DVal (_, n, _, e, _) =>
adamc@470 242 IM.insert (absCounts, n, countAbs e)
adamc@470 243 | DValRec vis =>
adamc@470 244 foldl (fn ((_, n, _, e, _), absCounts) =>
adamc@470 245 IM.insert (absCounts, n, countAbs e))
adamc@470 246 absCounts vis
adamc@470 247 | _ => absCounts)
adamc@470 248 IM.empty file
adamc@387 249
adamc@470 250 fun summarize d (e, _) =
adamc@398 251 case e of
adamc@470 252 EPrim _ => []
adamc@481 253 | ERel n => if n = d then [UseRel] else []
adamc@470 254 | ENamed _ => []
adamc@470 255 | ECon (_, _, NONE) => []
adamc@470 256 | ECon (_, _, SOME e) => summarize d e
adamc@470 257 | ENone _ => []
adamc@470 258 | ESome (_, e) => summarize d e
adamc@470 259 | EFfi _ => []
adamc@470 260 | EFfiApp ("Basis", "set_cookie", _) => [Unsure]
adamc@565 261 | EFfiApp ("Basis", "new_client_source", _) => [Unsure]
adamc@470 262 | EFfiApp (_, _, es) => List.concat (map (summarize d) es)
adamc@470 263 | EApp ((EFfi _, _), e) => summarize d e
adamc@470 264 | EApp _ =>
adamc@398 265 let
adamc@470 266 fun unravel (e, ls) =
adamc@470 267 case e of
adamc@470 268 ENamed n =>
adamc@470 269 let
adamc@470 270 val ls = rev ls
adamc@470 271 in
adamc@470 272 case IM.find (absCounts, n) of
adamc@470 273 NONE => [Unsure]
adamc@470 274 | SOME len =>
adamc@470 275 if length ls < len then
adamc@470 276 ls
adamc@470 277 else
adamc@470 278 [Unsure]
adamc@470 279 end
adamc@481 280 | ERel n => List.revAppend (ls,
adamc@481 281 if n = d then
adamc@481 282 [UseRel, Unsure]
adamc@481 283 else
adamc@481 284 [Unsure])
adamc@470 285 | EApp (f, x) =>
adamc@470 286 unravel (#1 f, summarize d x @ ls)
adamc@470 287 | _ => [Unsure]
adamc@398 288 in
adamc@470 289 unravel (e, [])
adamc@398 290 end
adamc@252 291
adamc@470 292 | EAbs _ => []
adamc@316 293
adamc@470 294 | EUnop (_, e) => summarize d e
adamc@470 295 | EBinop (_, e1, e2) => summarize d e1 @ summarize d e2
adamc@470 296
adamc@470 297 | ERecord xets => List.concat (map (summarize d o #2) xets)
adamc@470 298 | EField (e, _) => summarize d e
adamc@470 299
adamc@470 300 | ECase (e, pes, _) =>
adamc@398 301 let
adamc@470 302 val lss = map (fn (p, e) => summarize (d + patBinds p) e) pes
adamc@398 303 in
adamc@470 304 case lss of
adamc@470 305 [] => raise Fail "Empty pattern match"
adamc@470 306 | ls :: lss =>
adamc@470 307 if List.all (fn ls' => ls' = ls) lss then
adamc@470 308 summarize d e @ ls
adamc@470 309 else
adamc@470 310 [Unsure]
adamc@398 311 end
adamc@470 312 | EStrcat (e1, e2) => summarize d e1 @ summarize d e2
adamc@316 313
adamc@470 314 | EError (e, _) => summarize d e @ [Unsure]
adamc@318 315
adamc@470 316 | EWrite e => summarize d e @ [WritePage]
adamc@470 317
adamc@470 318 | ESeq (e1, e2) => summarize d e1 @ summarize d e2
adamc@470 319 | ELet (_, _, e1, e2) => summarize d e1 @ summarize (d + 1) e2
adamc@456 320
adamc@470 321 | EClosure (_, es) => List.concat (map (summarize d) es)
adamc@470 322
adamc@470 323 | EQuery {query, body, initial, ...} =>
adamc@470 324 List.concat [summarize d query,
adamc@470 325 summarize (d + 2) body,
adamc@470 326 summarize d initial,
adamc@470 327 [ReadDb]]
adamc@470 328
adamc@470 329 | EDml e => summarize d e @ [WriteDb]
adamc@470 330 | ENextval e => summarize d e @ [WriteDb]
adamc@470 331 | EUnurlify (e, _) => summarize d e
adamc@470 332
adamc@470 333
adamc@470 334 fun exp env e =
adamc@470 335 let
adamc@470 336 (*val () = Print.prefaces "exp" [("e", MonoPrint.p_exp env (e, ErrorMsg.dummySpan))]*)
adamc@470 337
adamc@470 338 val r =
adamc@470 339 case e of
adamc@470 340 ERel n =>
adamc@470 341 (case E.lookupERel env n of
adamc@470 342 (_, _, SOME e') => #1 e'
adamc@470 343 | _ => e)
adamc@470 344 | ENamed n =>
adamc@470 345 (case E.lookupENamed env n of
adamc@470 346 (_, _, SOME e', _) => ((*Print.prefaces "Switch" [("n", Print.PD.string (Int.toString n)),
adamc@470 347 ("e'", MonoPrint.p_exp env e')];*)
adamc@470 348 #1 e')
adamc@470 349 | _ => e)
adamc@470 350
adamc@470 351 | EApp ((EAbs (x, t, _, e1), loc), e2) =>
adamc@470 352 ((*Print.prefaces "Considering" [("e1", MonoPrint.p_exp (E.pushERel env x t NONE) e1),
adamc@470 353 ("e2", MonoPrint.p_exp env e2),
adamc@470 354 ("sub", MonoPrint.p_exp env (reduceExp env (subExpInExp (0, e2) e1)))];*)
adamc@470 355 if impure e2 then
adamc@470 356 #1 (reduceExp env (ELet (x, t, e2, e1), loc))
adamc@470 357 else
adamc@470 358 #1 (reduceExp env (subExpInExp (0, e2) e1)))
adamc@470 359
adamc@470 360 | ECase (e', pes, {disc, result}) =>
adamc@442 361 let
adamc@470 362 fun push () =
adamc@470 363 case result of
adamc@470 364 (TFun (dom, result), loc) =>
adamc@470 365 if List.all (fn (_, (EAbs _, _)) => true | _ => false) pes then
adamc@470 366 EAbs ("_", dom, result,
adamc@470 367 (ECase (liftExpInExp 0 e',
adamc@470 368 map (fn (p, (EAbs (_, _, _, e), _)) =>
adamc@470 369 (p, swapExpVarsPat (0, patBinds p) e)
adamc@470 370 | _ => raise Fail "MonoReduce ECase") pes,
adamc@470 371 {disc = disc, result = result}), loc))
adamc@470 372 else
adamc@470 373 e
adamc@470 374 | _ => e
adamc@318 375
adamc@470 376 fun search pes =
adamc@470 377 case pes of
adamc@470 378 [] => push ()
adamc@470 379 | (p, body) :: pes =>
adamc@470 380 case match (env, p, e') of
adamc@470 381 No => search pes
adamc@470 382 | Maybe => push ()
adamc@470 383 | Yes env => #1 (reduceExp env body)
adamc@470 384 in
adamc@470 385 search pes
adamc@470 386 end
adamc@318 387
adamc@470 388 | EField ((ERecord xes, _), x) =>
adamc@470 389 (case List.find (fn (x', _, _) => x' = x) xes of
adamc@470 390 SOME (_, e, _) => #1 e
adamc@470 391 | NONE => e)
adamc@398 392
adamc@470 393 | ELet (x1, t1, (ELet (x2, t2, e1, b1), loc), b2) =>
adamc@470 394 let
adamc@470 395 val e' = (ELet (x2, t2, e1,
adamc@470 396 (ELet (x1, t1, b1,
adamc@470 397 liftExpInExp 1 b2), loc)), loc)
adamc@442 398 in
adamc@470 399 (*Print.prefaces "ELet commute" [("e", MonoPrint.p_exp env (e, loc)),
adamc@470 400 ("e'", MonoPrint.p_exp env e')];*)
adamc@470 401 #1 (reduceExp env e')
adamc@470 402 end
adamc@470 403 | EApp ((ELet (x, t, e, b), loc), e') =>
adamc@470 404 #1 (reduceExp env (ELet (x, t, e,
adamc@470 405 (EApp (b, liftExpInExp 0 e'), loc)), loc))
adamc@470 406
adamc@470 407 | ELet (x, t, e', (EAbs (x', t' as (TRecord [], _), ran, e''), loc)) =>
adamc@470 408 (*if impure e' then
adamc@470 409 e
adamc@470 410 else*)
adamc@470 411 (* Seems unsound in general without the check... should revisit later *)
adamc@470 412 EAbs (x', t', ran, (ELet (x, t, liftExpInExp 0 e', swapExpVars 0 e''), loc))
adamc@470 413
adamc@470 414 | ELet (x, t, e', b) =>
adamc@470 415 let
adamc@470 416 fun doSub () =
adamc@470 417 #1 (reduceExp env (subExpInExp (0, e') b))
adamc@470 418
adamc@470 419 fun trySub () =
adamc@470 420 case t of
adamc@470 421 (TFfi ("Basis", "string"), _) => doSub ()
adamc@470 422 | _ =>
adamc@470 423 case e' of
adamc@470 424 (ECase _, _) => e
adamc@470 425 | _ => doSub ()
adamc@470 426 in
adamc@470 427 if impure e' then
adamc@470 428 let
adamc@470 429 val effs_e' = summarize 0 e'
adamc@489 430 val effs_e' = List.filter (fn x => x <> UseRel) effs_e'
adamc@470 431 val effs_b = summarize 0 b
adamc@470 432
adamc@470 433 (*val () = Print.prefaces "Try"
adamc@489 434 [("e", MonoPrint.p_exp env (e, ErrorMsg.dummySpan)),
adamc@489 435 ("e'", p_events effs_e'),
adamc@489 436 ("b", p_events effs_b)]*)
adamc@470 437
adamc@470 438 fun does eff = List.exists (fn eff' => eff' = eff) effs_e'
adamc@470 439 val writesPage = does WritePage
adamc@470 440 val readsDb = does ReadDb
adamc@470 441 val writesDb = does WriteDb
adamc@470 442
adamc@470 443 fun verifyUnused eff =
adamc@470 444 case eff of
adamc@481 445 UseRel => false
adamc@470 446 | _ => true
adamc@470 447
adamc@470 448 fun verifyCompatible effs =
adamc@470 449 case effs of
adamc@470 450 [] => false
adamc@470 451 | eff :: effs =>
adamc@470 452 case eff of
adamc@470 453 Unsure => false
adamc@481 454 | UseRel => List.all verifyUnused effs
adamc@470 455 | WritePage => not writesPage andalso verifyCompatible effs
adamc@470 456 | ReadDb => not writesDb andalso verifyCompatible effs
adamc@470 457 | WriteDb => not writesDb andalso not readsDb andalso verifyCompatible effs
adamc@470 458 in
adamc@470 459 (*Print.prefaces "verifyCompatible"
adamc@470 460 [("e'", MonoPrint.p_exp env e'),
adamc@470 461 ("b", MonoPrint.p_exp (E.pushERel env x t NONE) b),
adamc@470 462 ("effs_e'", Print.p_list p_event effs_e'),
adamc@470 463 ("effs_b", Print.p_list p_event effs_b)];*)
adamc@481 464 if List.null effs_e' orelse verifyCompatible effs_b then
adamc@470 465 trySub ()
adamc@470 466 else
adamc@470 467 e
adamc@470 468 end
adamc@470 469 else
adamc@442 470 trySub ()
adamc@442 471 end
adamc@252 472
adamc@470 473 | EStrcat ((EPrim (Prim.String s1), _), (EPrim (Prim.String s2), _)) =>
adamc@470 474 EPrim (Prim.String (s1 ^ s2))
adamc@268 475
adamc@470 476 | _ => e
adamc@470 477 in
adamc@470 478 (*Print.prefaces "exp'" [("r", MonoPrint.p_exp env (r, ErrorMsg.dummySpan))];*)
adamc@470 479 r
adamc@470 480 end
adamc@470 481
adamc@470 482 and bind (env, b) =
adamc@470 483 case b of
adamc@470 484 U.Decl.Datatype (x, n, xncs) => E.pushDatatype env x n xncs
adamc@470 485 | U.Decl.RelE (x, t) => E.pushERel env x t NONE
adamc@470 486 | U.Decl.NamedE (x, n, t, eo, s) => E.pushENamed env x n t (Option.map (reduceExp env) eo) s
adamc@470 487
adamc@470 488 and reduceExp env = U.Exp.mapB {typ = typ, exp = exp, bind = bind} env
adamc@470 489
adamc@470 490 fun decl env d = d
adamc@398 491 in
adamc@470 492 U.File.mapB {typ = typ, exp = exp, decl = decl, bind = bind} E.empty file
adamc@398 493 end
adamc@133 494
adamc@133 495 end