annotate src/mono_reduce.sml @ 568:55fc747a67dc

Initial <dyn> support
author Adam Chlipala <adamc@hcoop.net>
date Sat, 20 Dec 2008 15:46:48 -0500
parents a152905c3c3b
children 57018f21cd5c
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@568 78 | EJavaScript (_, e) => impure e
adamc@568 79 | ESignalReturn e => impure e
adamc@252 80
adamc@252 81
adamc@252 82 val liftExpInExp = Monoize.liftExpInExp
adamc@252 83
adamc@252 84 val subExpInExp' =
adamc@133 85 U.Exp.mapB {typ = fn t => t,
adamc@133 86 exp = fn (xn, rep) => fn e =>
adamc@133 87 case e of
adamc@133 88 ERel xn' =>
adamc@133 89 (case Int.compare (xn', xn) of
adamc@133 90 EQUAL => #1 rep
adamc@133 91 | GREATER=> ERel (xn' - 1)
adamc@133 92 | LESS => e)
adamc@133 93 | _ => e,
adamc@133 94 bind = fn ((xn, rep), U.Exp.RelE _) => (xn+1, liftExpInExp 0 rep)
adamc@133 95 | (ctx, _) => ctx}
adamc@133 96
adamc@252 97 fun subExpInExp (n, e1) e2 =
adamc@252 98 let
adamc@252 99 val r = subExpInExp' (n, e1) e2
adamc@252 100 in
adamc@252 101 (*Print.prefaces "subExpInExp" [("e1", MonoPrint.p_exp MonoEnv.empty e1),
adamc@252 102 ("e2", MonoPrint.p_exp MonoEnv.empty e2),
adamc@252 103 ("r", MonoPrint.p_exp MonoEnv.empty r)];*)
adamc@252 104 r
adamc@252 105 end
adamc@133 106
adamc@133 107 fun typ c = c
adamc@133 108
adamc@316 109 val swapExpVars =
adamc@316 110 U.Exp.mapB {typ = fn t => t,
adamc@316 111 exp = fn lower => fn e =>
adamc@316 112 case e of
adamc@316 113 ERel xn =>
adamc@316 114 if xn = lower then
adamc@316 115 ERel (lower + 1)
adamc@316 116 else if xn = lower + 1 then
adamc@316 117 ERel lower
adamc@316 118 else
adamc@316 119 e
adamc@316 120 | _ => e,
adamc@316 121 bind = fn (lower, U.Exp.RelE _) => lower+1
adamc@316 122 | (lower, _) => lower}
adamc@316 123
adamc@341 124 val swapExpVarsPat =
adamc@341 125 U.Exp.mapB {typ = fn t => t,
adamc@341 126 exp = fn (lower, len) => fn e =>
adamc@341 127 case e of
adamc@341 128 ERel xn =>
adamc@341 129 if xn = lower then
adamc@341 130 ERel (lower + 1)
adamc@341 131 else if xn >= lower + 1 andalso xn < lower + 1 + len then
adamc@341 132 ERel (xn - 1)
adamc@341 133 else
adamc@341 134 e
adamc@341 135 | _ => e,
adamc@341 136 bind = fn ((lower, len), U.Exp.RelE _) => (lower+1, len)
adamc@341 137 | (st, _) => st}
adamc@341 138
adamc@258 139 datatype result = Yes of E.env | No | Maybe
adamc@258 140
adamc@183 141 fun match (env, p : pat, e : exp) =
adamc@183 142 case (#1 p, #1 e) of
adamc@258 143 (PWild, _) => Yes env
adamc@258 144 | (PVar (x, t), _) => Yes (E.pushERel env x t (SOME e))
adamc@183 145
adamc@280 146 | (PPrim (Prim.String s), EStrcat ((EPrim (Prim.String s'), _), _)) =>
adamc@280 147 if String.isPrefix s' s then
adamc@280 148 Maybe
adamc@280 149 else
adamc@280 150 No
adamc@280 151
adamc@183 152 | (PPrim p, EPrim p') =>
adamc@183 153 if Prim.equal (p, p') then
adamc@258 154 Yes env
adamc@183 155 else
adamc@258 156 No
adamc@183 157
adamc@188 158 | (PCon (_, PConVar n1, NONE), ECon (_, PConVar n2, NONE)) =>
adamc@183 159 if n1 = n2 then
adamc@258 160 Yes env
adamc@183 161 else
adamc@258 162 No
adamc@183 163
adamc@188 164 | (PCon (_, PConVar n1, SOME p), ECon (_, PConVar n2, SOME e)) =>
adamc@183 165 if n1 = n2 then
adamc@183 166 match (env, p, e)
adamc@183 167 else
adamc@258 168 No
adamc@183 169
adamc@188 170 | (PCon (_, PConFfi {mod = m1, con = con1, ...}, NONE), ECon (_, PConFfi {mod = m2, con = con2, ...}, NONE)) =>
adamc@185 171 if m1 = m2 andalso con1 = con2 then
adamc@258 172 Yes env
adamc@185 173 else
adamc@258 174 No
adamc@185 175
adamc@188 176 | (PCon (_, PConFfi {mod = m1, con = con1, ...}, SOME ep), ECon (_, PConFfi {mod = m2, con = con2, ...}, SOME e)) =>
adamc@185 177 if m1 = m2 andalso con1 = con2 then
adamc@185 178 match (env, p, e)
adamc@185 179 else
adamc@258 180 No
adamc@185 181
adamc@183 182 | (PRecord xps, ERecord xes) =>
adamc@183 183 let
adamc@183 184 fun consider (xps, env) =
adamc@183 185 case xps of
adamc@258 186 [] => Yes env
adamc@183 187 | (x, p, _) :: rest =>
adamc@183 188 case List.find (fn (x', _, _) => x' = x) xes of
adamc@258 189 NONE => No
adamc@183 190 | SOME (_, e, _) =>
adamc@183 191 case match (env, p, e) of
adamc@258 192 No => No
adamc@258 193 | Maybe => Maybe
adamc@258 194 | Yes env => consider (rest, env)
adamc@183 195 in
adamc@183 196 consider (xps, env)
adamc@183 197 end
adamc@183 198
adamc@258 199 | _ => Maybe
adamc@183 200
adamc@318 201 datatype event =
adamc@318 202 WritePage
adamc@318 203 | ReadDb
adamc@318 204 | WriteDb
adamc@481 205 | UseRel
adamc@318 206 | Unsure
adamc@318 207
adamc@318 208 fun p_event e =
adamc@318 209 let
adamc@318 210 open Print.PD
adamc@318 211 in
adamc@318 212 case e of
adamc@318 213 WritePage => string "WritePage"
adamc@318 214 | ReadDb => string "ReadDb"
adamc@318 215 | WriteDb => string "WriteDb"
adamc@481 216 | UseRel => string "UseRel"
adamc@318 217 | Unsure => string "Unsure"
adamc@318 218 end
adamc@318 219
adamc@470 220 val p_events = Print.p_list p_event
adamc@470 221
adamc@318 222 fun patBinds (p, _) =
adamc@318 223 case p of
adamc@318 224 PWild => 0
adamc@318 225 | PVar _ => 1
adamc@318 226 | PPrim _ => 0
adamc@318 227 | PCon (_, _, NONE) => 0
adamc@318 228 | PCon (_, _, SOME p) => patBinds p
adamc@318 229 | PRecord xpts => foldl (fn ((_, p, _), n) => n + patBinds p) 0 xpts
adamc@318 230 | PNone _ => 0
adamc@318 231 | PSome (_, p) => patBinds p
adamc@318 232
adamc@470 233 fun reduce file =
adamc@470 234 let
adamc@470 235 fun countAbs (e, _) =
adamc@470 236 case e of
adamc@470 237 EAbs (_, _, _, e) => 1 + countAbs e
adamc@470 238 | _ => 0
adamc@318 239
adamc@470 240 val absCounts =
adamc@470 241 foldl (fn ((d, _), absCounts) =>
adamc@470 242 case d of
adamc@470 243 DVal (_, n, _, e, _) =>
adamc@470 244 IM.insert (absCounts, n, countAbs e)
adamc@470 245 | DValRec vis =>
adamc@470 246 foldl (fn ((_, n, _, e, _), absCounts) =>
adamc@470 247 IM.insert (absCounts, n, countAbs e))
adamc@470 248 absCounts vis
adamc@470 249 | _ => absCounts)
adamc@470 250 IM.empty file
adamc@387 251
adamc@470 252 fun summarize d (e, _) =
adamc@398 253 case e of
adamc@470 254 EPrim _ => []
adamc@481 255 | ERel n => if n = d then [UseRel] else []
adamc@470 256 | ENamed _ => []
adamc@470 257 | ECon (_, _, NONE) => []
adamc@470 258 | ECon (_, _, SOME e) => summarize d e
adamc@470 259 | ENone _ => []
adamc@470 260 | ESome (_, e) => summarize d e
adamc@470 261 | EFfi _ => []
adamc@470 262 | EFfiApp ("Basis", "set_cookie", _) => [Unsure]
adamc@565 263 | EFfiApp ("Basis", "new_client_source", _) => [Unsure]
adamc@470 264 | EFfiApp (_, _, es) => List.concat (map (summarize d) es)
adamc@470 265 | EApp ((EFfi _, _), e) => summarize d e
adamc@470 266 | EApp _ =>
adamc@398 267 let
adamc@470 268 fun unravel (e, ls) =
adamc@470 269 case e of
adamc@470 270 ENamed n =>
adamc@470 271 let
adamc@470 272 val ls = rev ls
adamc@470 273 in
adamc@470 274 case IM.find (absCounts, n) of
adamc@470 275 NONE => [Unsure]
adamc@470 276 | SOME len =>
adamc@470 277 if length ls < len then
adamc@470 278 ls
adamc@470 279 else
adamc@470 280 [Unsure]
adamc@470 281 end
adamc@481 282 | ERel n => List.revAppend (ls,
adamc@481 283 if n = d then
adamc@481 284 [UseRel, Unsure]
adamc@481 285 else
adamc@481 286 [Unsure])
adamc@470 287 | EApp (f, x) =>
adamc@470 288 unravel (#1 f, summarize d x @ ls)
adamc@470 289 | _ => [Unsure]
adamc@398 290 in
adamc@470 291 unravel (e, [])
adamc@398 292 end
adamc@252 293
adamc@470 294 | EAbs _ => []
adamc@316 295
adamc@470 296 | EUnop (_, e) => summarize d e
adamc@470 297 | EBinop (_, e1, e2) => summarize d e1 @ summarize d e2
adamc@470 298
adamc@470 299 | ERecord xets => List.concat (map (summarize d o #2) xets)
adamc@470 300 | EField (e, _) => summarize d e
adamc@470 301
adamc@470 302 | ECase (e, pes, _) =>
adamc@398 303 let
adamc@470 304 val lss = map (fn (p, e) => summarize (d + patBinds p) e) pes
adamc@398 305 in
adamc@470 306 case lss of
adamc@470 307 [] => raise Fail "Empty pattern match"
adamc@470 308 | ls :: lss =>
adamc@470 309 if List.all (fn ls' => ls' = ls) lss then
adamc@470 310 summarize d e @ ls
adamc@470 311 else
adamc@470 312 [Unsure]
adamc@398 313 end
adamc@470 314 | EStrcat (e1, e2) => summarize d e1 @ summarize d e2
adamc@316 315
adamc@470 316 | EError (e, _) => summarize d e @ [Unsure]
adamc@318 317
adamc@470 318 | EWrite e => summarize d e @ [WritePage]
adamc@470 319
adamc@470 320 | ESeq (e1, e2) => summarize d e1 @ summarize d e2
adamc@470 321 | ELet (_, _, e1, e2) => summarize d e1 @ summarize (d + 1) e2
adamc@456 322
adamc@470 323 | EClosure (_, es) => List.concat (map (summarize d) es)
adamc@470 324
adamc@470 325 | EQuery {query, body, initial, ...} =>
adamc@470 326 List.concat [summarize d query,
adamc@470 327 summarize (d + 2) body,
adamc@470 328 summarize d initial,
adamc@470 329 [ReadDb]]
adamc@470 330
adamc@470 331 | EDml e => summarize d e @ [WriteDb]
adamc@470 332 | ENextval e => summarize d e @ [WriteDb]
adamc@470 333 | EUnurlify (e, _) => summarize d e
adamc@568 334 | EJavaScript (_, e) => summarize d e
adamc@568 335 | ESignalReturn e => summarize d e
adamc@470 336
adamc@470 337
adamc@470 338 fun exp env e =
adamc@470 339 let
adamc@470 340 (*val () = Print.prefaces "exp" [("e", MonoPrint.p_exp env (e, ErrorMsg.dummySpan))]*)
adamc@470 341
adamc@470 342 val r =
adamc@470 343 case e of
adamc@470 344 ERel n =>
adamc@470 345 (case E.lookupERel env n of
adamc@470 346 (_, _, SOME e') => #1 e'
adamc@470 347 | _ => e)
adamc@470 348 | ENamed n =>
adamc@470 349 (case E.lookupENamed env n of
adamc@470 350 (_, _, SOME e', _) => ((*Print.prefaces "Switch" [("n", Print.PD.string (Int.toString n)),
adamc@470 351 ("e'", MonoPrint.p_exp env e')];*)
adamc@470 352 #1 e')
adamc@470 353 | _ => e)
adamc@470 354
adamc@470 355 | EApp ((EAbs (x, t, _, e1), loc), e2) =>
adamc@470 356 ((*Print.prefaces "Considering" [("e1", MonoPrint.p_exp (E.pushERel env x t NONE) e1),
adamc@470 357 ("e2", MonoPrint.p_exp env e2),
adamc@470 358 ("sub", MonoPrint.p_exp env (reduceExp env (subExpInExp (0, e2) e1)))];*)
adamc@470 359 if impure e2 then
adamc@470 360 #1 (reduceExp env (ELet (x, t, e2, e1), loc))
adamc@470 361 else
adamc@470 362 #1 (reduceExp env (subExpInExp (0, e2) e1)))
adamc@470 363
adamc@470 364 | ECase (e', pes, {disc, result}) =>
adamc@442 365 let
adamc@470 366 fun push () =
adamc@470 367 case result of
adamc@470 368 (TFun (dom, result), loc) =>
adamc@470 369 if List.all (fn (_, (EAbs _, _)) => true | _ => false) pes then
adamc@470 370 EAbs ("_", dom, result,
adamc@470 371 (ECase (liftExpInExp 0 e',
adamc@470 372 map (fn (p, (EAbs (_, _, _, e), _)) =>
adamc@470 373 (p, swapExpVarsPat (0, patBinds p) e)
adamc@470 374 | _ => raise Fail "MonoReduce ECase") pes,
adamc@470 375 {disc = disc, result = result}), loc))
adamc@470 376 else
adamc@470 377 e
adamc@470 378 | _ => e
adamc@318 379
adamc@470 380 fun search pes =
adamc@470 381 case pes of
adamc@470 382 [] => push ()
adamc@470 383 | (p, body) :: pes =>
adamc@470 384 case match (env, p, e') of
adamc@470 385 No => search pes
adamc@470 386 | Maybe => push ()
adamc@470 387 | Yes env => #1 (reduceExp env body)
adamc@470 388 in
adamc@470 389 search pes
adamc@470 390 end
adamc@318 391
adamc@470 392 | EField ((ERecord xes, _), x) =>
adamc@470 393 (case List.find (fn (x', _, _) => x' = x) xes of
adamc@470 394 SOME (_, e, _) => #1 e
adamc@470 395 | NONE => e)
adamc@398 396
adamc@470 397 | ELet (x1, t1, (ELet (x2, t2, e1, b1), loc), b2) =>
adamc@470 398 let
adamc@470 399 val e' = (ELet (x2, t2, e1,
adamc@470 400 (ELet (x1, t1, b1,
adamc@470 401 liftExpInExp 1 b2), loc)), loc)
adamc@442 402 in
adamc@470 403 (*Print.prefaces "ELet commute" [("e", MonoPrint.p_exp env (e, loc)),
adamc@470 404 ("e'", MonoPrint.p_exp env e')];*)
adamc@470 405 #1 (reduceExp env e')
adamc@470 406 end
adamc@470 407 | EApp ((ELet (x, t, e, b), loc), e') =>
adamc@470 408 #1 (reduceExp env (ELet (x, t, e,
adamc@470 409 (EApp (b, liftExpInExp 0 e'), loc)), loc))
adamc@470 410
adamc@470 411 | ELet (x, t, e', (EAbs (x', t' as (TRecord [], _), ran, e''), loc)) =>
adamc@470 412 (*if impure e' then
adamc@470 413 e
adamc@470 414 else*)
adamc@470 415 (* Seems unsound in general without the check... should revisit later *)
adamc@470 416 EAbs (x', t', ran, (ELet (x, t, liftExpInExp 0 e', swapExpVars 0 e''), loc))
adamc@470 417
adamc@470 418 | ELet (x, t, e', b) =>
adamc@470 419 let
adamc@470 420 fun doSub () =
adamc@470 421 #1 (reduceExp env (subExpInExp (0, e') b))
adamc@470 422
adamc@470 423 fun trySub () =
adamc@470 424 case t of
adamc@470 425 (TFfi ("Basis", "string"), _) => doSub ()
adamc@568 426 | (TSignal _, _) => e
adamc@470 427 | _ =>
adamc@470 428 case e' of
adamc@470 429 (ECase _, _) => e
adamc@470 430 | _ => doSub ()
adamc@470 431 in
adamc@470 432 if impure e' then
adamc@470 433 let
adamc@470 434 val effs_e' = summarize 0 e'
adamc@489 435 val effs_e' = List.filter (fn x => x <> UseRel) effs_e'
adamc@470 436 val effs_b = summarize 0 b
adamc@470 437
adamc@470 438 (*val () = Print.prefaces "Try"
adamc@489 439 [("e", MonoPrint.p_exp env (e, ErrorMsg.dummySpan)),
adamc@489 440 ("e'", p_events effs_e'),
adamc@489 441 ("b", p_events effs_b)]*)
adamc@470 442
adamc@470 443 fun does eff = List.exists (fn eff' => eff' = eff) effs_e'
adamc@470 444 val writesPage = does WritePage
adamc@470 445 val readsDb = does ReadDb
adamc@470 446 val writesDb = does WriteDb
adamc@470 447
adamc@470 448 fun verifyUnused eff =
adamc@470 449 case eff of
adamc@481 450 UseRel => false
adamc@470 451 | _ => true
adamc@470 452
adamc@470 453 fun verifyCompatible effs =
adamc@470 454 case effs of
adamc@470 455 [] => false
adamc@470 456 | eff :: effs =>
adamc@470 457 case eff of
adamc@470 458 Unsure => false
adamc@481 459 | UseRel => List.all verifyUnused effs
adamc@470 460 | WritePage => not writesPage andalso verifyCompatible effs
adamc@470 461 | ReadDb => not writesDb andalso verifyCompatible effs
adamc@470 462 | WriteDb => not writesDb andalso not readsDb andalso verifyCompatible effs
adamc@470 463 in
adamc@470 464 (*Print.prefaces "verifyCompatible"
adamc@470 465 [("e'", MonoPrint.p_exp env e'),
adamc@470 466 ("b", MonoPrint.p_exp (E.pushERel env x t NONE) b),
adamc@470 467 ("effs_e'", Print.p_list p_event effs_e'),
adamc@470 468 ("effs_b", Print.p_list p_event effs_b)];*)
adamc@481 469 if List.null effs_e' orelse verifyCompatible effs_b then
adamc@470 470 trySub ()
adamc@470 471 else
adamc@470 472 e
adamc@470 473 end
adamc@470 474 else
adamc@442 475 trySub ()
adamc@442 476 end
adamc@252 477
adamc@470 478 | EStrcat ((EPrim (Prim.String s1), _), (EPrim (Prim.String s2), _)) =>
adamc@470 479 EPrim (Prim.String (s1 ^ s2))
adamc@268 480
adamc@470 481 | _ => e
adamc@470 482 in
adamc@470 483 (*Print.prefaces "exp'" [("r", MonoPrint.p_exp env (r, ErrorMsg.dummySpan))];*)
adamc@470 484 r
adamc@470 485 end
adamc@470 486
adamc@470 487 and bind (env, b) =
adamc@470 488 case b of
adamc@470 489 U.Decl.Datatype (x, n, xncs) => E.pushDatatype env x n xncs
adamc@470 490 | U.Decl.RelE (x, t) => E.pushERel env x t NONE
adamc@470 491 | U.Decl.NamedE (x, n, t, eo, s) => E.pushENamed env x n t (Option.map (reduceExp env) eo) s
adamc@470 492
adamc@470 493 and reduceExp env = U.Exp.mapB {typ = typ, exp = exp, bind = bind} env
adamc@470 494
adamc@470 495 fun decl env d = d
adamc@398 496 in
adamc@470 497 U.File.mapB {typ = typ, exp = exp, decl = decl, bind = bind} E.empty file
adamc@398 498 end
adamc@133 499
adamc@133 500 end