adamc@20
|
1 (* Copyright (c) 2008, Adam Chlipala
|
adamc@20
|
2 * All rights reserved.
|
adamc@20
|
3 *
|
adamc@20
|
4 * Redistribution and use in source and binary forms, with or without
|
adamc@20
|
5 * modification, are permitted provided that the following conditions are met:
|
adamc@20
|
6 *
|
adamc@20
|
7 * - Redistributions of source code must retain the above copyright notice,
|
adamc@20
|
8 * this list of conditions and the following disclaimer.
|
adamc@20
|
9 * - Redistributions in binary form must reproduce the above copyright notice,
|
adamc@20
|
10 * this list of conditions and the following disclaimer in the documentation
|
adamc@20
|
11 * and/or other materials provided with the distribution.
|
adamc@20
|
12 * - The names of contributors may not be used to endorse or promote products
|
adamc@20
|
13 * derived from this software without specific prior written permission.
|
adamc@20
|
14 *
|
adamc@20
|
15 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
adamc@20
|
16 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
adamc@20
|
17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
adamc@20
|
18 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
adamc@20
|
19 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
adamc@20
|
20 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
adamc@20
|
21 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
adamc@20
|
22 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
adamc@20
|
23 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
adamc@20
|
24 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
adamc@20
|
25 * POSSIBILITY OF SUCH DAMAGE.
|
adamc@20
|
26 *)
|
adamc@20
|
27
|
adamc@20
|
28 (* Simplify a Core program algebraically *)
|
adamc@20
|
29
|
adamc@20
|
30 structure Reduce :> REDUCE = struct
|
adamc@20
|
31
|
adamc@20
|
32 open Core
|
adamc@20
|
33
|
adamc@508
|
34 structure IM = IntBinaryMap
|
adamc@20
|
35
|
adamc@908
|
36 structure E = CoreEnv
|
adamc@908
|
37
|
adamc@908
|
38 fun multiLiftExpInExp n e =
|
adamc@908
|
39 if n = 0 then
|
adamc@908
|
40 e
|
adamc@908
|
41 else
|
adamc@908
|
42 multiLiftExpInExp (n - 1) (E.liftExpInExp 0 e)
|
adamc@908
|
43
|
adamc@909
|
44 val dangling =
|
adamc@909
|
45 CoreUtil.Exp.existsB {kind = fn _ => false,
|
adamc@909
|
46 con = fn _ => false,
|
adamc@909
|
47 exp = fn (n, e) =>
|
adamc@909
|
48 case e of
|
adamc@909
|
49 ERel n' => n' >= n
|
adamc@909
|
50 | _ => false,
|
adamc@909
|
51 bind = fn (n, b) =>
|
adamc@909
|
52 case b of
|
adamc@909
|
53 CoreUtil.Exp.RelE _ => n + 1
|
adamc@909
|
54 | _ => n}
|
adamc@909
|
55
|
adamc@508
|
56 datatype env_item =
|
adamc@626
|
57 UnknownK
|
adamc@626
|
58 | KnownK of kind
|
adamc@626
|
59
|
adamc@626
|
60 | UnknownC
|
adamc@508
|
61 | KnownC of con
|
adamc@21
|
62
|
adamc@508
|
63 | UnknownE
|
adamc@508
|
64 | KnownE of exp
|
adamc@20
|
65
|
adamc@626
|
66 | Lift of int * int * int
|
adamc@20
|
67
|
adamc@909
|
68 val edepth = foldl (fn (UnknownE, n) => n + 1
|
adamc@909
|
69 | (KnownE _, n) => n + 1
|
adamc@909
|
70 | (_, n) => n) 0
|
adamc@909
|
71
|
adamc@909
|
72 val edepth' = foldl (fn (UnknownE, n) => n + 1
|
adamc@909
|
73 | (KnownE _, n) => n + 1
|
adamc@909
|
74 | (Lift (_, _, n'), n) => n + n'
|
adamc@909
|
75 | (_, n) => n) 0
|
adamc@909
|
76
|
adamc@508
|
77 type env = env_item list
|
adamc@20
|
78
|
adamc@510
|
79 fun ei2s ei =
|
adamc@510
|
80 case ei of
|
adamc@626
|
81 UnknownK => "UK"
|
adamc@626
|
82 | KnownK _ => "KK"
|
adamc@626
|
83 | UnknownC => "UC"
|
adamc@510
|
84 | KnownC _ => "KC"
|
adamc@510
|
85 | UnknownE => "UE"
|
adamc@510
|
86 | KnownE _ => "KE"
|
adamc@626
|
87 | Lift (_, n1, n2) => "(" ^ Int.toString n1 ^ ", " ^ Int.toString n2 ^ ")"
|
adamc@510
|
88
|
adamc@510
|
89 fun e2s env = String.concatWith " " (map ei2s env)
|
adamc@510
|
90
|
adamc@909
|
91 (*val deKnown = List.filter (fn KnownC _ => false
|
adamc@510
|
92 | KnownE _ => false
|
adamc@626
|
93 | KnownK _ => false
|
adamc@909
|
94 | _ => true)*)
|
adamc@909
|
95
|
adamc@909
|
96 val deKnown = ListUtil.mapConcat (fn KnownC _ => []
|
adamc@909
|
97 | KnownE _ => []
|
adamc@909
|
98 | KnownK _ => []
|
adamc@909
|
99 | Lift (nk, nc, ne) => List.tabulate (nk, fn _ => UnknownK)
|
adamc@909
|
100 @ List.tabulate (nc, fn _ => UnknownC)
|
adamc@909
|
101 @ List.tabulate (ne, fn _ => UnknownE)
|
adamc@909
|
102 | x => [x])
|
adamc@510
|
103
|
adamc@930
|
104 datatype result = Yes of env | No | Maybe
|
adamc@930
|
105
|
adamc@930
|
106 fun match (env, p : pat, e : exp) =
|
adamc@942
|
107 let
|
adamc@942
|
108 val baseline = length env
|
adamc@930
|
109
|
adamc@942
|
110 fun match (env, p, e) =
|
adamc@942
|
111 case (#1 p, #1 e) of
|
adamc@942
|
112 (PWild, _) => Yes env
|
adamc@942
|
113 | (PVar (x, t), _) => Yes (KnownE (multiLiftExpInExp (length env - baseline) e) :: env)
|
adamc@930
|
114
|
adamc@942
|
115 | (PPrim p, EPrim p') =>
|
adamc@942
|
116 if Prim.equal (p, p') then
|
adamc@942
|
117 Yes env
|
adamc@942
|
118 else
|
adamc@942
|
119 No
|
adamc@930
|
120
|
adamc@942
|
121 | (PCon (_, PConVar n1, _, NONE), ECon (_, PConVar n2, _, NONE)) =>
|
adamc@942
|
122 if n1 = n2 then
|
adamc@942
|
123 Yes env
|
adamc@942
|
124 else
|
adamc@942
|
125 No
|
adamc@930
|
126
|
adamc@942
|
127 | (PCon (_, PConVar n1, _, SOME p), ECon (_, PConVar n2, _, SOME e)) =>
|
adamc@942
|
128 if n1 = n2 then
|
adamc@942
|
129 match (env, p, e)
|
adamc@942
|
130 else
|
adamc@942
|
131 No
|
adamc@930
|
132
|
adamc@942
|
133 | (PCon (_, PConFfi {mod = m1, con = con1, ...}, _, NONE),
|
adamc@942
|
134 ECon (_, PConFfi {mod = m2, con = con2, ...}, _, NONE)) =>
|
adamc@942
|
135 if m1 = m2 andalso con1 = con2 then
|
adamc@942
|
136 Yes env
|
adamc@942
|
137 else
|
adamc@942
|
138 No
|
adamc@930
|
139
|
adamc@942
|
140 | (PCon (_, PConFfi {mod = m1, con = con1, ...}, _, SOME ep),
|
adamc@942
|
141 ECon (_, PConFfi {mod = m2, con = con2, ...}, _, SOME e)) =>
|
adamc@942
|
142 if m1 = m2 andalso con1 = con2 then
|
adamc@942
|
143 match (env, p, e)
|
adamc@942
|
144 else
|
adamc@942
|
145 No
|
adamc@930
|
146
|
adamc@942
|
147 | (PRecord xps, ERecord xes) =>
|
adamc@942
|
148 if List.exists (fn ((CName _, _), _, _) => false
|
adamc@942
|
149 | _ => true) xes then
|
adamc@942
|
150 Maybe
|
adamc@942
|
151 else
|
adamc@942
|
152 let
|
adamc@942
|
153 fun consider (xps, env) =
|
adamc@942
|
154 case xps of
|
adamc@942
|
155 [] => Yes env
|
adamc@942
|
156 | (x, p, _) :: rest =>
|
adamc@942
|
157 case List.find (fn ((CName x', _), _, _) => x' = x
|
adamc@942
|
158 | _ => false) xes of
|
adamc@942
|
159 NONE => No
|
adamc@942
|
160 | SOME (_, e, _) =>
|
adamc@942
|
161 case match (env, p, e) of
|
adamc@942
|
162 No => No
|
adamc@942
|
163 | Maybe => Maybe
|
adamc@942
|
164 | Yes env => consider (rest, env)
|
adamc@942
|
165 in
|
adamc@942
|
166 consider (xps, env)
|
adamc@942
|
167 end
|
adamc@942
|
168
|
adamc@942
|
169 | _ => Maybe
|
adamc@942
|
170 in
|
adamc@942
|
171 match (env, p, e)
|
adamc@942
|
172 end
|
adamc@930
|
173
|
adamc@626
|
174 fun kindConAndExp (namedC, namedE) =
|
adamc@508
|
175 let
|
adamc@626
|
176 fun kind env (all as (k, loc)) =
|
adamc@626
|
177 case k of
|
adamc@626
|
178 KType => all
|
adamc@626
|
179 | KArrow (k1, k2) => (KArrow (kind env k1, kind env k2), loc)
|
adamc@626
|
180 | KName => all
|
adamc@626
|
181 | KRecord k => (KRecord (kind env k), loc)
|
adamc@626
|
182 | KUnit => all
|
adamc@626
|
183 | KTuple ks => (KTuple (map (kind env) ks), loc)
|
adamc@626
|
184
|
adamc@626
|
185 | KRel n =>
|
adamc@626
|
186 let
|
adamc@626
|
187 fun find (n', env, nudge, lift) =
|
adamc@626
|
188 case env of
|
adamc@626
|
189 [] => raise Fail "Reduce.kind: KRel"
|
adamc@626
|
190 | UnknownC :: rest => find (n', rest, nudge, lift)
|
adamc@626
|
191 | KnownC _ :: rest => find (n', rest, nudge, lift)
|
adamc@626
|
192 | UnknownE :: rest => find (n', rest, nudge, lift)
|
adamc@626
|
193 | KnownE _ :: rest => find (n', rest, nudge, lift)
|
adamc@626
|
194 | Lift (lift', _, _) :: rest => find (n', rest, nudge + lift', lift + lift')
|
adamc@626
|
195 | UnknownK :: rest =>
|
adamc@626
|
196 if n' = 0 then
|
adamc@626
|
197 (KRel (n + nudge), loc)
|
adamc@626
|
198 else
|
adamc@626
|
199 find (n' - 1, rest, nudge, lift + 1)
|
adamc@626
|
200 | KnownK k :: rest =>
|
adamc@626
|
201 if n' = 0 then
|
adamc@626
|
202 kind (Lift (lift, 0, 0) :: rest) k
|
adamc@626
|
203 else
|
adamc@626
|
204 find (n' - 1, rest, nudge - 1, lift)
|
adamc@626
|
205 in
|
adamc@626
|
206 find (n, env, 0, 0)
|
adamc@626
|
207 end
|
adamc@626
|
208 | KFun (x, k) => (KFun (x, kind (UnknownK :: env) k), loc)
|
adamc@626
|
209
|
adamc@508
|
210 fun con env (all as (c, loc)) =
|
adamc@510
|
211 ((*Print.prefaces "con" [("c", CorePrint.p_con CoreEnv.empty all)];*)
|
adamc@508
|
212 case c of
|
adamc@508
|
213 TFun (c1, c2) => (TFun (con env c1, con env c2), loc)
|
adamc@626
|
214 | TCFun (x, k, c2) => (TCFun (x, kind env k, con (UnknownC :: env) c2), loc)
|
adamc@626
|
215 | TKFun (x, c2) => (TKFun (x, con (UnknownK :: env) c2), loc)
|
adamc@508
|
216 | TRecord c => (TRecord (con env c), loc)
|
adamc@215
|
217
|
adamc@508
|
218 | CRel n =>
|
adamc@508
|
219 let
|
adamc@626
|
220 fun find (n', env, nudge, liftK, liftC) =
|
adamc@510
|
221 case env of
|
adamc@510
|
222 [] => raise Fail "Reduce.con: CRel"
|
adamc@626
|
223 | UnknownK :: rest => find (n', rest, nudge, liftK + 1, liftC)
|
adamc@626
|
224 | KnownK _ :: rest => find (n', rest, nudge, liftK, liftC)
|
adamc@626
|
225 | UnknownE :: rest => find (n', rest, nudge, liftK, liftC)
|
adamc@626
|
226 | KnownE _ :: rest => find (n', rest, nudge, liftK, liftC)
|
adamc@626
|
227 | Lift (liftK', liftC', _) :: rest => find (n', rest, nudge + liftC',
|
adamc@626
|
228 liftK + liftK', liftC + liftC')
|
adamc@510
|
229 | UnknownC :: rest =>
|
adamc@510
|
230 if n' = 0 then
|
adamc@510
|
231 (CRel (n + nudge), loc)
|
adamc@510
|
232 else
|
adamc@626
|
233 find (n' - 1, rest, nudge, liftK, liftC + 1)
|
adamc@510
|
234 | KnownC c :: rest =>
|
adamc@510
|
235 if n' = 0 then
|
adamc@626
|
236 con (Lift (liftK, liftC, 0) :: rest) c
|
adamc@510
|
237 else
|
adamc@626
|
238 find (n' - 1, rest, nudge - 1, liftK, liftC)
|
adamc@508
|
239 in
|
adamc@510
|
240 (*print (Int.toString n ^ ": " ^ e2s env ^ "\n");*)
|
adamc@626
|
241 find (n, env, 0, 0, 0)
|
adamc@508
|
242 end
|
adamc@508
|
243 | CNamed n =>
|
adamc@508
|
244 (case IM.find (namedC, n) of
|
adamc@508
|
245 NONE => all
|
adamc@508
|
246 | SOME c => c)
|
adamc@508
|
247 | CFfi _ => all
|
adamc@508
|
248 | CApp (c1, c2) =>
|
adamc@508
|
249 let
|
adamc@508
|
250 val c1 = con env c1
|
adamc@508
|
251 val c2 = con env c2
|
adamc@508
|
252 in
|
adamc@508
|
253 case #1 c1 of
|
adamc@508
|
254 CAbs (_, _, b) =>
|
adamc@510
|
255 con (KnownC c2 :: deKnown env) b
|
adamc@215
|
256
|
adamc@621
|
257 | CApp ((CMap (dom, ran), _), f) =>
|
adamc@508
|
258 (case #1 c2 of
|
adamc@626
|
259 CRecord (_, []) => (CRecord (kind env ran, []), loc)
|
adamc@621
|
260 | CRecord (_, (x, c) :: rest) =>
|
adamc@510
|
261 con (deKnown env)
|
adamc@621
|
262 (CConcat ((CRecord (ran, [(x, (CApp (f, c), loc))]), loc),
|
adamc@626
|
263 (CApp (c1, (CRecord (kind env dom, rest), loc)), loc)), loc)
|
adamc@508
|
264 | _ => (CApp (c1, c2), loc))
|
adamc@20
|
265
|
adamc@508
|
266 | _ => (CApp (c1, c2), loc)
|
adamc@508
|
267 end
|
adamc@626
|
268 | CAbs (x, k, b) => (CAbs (x, kind env k, con (UnknownC :: env) b), loc)
|
adamc@626
|
269
|
adamc@626
|
270 | CKApp (c1, k) =>
|
adamc@626
|
271 let
|
adamc@626
|
272 val c1 = con env c1
|
adamc@626
|
273 in
|
adamc@626
|
274 case #1 c1 of
|
adamc@626
|
275 CKAbs (_, b) =>
|
adamc@626
|
276 con (KnownK k :: deKnown env) b
|
adamc@626
|
277
|
adamc@626
|
278 | _ => (CKApp (c1, kind env k), loc)
|
adamc@626
|
279 end
|
adamc@626
|
280 | CKAbs (x, b) => (CKAbs (x, con (UnknownK :: env) b), loc)
|
adamc@20
|
281
|
adamc@508
|
282 | CName _ => all
|
adamc@21
|
283
|
adamc@626
|
284 | CRecord (k, xcs) => (CRecord (kind env k, map (fn (x, c) => (con env x, con env c)) xcs), loc)
|
adamc@508
|
285 | CConcat (c1, c2) =>
|
adamc@508
|
286 let
|
adamc@508
|
287 val c1 = con env c1
|
adamc@508
|
288 val c2 = con env c2
|
adamc@508
|
289 in
|
adamc@508
|
290 case (#1 c1, #1 c2) of
|
adamc@508
|
291 (CRecord (k, xcs1), CRecord (_, xcs2)) =>
|
adamc@626
|
292 (CRecord (kind env k, xcs1 @ xcs2), loc)
|
adamc@508
|
293 | _ => (CConcat (c1, c2), loc)
|
adamc@508
|
294 end
|
adamc@626
|
295 | CMap (dom, ran) => (CMap (kind env dom, kind env ran), loc)
|
adamc@74
|
296
|
adamc@508
|
297 | CUnit => all
|
adamc@21
|
298
|
adamc@508
|
299 | CTuple cs => (CTuple (map (con env) cs), loc)
|
adamc@508
|
300 | CProj (c, n) =>
|
adamc@508
|
301 let
|
adamc@508
|
302 val c = con env c
|
adamc@508
|
303 in
|
adamc@508
|
304 case #1 c of
|
adamc@508
|
305 CTuple cs => List.nth (cs, n - 1)
|
adamc@508
|
306 | _ => (CProj (c, n), loc)
|
adamc@510
|
307 end)
|
adamc@22
|
308
|
adamc@509
|
309 fun patCon pc =
|
adamc@509
|
310 case pc of
|
adamc@509
|
311 PConVar _ => pc
|
adamc@509
|
312 | PConFfi {mod = m, datatyp, params, con = c, arg, kind} =>
|
adamc@509
|
313 PConFfi {mod = m, datatyp = datatyp, params = params, con = c,
|
adamc@509
|
314 arg = Option.map (con (map (fn _ => UnknownC) params)) arg,
|
adamc@509
|
315 kind = kind}
|
adamc@509
|
316
|
adamc@509
|
317
|
adamc@509
|
318 val k = (KType, ErrorMsg.dummySpan)
|
adamc@509
|
319 fun doPart e (this as (x, t), rest) =
|
adamc@509
|
320 ((x, (EField (e, x, {field = t, rest = (CRecord (k, rest), #2 t)}), #2 t), t),
|
adamc@509
|
321 this :: rest)
|
adamc@509
|
322
|
adamc@509
|
323 fun exp env (all as (e, loc)) =
|
adamc@909
|
324 let
|
adamc@909
|
325 (*val () = Print.prefaces "exp" [("e", CorePrint.p_exp CoreEnv.empty all),
|
adamc@909
|
326 ("env", Print.PD.string (e2s env))]*)
|
adamc@910
|
327 val () = if dangling (edepth env) all then
|
adamc@909
|
328 (Print.prefaces "exp" [("e", CorePrint.p_exp CoreEnv.empty all),
|
adamc@909
|
329 ("env", Print.PD.string (e2s env))];
|
adamc@909
|
330 raise Fail "!")
|
adamc@909
|
331 else
|
adamc@910
|
332 ()
|
adamc@509
|
333
|
adamc@909
|
334 val r = case e of
|
adamc@909
|
335 EPrim _ => all
|
adamc@909
|
336 | ERel n =>
|
adamc@909
|
337 let
|
adamc@909
|
338 fun find (n', env, nudge, liftK, liftC, liftE) =
|
adamc@909
|
339 case env of
|
adamc@909
|
340 [] => raise Fail ("Reduce.exp: ERel (" ^ ErrorMsg.spanToString loc ^ ")")
|
adamc@909
|
341 | UnknownK :: rest => find (n', rest, nudge, liftK + 1, liftC, liftE)
|
adamc@909
|
342 | KnownK _ :: rest => find (n', rest, nudge, liftK, liftC, liftE)
|
adamc@909
|
343 | UnknownC :: rest => find (n', rest, nudge, liftK, liftC + 1, liftE)
|
adamc@909
|
344 | KnownC _ :: rest => find (n', rest, nudge, liftK, liftC, liftE)
|
adamc@909
|
345 | Lift (liftK', liftC', liftE') :: rest =>
|
adamc@909
|
346 find (n', rest, nudge + liftE',
|
adamc@909
|
347 liftK + liftK', liftC + liftC', liftE + liftE')
|
adamc@909
|
348 | UnknownE :: rest =>
|
adamc@909
|
349 if n' = 0 then
|
adamc@909
|
350 (ERel (n + nudge), loc)
|
adamc@909
|
351 else
|
adamc@909
|
352 find (n' - 1, rest, nudge, liftK, liftC, liftE + 1)
|
adamc@909
|
353 | KnownE e :: rest =>
|
adamc@909
|
354 if n' = 0 then
|
adamc@909
|
355 ((*print "SUBSTITUTING\n";*)
|
adamc@909
|
356 exp (Lift (liftK, liftC, liftE) :: rest) e)
|
adamc@909
|
357 else
|
adamc@909
|
358 find (n' - 1, rest, nudge - 1, liftK, liftC, liftE)
|
adamc@909
|
359 in
|
adamc@909
|
360 (*print (Int.toString n ^ ": " ^ e2s env ^ "\n");*)
|
adamc@909
|
361 find (n, env, 0, 0, 0, 0)
|
adamc@909
|
362 end
|
adamc@909
|
363 | ENamed n =>
|
adamc@909
|
364 (case IM.find (namedE, n) of
|
adamc@909
|
365 NONE => all
|
adamc@909
|
366 | SOME e => e)
|
adamc@909
|
367 | ECon (dk, pc, cs, eo) => (ECon (dk, patCon pc,
|
adamc@909
|
368 map (con env) cs, Option.map (exp env) eo), loc)
|
adamc@909
|
369 | EFfi _ => all
|
adamc@909
|
370 | EFfiApp (m, f, es) => (EFfiApp (m, f, map (exp env) es), loc)
|
adamc@908
|
371
|
adamc@909
|
372 (*| EApp (
|
adamc@909
|
373 (EApp
|
adamc@909
|
374 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), _), _), t1), _), t2), _),
|
adamc@909
|
375 (EFfi ("Basis", "transaction_monad"), _)), _),
|
adamc@909
|
376 (ECase (ed, pes, {disc, ...}), _)), _),
|
adamc@909
|
377 trans2) =>
|
adamc@909
|
378 let
|
adamc@909
|
379 val e' = (EFfi ("Basis", "bind"), loc)
|
adamc@909
|
380 val e' = (ECApp (e', (CFfi ("Basis", "transaction"), loc)), loc)
|
adamc@909
|
381 val e' = (ECApp (e', t1), loc)
|
adamc@909
|
382 val e' = (ECApp (e', t2), loc)
|
adamc@909
|
383 val e' = (EApp (e', (EFfi ("Basis", "transaction_monad"), loc)), loc)
|
adamc@908
|
384
|
adamc@909
|
385 val pes = map (fn (p, e) =>
|
adamc@909
|
386 let
|
adamc@909
|
387 val e' = (EApp (e', e), loc)
|
adamc@909
|
388 val e' = (EApp (e',
|
adamc@909
|
389 multiLiftExpInExp (E.patBindsN p)
|
adamc@909
|
390 trans2), loc)
|
adamc@909
|
391 val e' = exp env e'
|
adamc@909
|
392 in
|
adamc@909
|
393 (p, e')
|
adamc@909
|
394 end) pes
|
adamc@909
|
395 in
|
adamc@909
|
396 (ECase (exp env ed,
|
adamc@909
|
397 pes,
|
adamc@909
|
398 {disc = con env disc,
|
adamc@909
|
399 result = (CApp ((CFfi ("Basis", "transaction"), loc), con env t2), loc)}),
|
adamc@909
|
400 loc)
|
adamc@909
|
401 end*)
|
adamc@908
|
402
|
adamc@909
|
403 | EApp (e1, e2) =>
|
adamc@909
|
404 let
|
adamc@910
|
405 val env' = deKnown env
|
adamc@910
|
406
|
adamc@910
|
407 fun reassoc e =
|
adamc@910
|
408 case #1 e of
|
adamc@910
|
409 EApp
|
adamc@910
|
410 ((EApp
|
adamc@910
|
411 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), _), _),
|
adamc@910
|
412 t1),
|
adamc@910
|
413 _), t2), _),
|
adamc@910
|
414 (EFfi ("Basis", "transaction_monad"), _)), _),
|
adamc@910
|
415 (EServerCall (n, es, (EAbs (_, _, _, ke), _), dom, ran), _)), _),
|
adamc@910
|
416 trans3) =>
|
adamc@910
|
417 let
|
adamc@910
|
418 val e' = (EFfi ("Basis", "bind"), loc)
|
adamc@910
|
419 val e' = (ECApp (e', (CFfi ("Basis", "transaction"), loc)), loc)
|
adamc@910
|
420 val e' = (ECApp (e', dom), loc)
|
adamc@910
|
421 val e' = (ECApp (e', t2), loc)
|
adamc@910
|
422 val e' = (EApp (e', (EFfi ("Basis", "transaction_monad"), loc)), loc)
|
adamc@910
|
423 val e' = (EApp (e', ke), loc)
|
adamc@910
|
424 val e' = (EApp (e', E.liftExpInExp 0 trans3), loc)
|
adamc@910
|
425 val e' = reassoc e'
|
adamc@910
|
426 val e' = (EAbs ("x", dom, t2, e'), loc)
|
adamc@910
|
427 val e' = (EServerCall (n, es, e', dom, t2), loc)
|
adamc@910
|
428 in
|
adamc@910
|
429 e'
|
adamc@910
|
430 end
|
adamc@910
|
431
|
adamc@910
|
432 | EApp
|
adamc@910
|
433 ((EApp
|
adamc@910
|
434 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), _), _),
|
adamc@910
|
435 t1),
|
adamc@910
|
436 _), t2), _),
|
adamc@910
|
437 (EFfi ("Basis", "transaction_monad"), _)), _),
|
adamc@910
|
438 (EServerCall (n, es, ke, dom, ran), _)), _),
|
adamc@910
|
439 trans3) =>
|
adamc@910
|
440 let
|
adamc@910
|
441 val e' = (EFfi ("Basis", "bind"), loc)
|
adamc@910
|
442 val e' = (ECApp (e', (CFfi ("Basis", "transaction"), loc)), loc)
|
adamc@910
|
443 val e' = (ECApp (e', dom), loc)
|
adamc@910
|
444 val e' = (ECApp (e', t2), loc)
|
adamc@910
|
445 val e' = (EApp (e', (EFfi ("Basis", "transaction_monad"), loc)), loc)
|
adamc@910
|
446 val e' = (EApp (e', exp (UnknownE :: env')
|
adamc@910
|
447 (EApp (E.liftExpInExp 0 ke, (ERel 0, loc)), loc)),
|
adamc@910
|
448 loc)
|
adamc@910
|
449 val e' = (EApp (e', E.liftExpInExp 0 trans3), loc)
|
adamc@910
|
450 val e' = reassoc e'
|
adamc@910
|
451 val e' = (EAbs ("x", dom, t2, e'), loc)
|
adamc@910
|
452 val e' = (EServerCall (n, es, e', dom, t2), loc)
|
adamc@910
|
453 in
|
adamc@910
|
454 e'
|
adamc@910
|
455 end
|
adamc@910
|
456
|
adamc@910
|
457 | EApp
|
adamc@910
|
458 ((EApp
|
adamc@910
|
459 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), mt),
|
adamc@910
|
460 _), _), _), t3), _),
|
adamc@910
|
461 me), _),
|
adamc@910
|
462 (EApp ((EApp
|
adamc@910
|
463 ((EApp ((ECApp ((ECApp ((ECApp (
|
adamc@910
|
464 (EFfi ("Basis", "bind"), _), _), _),
|
adamc@910
|
465 t1), _), t2), _),
|
adamc@910
|
466 _), _),
|
adamc@910
|
467 trans1), _), (EAbs (_, _, _, trans2), _)), _)), _),
|
adamc@910
|
468 trans3) =>
|
adamc@910
|
469 let
|
adamc@910
|
470 val e'' = (EFfi ("Basis", "bind"), loc)
|
adamc@910
|
471 val e'' = (ECApp (e'', mt), loc)
|
adamc@910
|
472 val e'' = (ECApp (e'', t2), loc)
|
adamc@910
|
473 val e'' = (ECApp (e'', t3), loc)
|
adamc@910
|
474 val e'' = (EApp (e'', me), loc)
|
adamc@910
|
475 val e'' = (EApp (e'', trans2), loc)
|
adamc@910
|
476 val e'' = (EApp (e'', E.liftExpInExp 0 trans3), loc)
|
adamc@910
|
477 val e'' = reassoc e''
|
adamc@910
|
478 val e'' = (EAbs ("xb", t1, (CApp (mt, t3), loc), e''), loc)
|
adamc@910
|
479
|
adamc@910
|
480 val e' = (EFfi ("Basis", "bind"), loc)
|
adamc@910
|
481 val e' = (ECApp (e', mt), loc)
|
adamc@910
|
482 val e' = (ECApp (e', t1), loc)
|
adamc@910
|
483 val e' = (ECApp (e', t3), loc)
|
adamc@910
|
484 val e' = (EApp (e', me), loc)
|
adamc@910
|
485 val e' = (EApp (e', trans1), loc)
|
adamc@910
|
486 val e' = (EApp (e', e''), loc)
|
adamc@910
|
487 in
|
adamc@910
|
488 e'
|
adamc@910
|
489 end
|
adamc@910
|
490
|
adamc@910
|
491 | EApp
|
adamc@910
|
492 ((EApp
|
adamc@910
|
493 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), mt),
|
adamc@910
|
494 _), _), _), t3), _),
|
adamc@910
|
495 me), _),
|
adamc@910
|
496 (EApp ((EApp
|
adamc@910
|
497 ((EApp ((ECApp ((ECApp ((ECApp (
|
adamc@910
|
498 (EFfi ("Basis", "bind"), _), _), _),
|
adamc@910
|
499 t1), _), t2), _),
|
adamc@910
|
500 _), _),
|
adamc@910
|
501 trans1), _), trans2), _)), _),
|
adamc@910
|
502 trans3) =>
|
adamc@910
|
503 let
|
adamc@910
|
504 val e'' = (EFfi ("Basis", "bind"), loc)
|
adamc@910
|
505 val e'' = (ECApp (e'', mt), loc)
|
adamc@910
|
506 val e'' = (ECApp (e'', t2), loc)
|
adamc@910
|
507 val e'' = (ECApp (e'', t3), loc)
|
adamc@910
|
508 val e'' = (EApp (e'', me), loc)
|
adamc@910
|
509 val () = print "In2\n"
|
adamc@910
|
510 val e'' = (EApp (e'', exp (UnknownE :: env')
|
adamc@910
|
511 (EApp (E.liftExpInExp 0 trans2, (ERel 0, loc)),
|
adamc@910
|
512 loc)),
|
adamc@910
|
513 loc)
|
adamc@910
|
514 val () = print "Out2\n"
|
adamc@910
|
515 val e'' = (EApp (e'', E.liftExpInExp 0 trans3), loc)
|
adamc@910
|
516 val e'' = reassoc e''
|
adamc@910
|
517 val e'' = (EAbs ("xb", t1, (CApp (mt, t3), loc), e''), loc)
|
adamc@910
|
518
|
adamc@910
|
519 val e' = (EFfi ("Basis", "bind"), loc)
|
adamc@910
|
520 val e' = (ECApp (e', mt), loc)
|
adamc@910
|
521 val e' = (ECApp (e', t1), loc)
|
adamc@910
|
522 val e' = (ECApp (e', t3), loc)
|
adamc@910
|
523 val e' = (EApp (e', me), loc)
|
adamc@910
|
524 val e' = (EApp (e', trans1), loc)
|
adamc@910
|
525 val e' = (EApp (e', e''), loc)
|
adamc@910
|
526 in
|
adamc@910
|
527 e'
|
adamc@910
|
528 end
|
adamc@910
|
529
|
adamc@931
|
530 | EApp
|
adamc@931
|
531 ((EApp
|
adamc@931
|
532 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), _), _),
|
adamc@931
|
533 t1),
|
adamc@931
|
534 _), t2), _),
|
adamc@931
|
535 (EFfi ("Basis", "transaction_monad"), _)), _),
|
adamc@931
|
536 (ECase (e, pes, {disc, ...}), _)), _), trans) =>
|
adamc@931
|
537 let
|
adamc@931
|
538 val e' = (EFfi ("Basis", "bind"), loc)
|
adamc@931
|
539 val e' = (ECApp (e', (CFfi ("Basis", "transaction"), loc)), loc)
|
adamc@931
|
540 val e' = (ECApp (e', t1), loc)
|
adamc@931
|
541 val e' = (ECApp (e', t2), loc)
|
adamc@931
|
542 val e' = (EApp (e', (EFfi ("Basis", "transaction_monad"), loc)), loc)
|
adamc@931
|
543
|
adamc@931
|
544 fun doCase (p, e) =
|
adamc@931
|
545 let
|
adamc@931
|
546 val e' = (EApp (e', e), loc)
|
adamc@931
|
547 val e' = (EApp (e',
|
adamc@931
|
548 multiLiftExpInExp (E.patBindsN p)
|
adamc@931
|
549 trans), loc)
|
adamc@931
|
550 in
|
adamc@931
|
551 (p, reassoc e')
|
adamc@931
|
552 end
|
adamc@931
|
553 in
|
adamc@931
|
554 (ECase (e, map doCase pes,
|
adamc@931
|
555 {disc = disc,
|
adamc@931
|
556 result = (CApp ((CFfi ("Basis", "transaction"), loc),
|
adamc@931
|
557 t2), loc)}), loc)
|
adamc@931
|
558 end
|
adamc@931
|
559
|
adamc@910
|
560 | _ => e
|
adamc@910
|
561
|
adamc@909
|
562 val e1 = exp env e1
|
adamc@909
|
563 val e2 = exp env e2
|
adamc@910
|
564 val e12 = reassoc (EApp (e1, e2), loc)
|
adamc@909
|
565 in
|
adamc@910
|
566 case #1 e12 of
|
adamc@910
|
567 EApp ((EAbs (_, _, _, b), _), e2) =>
|
adamc@931
|
568 exp (KnownE e2 :: env') b
|
adamc@910
|
569 | _ => e12
|
adamc@909
|
570 end
|
adamc@509
|
571
|
adamc@909
|
572 | EAbs (x, dom, ran, e) => (EAbs (x, con env dom, con env ran, exp (UnknownE :: env) e), loc)
|
adamc@509
|
573
|
adamc@909
|
574 | ECApp (e, c) =>
|
adamc@909
|
575 let
|
adamc@909
|
576 val e = exp env e
|
adamc@909
|
577 val c = con env c
|
adamc@909
|
578 in
|
adamc@909
|
579 case #1 e of
|
adamc@909
|
580 ECAbs (_, _, b) => exp (KnownC c :: deKnown env) b
|
adamc@909
|
581 | _ => (ECApp (e, c), loc)
|
adamc@909
|
582 end
|
adamc@626
|
583
|
adamc@909
|
584 | ECAbs (x, k, e) => (ECAbs (x, kind env k, exp (UnknownC :: env) e), loc)
|
adamc@626
|
585
|
adamc@909
|
586 | EKApp (e, k) =>
|
adamc@909
|
587 let
|
adamc@909
|
588 val e = exp env e
|
adamc@909
|
589 in
|
adamc@909
|
590 case #1 e of
|
adamc@909
|
591 EKAbs (_, b) => exp (KnownK k :: deKnown env) b
|
adamc@909
|
592 | _ => (EKApp (e, kind env k), loc)
|
adamc@909
|
593 end
|
adamc@509
|
594
|
adamc@909
|
595 | EKAbs (x, e) => (EKAbs (x, exp (UnknownK :: env) e), loc)
|
adamc@509
|
596
|
adamc@909
|
597 | ERecord xcs => (ERecord (map (fn (x, e, t) => (con env x, exp env e, con env t)) xcs), loc)
|
adamc@909
|
598 | EField (e, c, {field, rest}) =>
|
adamc@909
|
599 let
|
adamc@909
|
600 val e = exp env e
|
adamc@909
|
601 val c = con env c
|
adamc@509
|
602
|
adamc@909
|
603 fun default () = (EField (e, c, {field = con env field, rest = con env rest}), loc)
|
adamc@909
|
604 in
|
adamc@909
|
605 case (#1 e, #1 c) of
|
adamc@909
|
606 (ERecord xcs, CName x) =>
|
adamc@909
|
607 (case List.find (fn ((CName x', _), _, _) => x' = x | _ => false) xcs of
|
adamc@909
|
608 NONE => default ()
|
adamc@909
|
609 | SOME (_, e, _) => e)
|
adamc@909
|
610 | _ => default ()
|
adamc@909
|
611 end
|
adamc@509
|
612
|
adamc@909
|
613 | EConcat (e1, c1, e2, c2) =>
|
adamc@909
|
614 let
|
adamc@909
|
615 val e1 = exp env e1
|
adamc@909
|
616 val e2 = exp env e2
|
adamc@909
|
617 in
|
adamc@909
|
618 case (#1 e1, #1 e2) of
|
adamc@909
|
619 (ERecord xes1, ERecord xes2) => (ERecord (xes1 @ xes2), loc)
|
adamc@909
|
620 | _ =>
|
adamc@909
|
621 let
|
adamc@909
|
622 val c1 = con env c1
|
adamc@909
|
623 val c2 = con env c2
|
adamc@909
|
624 in
|
adamc@909
|
625 case (#1 c1, #1 c2) of
|
adamc@909
|
626 (CRecord (k, xcs1), CRecord (_, xcs2)) =>
|
adamc@909
|
627 let
|
adamc@909
|
628 val (xes1, rest) = ListUtil.foldlMap (doPart e1) [] xcs1
|
adamc@909
|
629 val (xes2, _) = ListUtil.foldlMap (doPart e2) rest xcs2
|
adamc@909
|
630 in
|
adamc@909
|
631 exp (deKnown env) (ERecord (xes1 @ xes2), loc)
|
adamc@909
|
632 end
|
adamc@909
|
633 | _ => (EConcat (e1, c1, e2, c2), loc)
|
adamc@909
|
634 end
|
adamc@909
|
635 end
|
adamc@509
|
636
|
adamc@909
|
637 | ECut (e, c, {field, rest}) =>
|
adamc@909
|
638 let
|
adamc@909
|
639 val e = exp env e
|
adamc@909
|
640 val c = con env c
|
adamc@509
|
641
|
adamc@909
|
642 fun default () =
|
adamc@909
|
643 let
|
adamc@909
|
644 val rest = con env rest
|
adamc@909
|
645 in
|
adamc@909
|
646 case #1 rest of
|
adamc@909
|
647 CRecord (k, xcs) =>
|
adamc@909
|
648 let
|
adamc@909
|
649 val (xes, _) = ListUtil.foldlMap (doPart e) [] xcs
|
adamc@909
|
650 in
|
adamc@909
|
651 exp (deKnown env) (ERecord xes, loc)
|
adamc@909
|
652 end
|
adamc@909
|
653 | _ => (ECut (e, c, {field = con env field, rest = rest}), loc)
|
adamc@909
|
654 end
|
adamc@909
|
655 in
|
adamc@909
|
656 case (#1 e, #1 c) of
|
adamc@909
|
657 (ERecord xes, CName x) =>
|
adamc@909
|
658 if List.all (fn ((CName _, _), _, _) => true | _ => false) xes then
|
adamc@909
|
659 (ERecord (List.filter (fn ((CName x', _), _, _) => x' <> x
|
adamc@909
|
660 | _ => raise Fail "Reduce: ECut") xes), loc)
|
adamc@909
|
661 else
|
adamc@909
|
662 default ()
|
adamc@909
|
663 | _ => default ()
|
adamc@909
|
664 end
|
adamc@509
|
665
|
adamc@909
|
666 | ECutMulti (e, c, {rest}) =>
|
adamc@909
|
667 let
|
adamc@909
|
668 val e = exp env e
|
adamc@909
|
669 val c = con env c
|
adamc@509
|
670
|
adamc@909
|
671 fun default () =
|
adamc@909
|
672 let
|
adamc@909
|
673 val rest = con env rest
|
adamc@909
|
674 in
|
adamc@909
|
675 case #1 rest of
|
adamc@909
|
676 CRecord (k, xcs) =>
|
adamc@909
|
677 let
|
adamc@909
|
678 val (xes, _) = ListUtil.foldlMap (doPart e) [] xcs
|
adamc@909
|
679 in
|
adamc@909
|
680 exp (deKnown env) (ERecord xes, loc)
|
adamc@909
|
681 end
|
adamc@909
|
682 | _ => (ECutMulti (e, c, {rest = rest}), loc)
|
adamc@909
|
683 end
|
adamc@909
|
684 in
|
adamc@909
|
685 case (#1 e, #1 c) of
|
adamc@909
|
686 (ERecord xes, CRecord (_, xcs)) =>
|
adamc@909
|
687 if List.all (fn ((CName _, _), _, _) => true | _ => false) xes
|
adamc@909
|
688 andalso List.all (fn ((CName _, _), _) => true | _ => false) xcs then
|
adamc@909
|
689 (ERecord (List.filter (fn ((CName x', _), _, _) =>
|
adamc@909
|
690 List.all (fn ((CName x, _), _) => x' <> x
|
adamc@909
|
691 | _ => raise Fail "Reduce: ECutMulti [1]") xcs
|
adamc@909
|
692 | _ => raise Fail "Reduce: ECutMulti [2]") xes), loc)
|
adamc@909
|
693 else
|
adamc@909
|
694 default ()
|
adamc@909
|
695 | _ => default ()
|
adamc@909
|
696 end
|
adamc@823
|
697
|
adamc@909
|
698 | ECase (_, [((PRecord [], _), e)], _) => exp env e
|
adamc@909
|
699 | ECase (_, [((PWild, _), e)], _) => exp env e
|
adamc@509
|
700
|
adamc@909
|
701 | ECase (e, pes, {disc, result}) =>
|
adamc@909
|
702 let
|
adamc@909
|
703 fun patBinds (p, _) =
|
adamc@909
|
704 case p of
|
adamc@909
|
705 PWild => 0
|
adamc@909
|
706 | PVar _ => 1
|
adamc@909
|
707 | PPrim _ => 0
|
adamc@909
|
708 | PCon (_, _, _, NONE) => 0
|
adamc@909
|
709 | PCon (_, _, _, SOME p) => patBinds p
|
adamc@909
|
710 | PRecord xpts => foldl (fn ((_, p, _), n) => n + patBinds p) 0 xpts
|
adamc@509
|
711
|
adamc@909
|
712 fun pat (all as (p, loc)) =
|
adamc@909
|
713 case p of
|
adamc@909
|
714 PWild => all
|
adamc@909
|
715 | PVar (x, t) => (PVar (x, con env t), loc)
|
adamc@909
|
716 | PPrim _ => all
|
adamc@909
|
717 | PCon (dk, pc, cs, po) =>
|
adamc@909
|
718 (PCon (dk, patCon pc, map (con env) cs, Option.map pat po), loc)
|
adamc@909
|
719 | PRecord xpts => (PRecord (map (fn (x, p, t) => (x, pat p, con env t)) xpts), loc)
|
adamc@930
|
720
|
adamc@930
|
721 fun push () =
|
adamc@930
|
722 (ECase (exp env e,
|
adamc@930
|
723 map (fn (p, e) => (pat p,
|
adamc@930
|
724 exp (List.tabulate (patBinds p,
|
adamc@930
|
725 fn _ => UnknownE) @ env) e))
|
adamc@930
|
726 pes, {disc = con env disc, result = con env result}), loc)
|
adamc@930
|
727
|
adamc@930
|
728 fun search pes =
|
adamc@930
|
729 case pes of
|
adamc@930
|
730 [] => push ()
|
adamc@930
|
731 | (p, body) :: pes =>
|
adamc@930
|
732 case match (env, p, e) of
|
adamc@930
|
733 No => search pes
|
adamc@930
|
734 | Maybe => push ()
|
adamc@930
|
735 | Yes env' => exp env' body
|
adamc@909
|
736 in
|
adamc@930
|
737 search pes
|
adamc@909
|
738 end
|
adamc@509
|
739
|
adamc@909
|
740 | EWrite e => (EWrite (exp env e), loc)
|
adamc@909
|
741 | EClosure (n, es) => (EClosure (n, map (exp env) es), loc)
|
adamc@607
|
742
|
adamc@910
|
743 | ELet (x, t, e1, e2) =>
|
adamc@910
|
744 (ELet (x, con env t, exp env e1, exp (UnknownE :: env) e2), loc)
|
adamc@909
|
745
|
adamc@909
|
746 | EServerCall (n, es, e, t1, t2) => (EServerCall (n, map (exp env) es, exp env e,
|
adamc@909
|
747 con env t1, con env t2), loc)
|
adamc@909
|
748 in
|
adamc@909
|
749 (*if dangling (edepth' (deKnown env)) r then
|
adamc@909
|
750 (Print.prefaces "exp" [("e", CorePrint.p_exp CoreEnv.empty all),
|
adamc@909
|
751 ("r", CorePrint.p_exp CoreEnv.empty r)];
|
adamc@909
|
752 raise Fail "!!")
|
adamc@909
|
753 else
|
adamc@909
|
754 ();*)
|
adamc@909
|
755 r
|
adamc@909
|
756 end
|
adamc@417
|
757 in
|
adamc@626
|
758 {kind = kind, con = con, exp = exp}
|
adamc@417
|
759 end
|
adamc@21
|
760
|
adamc@626
|
761 fun kind namedC env k = #kind (kindConAndExp (namedC, IM.empty)) env k
|
adamc@626
|
762 fun con namedC env c = #con (kindConAndExp (namedC, IM.empty)) env c
|
adamc@626
|
763 fun exp (namedC, namedE) env e = #exp (kindConAndExp (namedC, namedE)) env e
|
adamc@20
|
764
|
adamc@508
|
765 fun reduce file =
|
adamc@508
|
766 let
|
adamc@508
|
767 fun doDecl (d as (_, loc), st as (namedC, namedE)) =
|
adamc@508
|
768 case #1 d of
|
adamc@508
|
769 DCon (x, n, k, c) =>
|
adamc@508
|
770 let
|
adamc@626
|
771 val k = kind namedC [] k
|
adamc@509
|
772 val c = con namedC [] c
|
adamc@508
|
773 in
|
adamc@508
|
774 ((DCon (x, n, k, c), loc),
|
adamc@508
|
775 (IM.insert (namedC, n, c), namedE))
|
adamc@508
|
776 end
|
adamc@807
|
777 | DDatatype dts =>
|
adamc@807
|
778 ((DDatatype (map (fn (x, n, ps, cs) =>
|
adamc@807
|
779 let
|
adamc@807
|
780 val env = map (fn _ => UnknownC) ps
|
adamc@807
|
781 in
|
adamc@807
|
782 (x, n, ps, map (fn (x, n, co) => (x, n, Option.map (con namedC env) co)) cs)
|
adamc@807
|
783 end) dts), loc),
|
adamc@807
|
784 st)
|
adamc@508
|
785 | DVal (x, n, t, e, s) =>
|
adamc@508
|
786 let
|
adamc@509
|
787 val t = con namedC [] t
|
adamc@509
|
788 val e = exp (namedC, namedE) [] e
|
adamc@508
|
789 in
|
adamc@508
|
790 ((DVal (x, n, t, e, s), loc),
|
adamc@508
|
791 (namedC, IM.insert (namedE, n, e)))
|
adamc@508
|
792 end
|
adamc@508
|
793 | DValRec vis =>
|
adamc@910
|
794 ((DValRec (map (fn (x, n, t, e, s) => (x, n, con namedC [] t,
|
adamc@910
|
795 exp (namedC, namedE) [] e, s)) vis), loc),
|
adamc@508
|
796 st)
|
adamc@508
|
797 | DExport _ => (d, st)
|
adamc@707
|
798 | DTable (s, n, c, s', pe, pc, ce, cc) => ((DTable (s, n, con namedC [] c, s',
|
adamc@707
|
799 exp (namedC, namedE) [] pe,
|
adamc@707
|
800 con namedC [] pc,
|
adamc@707
|
801 exp (namedC, namedE) [] ce,
|
adamc@707
|
802 con namedC [] cc), loc), st)
|
adamc@508
|
803 | DSequence _ => (d, st)
|
adamc@754
|
804 | DView (s, n, s', e, c) => ((DView (s, n, s', exp (namedC, namedE) [] e, con namedC [] c), loc), st)
|
adamc@508
|
805 | DDatabase _ => (d, st)
|
adamc@509
|
806 | DCookie (s, n, c, s') => ((DCookie (s, n, con namedC [] c, s'), loc), st)
|
adamc@720
|
807 | DStyle (s, n, s') => ((DStyle (s, n, s'), loc), st)
|
adamc@20
|
808
|
adamc@508
|
809 val (file, _) = ListUtil.foldlMap doDecl (IM.empty, IM.empty) file
|
adamc@508
|
810 in
|
adamc@508
|
811 file
|
adamc@508
|
812 end
|
adamc@20
|
813
|
adamc@20
|
814 end
|