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@930
|
107 case (#1 p, #1 e) of
|
adamc@930
|
108 (PWild, _) => Yes env
|
adamc@930
|
109 | (PVar (x, t), _) => Yes (KnownE e :: env)
|
adamc@930
|
110
|
adamc@930
|
111 | (PPrim p, EPrim p') =>
|
adamc@930
|
112 if Prim.equal (p, p') then
|
adamc@930
|
113 Yes env
|
adamc@930
|
114 else
|
adamc@930
|
115 No
|
adamc@930
|
116
|
adamc@930
|
117 | (PCon (_, PConVar n1, _, NONE), ECon (_, PConVar n2, _, NONE)) =>
|
adamc@930
|
118 if n1 = n2 then
|
adamc@930
|
119 Yes env
|
adamc@930
|
120 else
|
adamc@930
|
121 No
|
adamc@930
|
122
|
adamc@930
|
123 | (PCon (_, PConVar n1, _, SOME p), ECon (_, PConVar n2, _, SOME e)) =>
|
adamc@930
|
124 if n1 = n2 then
|
adamc@930
|
125 match (env, p, e)
|
adamc@930
|
126 else
|
adamc@930
|
127 No
|
adamc@930
|
128
|
adamc@930
|
129 | (PCon (_, PConFfi {mod = m1, con = con1, ...}, _, NONE),
|
adamc@930
|
130 ECon (_, PConFfi {mod = m2, con = con2, ...}, _, NONE)) =>
|
adamc@930
|
131 if m1 = m2 andalso con1 = con2 then
|
adamc@930
|
132 Yes env
|
adamc@930
|
133 else
|
adamc@930
|
134 No
|
adamc@930
|
135
|
adamc@930
|
136 | (PCon (_, PConFfi {mod = m1, con = con1, ...}, _, SOME ep),
|
adamc@930
|
137 ECon (_, PConFfi {mod = m2, con = con2, ...}, _, SOME e)) =>
|
adamc@930
|
138 if m1 = m2 andalso con1 = con2 then
|
adamc@930
|
139 match (env, p, e)
|
adamc@930
|
140 else
|
adamc@930
|
141 No
|
adamc@930
|
142
|
adamc@930
|
143 | (PRecord xps, ERecord xes) =>
|
adamc@930
|
144 if List.exists (fn ((CName _, _), _, _) => false
|
adamc@930
|
145 | _ => true) xes then
|
adamc@930
|
146 Maybe
|
adamc@930
|
147 else
|
adamc@930
|
148 let
|
adamc@930
|
149 fun consider (xps, env) =
|
adamc@930
|
150 case xps of
|
adamc@930
|
151 [] => Yes env
|
adamc@930
|
152 | (x, p, _) :: rest =>
|
adamc@930
|
153 case List.find (fn ((CName x', _), _, _) => x' = x
|
adamc@930
|
154 | _ => false) xes of
|
adamc@930
|
155 NONE => No
|
adamc@930
|
156 | SOME (_, e, _) =>
|
adamc@930
|
157 case match (env, p, e) of
|
adamc@930
|
158 No => No
|
adamc@930
|
159 | Maybe => Maybe
|
adamc@930
|
160 | Yes env => consider (rest, env)
|
adamc@930
|
161 in
|
adamc@930
|
162 consider (xps, env)
|
adamc@930
|
163 end
|
adamc@930
|
164
|
adamc@930
|
165 | _ => Maybe
|
adamc@930
|
166
|
adamc@626
|
167 fun kindConAndExp (namedC, namedE) =
|
adamc@508
|
168 let
|
adamc@626
|
169 fun kind env (all as (k, loc)) =
|
adamc@626
|
170 case k of
|
adamc@626
|
171 KType => all
|
adamc@626
|
172 | KArrow (k1, k2) => (KArrow (kind env k1, kind env k2), loc)
|
adamc@626
|
173 | KName => all
|
adamc@626
|
174 | KRecord k => (KRecord (kind env k), loc)
|
adamc@626
|
175 | KUnit => all
|
adamc@626
|
176 | KTuple ks => (KTuple (map (kind env) ks), loc)
|
adamc@626
|
177
|
adamc@626
|
178 | KRel n =>
|
adamc@626
|
179 let
|
adamc@626
|
180 fun find (n', env, nudge, lift) =
|
adamc@626
|
181 case env of
|
adamc@626
|
182 [] => raise Fail "Reduce.kind: KRel"
|
adamc@626
|
183 | UnknownC :: rest => find (n', rest, nudge, lift)
|
adamc@626
|
184 | KnownC _ :: rest => find (n', rest, nudge, lift)
|
adamc@626
|
185 | UnknownE :: rest => find (n', rest, nudge, lift)
|
adamc@626
|
186 | KnownE _ :: rest => find (n', rest, nudge, lift)
|
adamc@626
|
187 | Lift (lift', _, _) :: rest => find (n', rest, nudge + lift', lift + lift')
|
adamc@626
|
188 | UnknownK :: rest =>
|
adamc@626
|
189 if n' = 0 then
|
adamc@626
|
190 (KRel (n + nudge), loc)
|
adamc@626
|
191 else
|
adamc@626
|
192 find (n' - 1, rest, nudge, lift + 1)
|
adamc@626
|
193 | KnownK k :: rest =>
|
adamc@626
|
194 if n' = 0 then
|
adamc@626
|
195 kind (Lift (lift, 0, 0) :: rest) k
|
adamc@626
|
196 else
|
adamc@626
|
197 find (n' - 1, rest, nudge - 1, lift)
|
adamc@626
|
198 in
|
adamc@626
|
199 find (n, env, 0, 0)
|
adamc@626
|
200 end
|
adamc@626
|
201 | KFun (x, k) => (KFun (x, kind (UnknownK :: env) k), loc)
|
adamc@626
|
202
|
adamc@508
|
203 fun con env (all as (c, loc)) =
|
adamc@510
|
204 ((*Print.prefaces "con" [("c", CorePrint.p_con CoreEnv.empty all)];*)
|
adamc@508
|
205 case c of
|
adamc@508
|
206 TFun (c1, c2) => (TFun (con env c1, con env c2), loc)
|
adamc@626
|
207 | TCFun (x, k, c2) => (TCFun (x, kind env k, con (UnknownC :: env) c2), loc)
|
adamc@626
|
208 | TKFun (x, c2) => (TKFun (x, con (UnknownK :: env) c2), loc)
|
adamc@508
|
209 | TRecord c => (TRecord (con env c), loc)
|
adamc@215
|
210
|
adamc@508
|
211 | CRel n =>
|
adamc@508
|
212 let
|
adamc@626
|
213 fun find (n', env, nudge, liftK, liftC) =
|
adamc@510
|
214 case env of
|
adamc@510
|
215 [] => raise Fail "Reduce.con: CRel"
|
adamc@626
|
216 | UnknownK :: rest => find (n', rest, nudge, liftK + 1, liftC)
|
adamc@626
|
217 | KnownK _ :: rest => find (n', rest, nudge, liftK, liftC)
|
adamc@626
|
218 | UnknownE :: rest => find (n', rest, nudge, liftK, liftC)
|
adamc@626
|
219 | KnownE _ :: rest => find (n', rest, nudge, liftK, liftC)
|
adamc@626
|
220 | Lift (liftK', liftC', _) :: rest => find (n', rest, nudge + liftC',
|
adamc@626
|
221 liftK + liftK', liftC + liftC')
|
adamc@510
|
222 | UnknownC :: rest =>
|
adamc@510
|
223 if n' = 0 then
|
adamc@510
|
224 (CRel (n + nudge), loc)
|
adamc@510
|
225 else
|
adamc@626
|
226 find (n' - 1, rest, nudge, liftK, liftC + 1)
|
adamc@510
|
227 | KnownC c :: rest =>
|
adamc@510
|
228 if n' = 0 then
|
adamc@626
|
229 con (Lift (liftK, liftC, 0) :: rest) c
|
adamc@510
|
230 else
|
adamc@626
|
231 find (n' - 1, rest, nudge - 1, liftK, liftC)
|
adamc@508
|
232 in
|
adamc@510
|
233 (*print (Int.toString n ^ ": " ^ e2s env ^ "\n");*)
|
adamc@626
|
234 find (n, env, 0, 0, 0)
|
adamc@508
|
235 end
|
adamc@508
|
236 | CNamed n =>
|
adamc@508
|
237 (case IM.find (namedC, n) of
|
adamc@508
|
238 NONE => all
|
adamc@508
|
239 | SOME c => c)
|
adamc@508
|
240 | CFfi _ => all
|
adamc@508
|
241 | CApp (c1, c2) =>
|
adamc@508
|
242 let
|
adamc@508
|
243 val c1 = con env c1
|
adamc@508
|
244 val c2 = con env c2
|
adamc@508
|
245 in
|
adamc@508
|
246 case #1 c1 of
|
adamc@508
|
247 CAbs (_, _, b) =>
|
adamc@510
|
248 con (KnownC c2 :: deKnown env) b
|
adamc@215
|
249
|
adamc@621
|
250 | CApp ((CMap (dom, ran), _), f) =>
|
adamc@508
|
251 (case #1 c2 of
|
adamc@626
|
252 CRecord (_, []) => (CRecord (kind env ran, []), loc)
|
adamc@621
|
253 | CRecord (_, (x, c) :: rest) =>
|
adamc@510
|
254 con (deKnown env)
|
adamc@621
|
255 (CConcat ((CRecord (ran, [(x, (CApp (f, c), loc))]), loc),
|
adamc@626
|
256 (CApp (c1, (CRecord (kind env dom, rest), loc)), loc)), loc)
|
adamc@508
|
257 | _ => (CApp (c1, c2), loc))
|
adamc@20
|
258
|
adamc@508
|
259 | _ => (CApp (c1, c2), loc)
|
adamc@508
|
260 end
|
adamc@626
|
261 | CAbs (x, k, b) => (CAbs (x, kind env k, con (UnknownC :: env) b), loc)
|
adamc@626
|
262
|
adamc@626
|
263 | CKApp (c1, k) =>
|
adamc@626
|
264 let
|
adamc@626
|
265 val c1 = con env c1
|
adamc@626
|
266 in
|
adamc@626
|
267 case #1 c1 of
|
adamc@626
|
268 CKAbs (_, b) =>
|
adamc@626
|
269 con (KnownK k :: deKnown env) b
|
adamc@626
|
270
|
adamc@626
|
271 | _ => (CKApp (c1, kind env k), loc)
|
adamc@626
|
272 end
|
adamc@626
|
273 | CKAbs (x, b) => (CKAbs (x, con (UnknownK :: env) b), loc)
|
adamc@20
|
274
|
adamc@508
|
275 | CName _ => all
|
adamc@21
|
276
|
adamc@626
|
277 | CRecord (k, xcs) => (CRecord (kind env k, map (fn (x, c) => (con env x, con env c)) xcs), loc)
|
adamc@508
|
278 | CConcat (c1, c2) =>
|
adamc@508
|
279 let
|
adamc@508
|
280 val c1 = con env c1
|
adamc@508
|
281 val c2 = con env c2
|
adamc@508
|
282 in
|
adamc@508
|
283 case (#1 c1, #1 c2) of
|
adamc@508
|
284 (CRecord (k, xcs1), CRecord (_, xcs2)) =>
|
adamc@626
|
285 (CRecord (kind env k, xcs1 @ xcs2), loc)
|
adamc@508
|
286 | _ => (CConcat (c1, c2), loc)
|
adamc@508
|
287 end
|
adamc@626
|
288 | CMap (dom, ran) => (CMap (kind env dom, kind env ran), loc)
|
adamc@74
|
289
|
adamc@508
|
290 | CUnit => all
|
adamc@21
|
291
|
adamc@508
|
292 | CTuple cs => (CTuple (map (con env) cs), loc)
|
adamc@508
|
293 | CProj (c, n) =>
|
adamc@508
|
294 let
|
adamc@508
|
295 val c = con env c
|
adamc@508
|
296 in
|
adamc@508
|
297 case #1 c of
|
adamc@508
|
298 CTuple cs => List.nth (cs, n - 1)
|
adamc@508
|
299 | _ => (CProj (c, n), loc)
|
adamc@510
|
300 end)
|
adamc@22
|
301
|
adamc@509
|
302 fun patCon pc =
|
adamc@509
|
303 case pc of
|
adamc@509
|
304 PConVar _ => pc
|
adamc@509
|
305 | PConFfi {mod = m, datatyp, params, con = c, arg, kind} =>
|
adamc@509
|
306 PConFfi {mod = m, datatyp = datatyp, params = params, con = c,
|
adamc@509
|
307 arg = Option.map (con (map (fn _ => UnknownC) params)) arg,
|
adamc@509
|
308 kind = kind}
|
adamc@509
|
309
|
adamc@509
|
310
|
adamc@509
|
311 val k = (KType, ErrorMsg.dummySpan)
|
adamc@509
|
312 fun doPart e (this as (x, t), rest) =
|
adamc@509
|
313 ((x, (EField (e, x, {field = t, rest = (CRecord (k, rest), #2 t)}), #2 t), t),
|
adamc@509
|
314 this :: rest)
|
adamc@509
|
315
|
adamc@509
|
316 fun exp env (all as (e, loc)) =
|
adamc@909
|
317 let
|
adamc@909
|
318 (*val () = Print.prefaces "exp" [("e", CorePrint.p_exp CoreEnv.empty all),
|
adamc@909
|
319 ("env", Print.PD.string (e2s env))]*)
|
adamc@910
|
320 val () = if dangling (edepth env) all then
|
adamc@909
|
321 (Print.prefaces "exp" [("e", CorePrint.p_exp CoreEnv.empty all),
|
adamc@909
|
322 ("env", Print.PD.string (e2s env))];
|
adamc@909
|
323 raise Fail "!")
|
adamc@909
|
324 else
|
adamc@910
|
325 ()
|
adamc@509
|
326
|
adamc@909
|
327 val r = case e of
|
adamc@909
|
328 EPrim _ => all
|
adamc@909
|
329 | ERel n =>
|
adamc@909
|
330 let
|
adamc@909
|
331 fun find (n', env, nudge, liftK, liftC, liftE) =
|
adamc@909
|
332 case env of
|
adamc@909
|
333 [] => raise Fail ("Reduce.exp: ERel (" ^ ErrorMsg.spanToString loc ^ ")")
|
adamc@909
|
334 | UnknownK :: rest => find (n', rest, nudge, liftK + 1, liftC, liftE)
|
adamc@909
|
335 | KnownK _ :: rest => find (n', rest, nudge, liftK, liftC, liftE)
|
adamc@909
|
336 | UnknownC :: rest => find (n', rest, nudge, liftK, liftC + 1, liftE)
|
adamc@909
|
337 | KnownC _ :: rest => find (n', rest, nudge, liftK, liftC, liftE)
|
adamc@909
|
338 | Lift (liftK', liftC', liftE') :: rest =>
|
adamc@909
|
339 find (n', rest, nudge + liftE',
|
adamc@909
|
340 liftK + liftK', liftC + liftC', liftE + liftE')
|
adamc@909
|
341 | UnknownE :: rest =>
|
adamc@909
|
342 if n' = 0 then
|
adamc@909
|
343 (ERel (n + nudge), loc)
|
adamc@909
|
344 else
|
adamc@909
|
345 find (n' - 1, rest, nudge, liftK, liftC, liftE + 1)
|
adamc@909
|
346 | KnownE e :: rest =>
|
adamc@909
|
347 if n' = 0 then
|
adamc@909
|
348 ((*print "SUBSTITUTING\n";*)
|
adamc@909
|
349 exp (Lift (liftK, liftC, liftE) :: rest) e)
|
adamc@909
|
350 else
|
adamc@909
|
351 find (n' - 1, rest, nudge - 1, liftK, liftC, liftE)
|
adamc@909
|
352 in
|
adamc@909
|
353 (*print (Int.toString n ^ ": " ^ e2s env ^ "\n");*)
|
adamc@909
|
354 find (n, env, 0, 0, 0, 0)
|
adamc@909
|
355 end
|
adamc@909
|
356 | ENamed n =>
|
adamc@909
|
357 (case IM.find (namedE, n) of
|
adamc@909
|
358 NONE => all
|
adamc@909
|
359 | SOME e => e)
|
adamc@909
|
360 | ECon (dk, pc, cs, eo) => (ECon (dk, patCon pc,
|
adamc@909
|
361 map (con env) cs, Option.map (exp env) eo), loc)
|
adamc@909
|
362 | EFfi _ => all
|
adamc@909
|
363 | EFfiApp (m, f, es) => (EFfiApp (m, f, map (exp env) es), loc)
|
adamc@908
|
364
|
adamc@909
|
365 (*| EApp (
|
adamc@909
|
366 (EApp
|
adamc@909
|
367 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), _), _), t1), _), t2), _),
|
adamc@909
|
368 (EFfi ("Basis", "transaction_monad"), _)), _),
|
adamc@909
|
369 (ECase (ed, pes, {disc, ...}), _)), _),
|
adamc@909
|
370 trans2) =>
|
adamc@909
|
371 let
|
adamc@909
|
372 val e' = (EFfi ("Basis", "bind"), loc)
|
adamc@909
|
373 val e' = (ECApp (e', (CFfi ("Basis", "transaction"), loc)), loc)
|
adamc@909
|
374 val e' = (ECApp (e', t1), loc)
|
adamc@909
|
375 val e' = (ECApp (e', t2), loc)
|
adamc@909
|
376 val e' = (EApp (e', (EFfi ("Basis", "transaction_monad"), loc)), loc)
|
adamc@908
|
377
|
adamc@909
|
378 val pes = map (fn (p, e) =>
|
adamc@909
|
379 let
|
adamc@909
|
380 val e' = (EApp (e', e), loc)
|
adamc@909
|
381 val e' = (EApp (e',
|
adamc@909
|
382 multiLiftExpInExp (E.patBindsN p)
|
adamc@909
|
383 trans2), loc)
|
adamc@909
|
384 val e' = exp env e'
|
adamc@909
|
385 in
|
adamc@909
|
386 (p, e')
|
adamc@909
|
387 end) pes
|
adamc@909
|
388 in
|
adamc@909
|
389 (ECase (exp env ed,
|
adamc@909
|
390 pes,
|
adamc@909
|
391 {disc = con env disc,
|
adamc@909
|
392 result = (CApp ((CFfi ("Basis", "transaction"), loc), con env t2), loc)}),
|
adamc@909
|
393 loc)
|
adamc@909
|
394 end*)
|
adamc@908
|
395
|
adamc@909
|
396 | EApp (e1, e2) =>
|
adamc@909
|
397 let
|
adamc@910
|
398 val env' = deKnown env
|
adamc@910
|
399
|
adamc@910
|
400 fun reassoc e =
|
adamc@910
|
401 case #1 e of
|
adamc@910
|
402 EApp
|
adamc@910
|
403 ((EApp
|
adamc@910
|
404 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), _), _),
|
adamc@910
|
405 t1),
|
adamc@910
|
406 _), t2), _),
|
adamc@910
|
407 (EFfi ("Basis", "transaction_monad"), _)), _),
|
adamc@910
|
408 (EServerCall (n, es, (EAbs (_, _, _, ke), _), dom, ran), _)), _),
|
adamc@910
|
409 trans3) =>
|
adamc@910
|
410 let
|
adamc@910
|
411 val e' = (EFfi ("Basis", "bind"), loc)
|
adamc@910
|
412 val e' = (ECApp (e', (CFfi ("Basis", "transaction"), loc)), loc)
|
adamc@910
|
413 val e' = (ECApp (e', dom), loc)
|
adamc@910
|
414 val e' = (ECApp (e', t2), loc)
|
adamc@910
|
415 val e' = (EApp (e', (EFfi ("Basis", "transaction_monad"), loc)), loc)
|
adamc@910
|
416 val e' = (EApp (e', ke), loc)
|
adamc@910
|
417 val e' = (EApp (e', E.liftExpInExp 0 trans3), loc)
|
adamc@910
|
418 val e' = reassoc e'
|
adamc@910
|
419 val e' = (EAbs ("x", dom, t2, e'), loc)
|
adamc@910
|
420 val e' = (EServerCall (n, es, e', dom, t2), loc)
|
adamc@910
|
421 in
|
adamc@910
|
422 e'
|
adamc@910
|
423 end
|
adamc@910
|
424
|
adamc@910
|
425 | EApp
|
adamc@910
|
426 ((EApp
|
adamc@910
|
427 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), _), _),
|
adamc@910
|
428 t1),
|
adamc@910
|
429 _), t2), _),
|
adamc@910
|
430 (EFfi ("Basis", "transaction_monad"), _)), _),
|
adamc@910
|
431 (EServerCall (n, es, ke, dom, ran), _)), _),
|
adamc@910
|
432 trans3) =>
|
adamc@910
|
433 let
|
adamc@910
|
434 val e' = (EFfi ("Basis", "bind"), loc)
|
adamc@910
|
435 val e' = (ECApp (e', (CFfi ("Basis", "transaction"), loc)), loc)
|
adamc@910
|
436 val e' = (ECApp (e', dom), loc)
|
adamc@910
|
437 val e' = (ECApp (e', t2), loc)
|
adamc@910
|
438 val e' = (EApp (e', (EFfi ("Basis", "transaction_monad"), loc)), loc)
|
adamc@910
|
439 val e' = (EApp (e', exp (UnknownE :: env')
|
adamc@910
|
440 (EApp (E.liftExpInExp 0 ke, (ERel 0, loc)), loc)),
|
adamc@910
|
441 loc)
|
adamc@910
|
442 val e' = (EApp (e', E.liftExpInExp 0 trans3), loc)
|
adamc@910
|
443 val e' = reassoc e'
|
adamc@910
|
444 val e' = (EAbs ("x", dom, t2, e'), loc)
|
adamc@910
|
445 val e' = (EServerCall (n, es, e', dom, t2), loc)
|
adamc@910
|
446 in
|
adamc@910
|
447 e'
|
adamc@910
|
448 end
|
adamc@910
|
449
|
adamc@910
|
450 | EApp
|
adamc@910
|
451 ((EApp
|
adamc@910
|
452 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), mt),
|
adamc@910
|
453 _), _), _), t3), _),
|
adamc@910
|
454 me), _),
|
adamc@910
|
455 (EApp ((EApp
|
adamc@910
|
456 ((EApp ((ECApp ((ECApp ((ECApp (
|
adamc@910
|
457 (EFfi ("Basis", "bind"), _), _), _),
|
adamc@910
|
458 t1), _), t2), _),
|
adamc@910
|
459 _), _),
|
adamc@910
|
460 trans1), _), (EAbs (_, _, _, trans2), _)), _)), _),
|
adamc@910
|
461 trans3) =>
|
adamc@910
|
462 let
|
adamc@910
|
463 val e'' = (EFfi ("Basis", "bind"), loc)
|
adamc@910
|
464 val e'' = (ECApp (e'', mt), loc)
|
adamc@910
|
465 val e'' = (ECApp (e'', t2), loc)
|
adamc@910
|
466 val e'' = (ECApp (e'', t3), loc)
|
adamc@910
|
467 val e'' = (EApp (e'', me), loc)
|
adamc@910
|
468 val e'' = (EApp (e'', trans2), loc)
|
adamc@910
|
469 val e'' = (EApp (e'', E.liftExpInExp 0 trans3), loc)
|
adamc@910
|
470 val e'' = reassoc e''
|
adamc@910
|
471 val e'' = (EAbs ("xb", t1, (CApp (mt, t3), loc), e''), loc)
|
adamc@910
|
472
|
adamc@910
|
473 val e' = (EFfi ("Basis", "bind"), loc)
|
adamc@910
|
474 val e' = (ECApp (e', mt), loc)
|
adamc@910
|
475 val e' = (ECApp (e', t1), loc)
|
adamc@910
|
476 val e' = (ECApp (e', t3), loc)
|
adamc@910
|
477 val e' = (EApp (e', me), loc)
|
adamc@910
|
478 val e' = (EApp (e', trans1), loc)
|
adamc@910
|
479 val e' = (EApp (e', e''), loc)
|
adamc@910
|
480 in
|
adamc@910
|
481 e'
|
adamc@910
|
482 end
|
adamc@910
|
483
|
adamc@910
|
484 | EApp
|
adamc@910
|
485 ((EApp
|
adamc@910
|
486 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), mt),
|
adamc@910
|
487 _), _), _), t3), _),
|
adamc@910
|
488 me), _),
|
adamc@910
|
489 (EApp ((EApp
|
adamc@910
|
490 ((EApp ((ECApp ((ECApp ((ECApp (
|
adamc@910
|
491 (EFfi ("Basis", "bind"), _), _), _),
|
adamc@910
|
492 t1), _), t2), _),
|
adamc@910
|
493 _), _),
|
adamc@910
|
494 trans1), _), trans2), _)), _),
|
adamc@910
|
495 trans3) =>
|
adamc@910
|
496 let
|
adamc@910
|
497 val e'' = (EFfi ("Basis", "bind"), loc)
|
adamc@910
|
498 val e'' = (ECApp (e'', mt), loc)
|
adamc@910
|
499 val e'' = (ECApp (e'', t2), loc)
|
adamc@910
|
500 val e'' = (ECApp (e'', t3), loc)
|
adamc@910
|
501 val e'' = (EApp (e'', me), loc)
|
adamc@910
|
502 val () = print "In2\n"
|
adamc@910
|
503 val e'' = (EApp (e'', exp (UnknownE :: env')
|
adamc@910
|
504 (EApp (E.liftExpInExp 0 trans2, (ERel 0, loc)),
|
adamc@910
|
505 loc)),
|
adamc@910
|
506 loc)
|
adamc@910
|
507 val () = print "Out2\n"
|
adamc@910
|
508 val e'' = (EApp (e'', E.liftExpInExp 0 trans3), loc)
|
adamc@910
|
509 val e'' = reassoc e''
|
adamc@910
|
510 val e'' = (EAbs ("xb", t1, (CApp (mt, t3), loc), e''), loc)
|
adamc@910
|
511
|
adamc@910
|
512 val e' = (EFfi ("Basis", "bind"), loc)
|
adamc@910
|
513 val e' = (ECApp (e', mt), loc)
|
adamc@910
|
514 val e' = (ECApp (e', t1), loc)
|
adamc@910
|
515 val e' = (ECApp (e', t3), loc)
|
adamc@910
|
516 val e' = (EApp (e', me), loc)
|
adamc@910
|
517 val e' = (EApp (e', trans1), loc)
|
adamc@910
|
518 val e' = (EApp (e', e''), loc)
|
adamc@910
|
519 in
|
adamc@910
|
520 e'
|
adamc@910
|
521 end
|
adamc@910
|
522
|
adamc@931
|
523 | EApp
|
adamc@931
|
524 ((EApp
|
adamc@931
|
525 ((EApp ((ECApp ((ECApp ((ECApp ((EFfi ("Basis", "bind"), loc), _), _),
|
adamc@931
|
526 t1),
|
adamc@931
|
527 _), t2), _),
|
adamc@931
|
528 (EFfi ("Basis", "transaction_monad"), _)), _),
|
adamc@931
|
529 (ECase (e, pes, {disc, ...}), _)), _), trans) =>
|
adamc@931
|
530 let
|
adamc@931
|
531 val e' = (EFfi ("Basis", "bind"), loc)
|
adamc@931
|
532 val e' = (ECApp (e', (CFfi ("Basis", "transaction"), loc)), loc)
|
adamc@931
|
533 val e' = (ECApp (e', t1), loc)
|
adamc@931
|
534 val e' = (ECApp (e', t2), loc)
|
adamc@931
|
535 val e' = (EApp (e', (EFfi ("Basis", "transaction_monad"), loc)), loc)
|
adamc@931
|
536
|
adamc@931
|
537 fun doCase (p, e) =
|
adamc@931
|
538 let
|
adamc@931
|
539 val e' = (EApp (e', e), loc)
|
adamc@931
|
540 val e' = (EApp (e',
|
adamc@931
|
541 multiLiftExpInExp (E.patBindsN p)
|
adamc@931
|
542 trans), loc)
|
adamc@931
|
543 in
|
adamc@931
|
544 (p, reassoc e')
|
adamc@931
|
545 end
|
adamc@931
|
546 in
|
adamc@931
|
547 (ECase (e, map doCase pes,
|
adamc@931
|
548 {disc = disc,
|
adamc@931
|
549 result = (CApp ((CFfi ("Basis", "transaction"), loc),
|
adamc@931
|
550 t2), loc)}), loc)
|
adamc@931
|
551 end
|
adamc@931
|
552
|
adamc@910
|
553 | _ => e
|
adamc@910
|
554
|
adamc@909
|
555 val e1 = exp env e1
|
adamc@909
|
556 val e2 = exp env e2
|
adamc@910
|
557 val e12 = reassoc (EApp (e1, e2), loc)
|
adamc@909
|
558 in
|
adamc@910
|
559 case #1 e12 of
|
adamc@910
|
560 EApp ((EAbs (_, _, _, b), _), e2) =>
|
adamc@931
|
561 exp (KnownE e2 :: env') b
|
adamc@910
|
562 | _ => e12
|
adamc@909
|
563 end
|
adamc@509
|
564
|
adamc@909
|
565 | EAbs (x, dom, ran, e) => (EAbs (x, con env dom, con env ran, exp (UnknownE :: env) e), loc)
|
adamc@509
|
566
|
adamc@909
|
567 | ECApp (e, c) =>
|
adamc@909
|
568 let
|
adamc@909
|
569 val e = exp env e
|
adamc@909
|
570 val c = con env c
|
adamc@909
|
571 in
|
adamc@909
|
572 case #1 e of
|
adamc@909
|
573 ECAbs (_, _, b) => exp (KnownC c :: deKnown env) b
|
adamc@909
|
574 | _ => (ECApp (e, c), loc)
|
adamc@909
|
575 end
|
adamc@626
|
576
|
adamc@909
|
577 | ECAbs (x, k, e) => (ECAbs (x, kind env k, exp (UnknownC :: env) e), loc)
|
adamc@626
|
578
|
adamc@909
|
579 | EKApp (e, k) =>
|
adamc@909
|
580 let
|
adamc@909
|
581 val e = exp env e
|
adamc@909
|
582 in
|
adamc@909
|
583 case #1 e of
|
adamc@909
|
584 EKAbs (_, b) => exp (KnownK k :: deKnown env) b
|
adamc@909
|
585 | _ => (EKApp (e, kind env k), loc)
|
adamc@909
|
586 end
|
adamc@509
|
587
|
adamc@909
|
588 | EKAbs (x, e) => (EKAbs (x, exp (UnknownK :: env) e), loc)
|
adamc@509
|
589
|
adamc@909
|
590 | ERecord xcs => (ERecord (map (fn (x, e, t) => (con env x, exp env e, con env t)) xcs), loc)
|
adamc@909
|
591 | EField (e, c, {field, rest}) =>
|
adamc@909
|
592 let
|
adamc@909
|
593 val e = exp env e
|
adamc@909
|
594 val c = con env c
|
adamc@509
|
595
|
adamc@909
|
596 fun default () = (EField (e, c, {field = con env field, rest = con env rest}), loc)
|
adamc@909
|
597 in
|
adamc@909
|
598 case (#1 e, #1 c) of
|
adamc@909
|
599 (ERecord xcs, CName x) =>
|
adamc@909
|
600 (case List.find (fn ((CName x', _), _, _) => x' = x | _ => false) xcs of
|
adamc@909
|
601 NONE => default ()
|
adamc@909
|
602 | SOME (_, e, _) => e)
|
adamc@909
|
603 | _ => default ()
|
adamc@909
|
604 end
|
adamc@509
|
605
|
adamc@909
|
606 | EConcat (e1, c1, e2, c2) =>
|
adamc@909
|
607 let
|
adamc@909
|
608 val e1 = exp env e1
|
adamc@909
|
609 val e2 = exp env e2
|
adamc@909
|
610 in
|
adamc@909
|
611 case (#1 e1, #1 e2) of
|
adamc@909
|
612 (ERecord xes1, ERecord xes2) => (ERecord (xes1 @ xes2), loc)
|
adamc@909
|
613 | _ =>
|
adamc@909
|
614 let
|
adamc@909
|
615 val c1 = con env c1
|
adamc@909
|
616 val c2 = con env c2
|
adamc@909
|
617 in
|
adamc@909
|
618 case (#1 c1, #1 c2) of
|
adamc@909
|
619 (CRecord (k, xcs1), CRecord (_, xcs2)) =>
|
adamc@909
|
620 let
|
adamc@909
|
621 val (xes1, rest) = ListUtil.foldlMap (doPart e1) [] xcs1
|
adamc@909
|
622 val (xes2, _) = ListUtil.foldlMap (doPart e2) rest xcs2
|
adamc@909
|
623 in
|
adamc@909
|
624 exp (deKnown env) (ERecord (xes1 @ xes2), loc)
|
adamc@909
|
625 end
|
adamc@909
|
626 | _ => (EConcat (e1, c1, e2, c2), loc)
|
adamc@909
|
627 end
|
adamc@909
|
628 end
|
adamc@509
|
629
|
adamc@909
|
630 | ECut (e, c, {field, rest}) =>
|
adamc@909
|
631 let
|
adamc@909
|
632 val e = exp env e
|
adamc@909
|
633 val c = con env c
|
adamc@509
|
634
|
adamc@909
|
635 fun default () =
|
adamc@909
|
636 let
|
adamc@909
|
637 val rest = con env rest
|
adamc@909
|
638 in
|
adamc@909
|
639 case #1 rest of
|
adamc@909
|
640 CRecord (k, xcs) =>
|
adamc@909
|
641 let
|
adamc@909
|
642 val (xes, _) = ListUtil.foldlMap (doPart e) [] xcs
|
adamc@909
|
643 in
|
adamc@909
|
644 exp (deKnown env) (ERecord xes, loc)
|
adamc@909
|
645 end
|
adamc@909
|
646 | _ => (ECut (e, c, {field = con env field, rest = rest}), loc)
|
adamc@909
|
647 end
|
adamc@909
|
648 in
|
adamc@909
|
649 case (#1 e, #1 c) of
|
adamc@909
|
650 (ERecord xes, CName x) =>
|
adamc@909
|
651 if List.all (fn ((CName _, _), _, _) => true | _ => false) xes then
|
adamc@909
|
652 (ERecord (List.filter (fn ((CName x', _), _, _) => x' <> x
|
adamc@909
|
653 | _ => raise Fail "Reduce: ECut") xes), loc)
|
adamc@909
|
654 else
|
adamc@909
|
655 default ()
|
adamc@909
|
656 | _ => default ()
|
adamc@909
|
657 end
|
adamc@509
|
658
|
adamc@909
|
659 | ECutMulti (e, c, {rest}) =>
|
adamc@909
|
660 let
|
adamc@909
|
661 val e = exp env e
|
adamc@909
|
662 val c = con env c
|
adamc@509
|
663
|
adamc@909
|
664 fun default () =
|
adamc@909
|
665 let
|
adamc@909
|
666 val rest = con env rest
|
adamc@909
|
667 in
|
adamc@909
|
668 case #1 rest of
|
adamc@909
|
669 CRecord (k, xcs) =>
|
adamc@909
|
670 let
|
adamc@909
|
671 val (xes, _) = ListUtil.foldlMap (doPart e) [] xcs
|
adamc@909
|
672 in
|
adamc@909
|
673 exp (deKnown env) (ERecord xes, loc)
|
adamc@909
|
674 end
|
adamc@909
|
675 | _ => (ECutMulti (e, c, {rest = rest}), loc)
|
adamc@909
|
676 end
|
adamc@909
|
677 in
|
adamc@909
|
678 case (#1 e, #1 c) of
|
adamc@909
|
679 (ERecord xes, CRecord (_, xcs)) =>
|
adamc@909
|
680 if List.all (fn ((CName _, _), _, _) => true | _ => false) xes
|
adamc@909
|
681 andalso List.all (fn ((CName _, _), _) => true | _ => false) xcs then
|
adamc@909
|
682 (ERecord (List.filter (fn ((CName x', _), _, _) =>
|
adamc@909
|
683 List.all (fn ((CName x, _), _) => x' <> x
|
adamc@909
|
684 | _ => raise Fail "Reduce: ECutMulti [1]") xcs
|
adamc@909
|
685 | _ => raise Fail "Reduce: ECutMulti [2]") xes), loc)
|
adamc@909
|
686 else
|
adamc@909
|
687 default ()
|
adamc@909
|
688 | _ => default ()
|
adamc@909
|
689 end
|
adamc@823
|
690
|
adamc@909
|
691 | ECase (_, [((PRecord [], _), e)], _) => exp env e
|
adamc@909
|
692 | ECase (_, [((PWild, _), e)], _) => exp env e
|
adamc@509
|
693
|
adamc@909
|
694 | ECase (e, pes, {disc, result}) =>
|
adamc@909
|
695 let
|
adamc@909
|
696 fun patBinds (p, _) =
|
adamc@909
|
697 case p of
|
adamc@909
|
698 PWild => 0
|
adamc@909
|
699 | PVar _ => 1
|
adamc@909
|
700 | PPrim _ => 0
|
adamc@909
|
701 | PCon (_, _, _, NONE) => 0
|
adamc@909
|
702 | PCon (_, _, _, SOME p) => patBinds p
|
adamc@909
|
703 | PRecord xpts => foldl (fn ((_, p, _), n) => n + patBinds p) 0 xpts
|
adamc@509
|
704
|
adamc@909
|
705 fun pat (all as (p, loc)) =
|
adamc@909
|
706 case p of
|
adamc@909
|
707 PWild => all
|
adamc@909
|
708 | PVar (x, t) => (PVar (x, con env t), loc)
|
adamc@909
|
709 | PPrim _ => all
|
adamc@909
|
710 | PCon (dk, pc, cs, po) =>
|
adamc@909
|
711 (PCon (dk, patCon pc, map (con env) cs, Option.map pat po), loc)
|
adamc@909
|
712 | PRecord xpts => (PRecord (map (fn (x, p, t) => (x, pat p, con env t)) xpts), loc)
|
adamc@930
|
713
|
adamc@930
|
714 fun push () =
|
adamc@930
|
715 (ECase (exp env e,
|
adamc@930
|
716 map (fn (p, e) => (pat p,
|
adamc@930
|
717 exp (List.tabulate (patBinds p,
|
adamc@930
|
718 fn _ => UnknownE) @ env) e))
|
adamc@930
|
719 pes, {disc = con env disc, result = con env result}), loc)
|
adamc@930
|
720
|
adamc@930
|
721 fun search pes =
|
adamc@930
|
722 case pes of
|
adamc@930
|
723 [] => push ()
|
adamc@930
|
724 | (p, body) :: pes =>
|
adamc@930
|
725 case match (env, p, e) of
|
adamc@930
|
726 No => search pes
|
adamc@930
|
727 | Maybe => push ()
|
adamc@930
|
728 | Yes env' => exp env' body
|
adamc@909
|
729 in
|
adamc@930
|
730 search pes
|
adamc@909
|
731 end
|
adamc@509
|
732
|
adamc@909
|
733 | EWrite e => (EWrite (exp env e), loc)
|
adamc@909
|
734 | EClosure (n, es) => (EClosure (n, map (exp env) es), loc)
|
adamc@607
|
735
|
adamc@910
|
736 | ELet (x, t, e1, e2) =>
|
adamc@910
|
737 (ELet (x, con env t, exp env e1, exp (UnknownE :: env) e2), loc)
|
adamc@909
|
738
|
adamc@909
|
739 | EServerCall (n, es, e, t1, t2) => (EServerCall (n, map (exp env) es, exp env e,
|
adamc@909
|
740 con env t1, con env t2), loc)
|
adamc@909
|
741 in
|
adamc@909
|
742 (*if dangling (edepth' (deKnown env)) r then
|
adamc@909
|
743 (Print.prefaces "exp" [("e", CorePrint.p_exp CoreEnv.empty all),
|
adamc@909
|
744 ("r", CorePrint.p_exp CoreEnv.empty r)];
|
adamc@909
|
745 raise Fail "!!")
|
adamc@909
|
746 else
|
adamc@909
|
747 ();*)
|
adamc@909
|
748 r
|
adamc@909
|
749 end
|
adamc@417
|
750 in
|
adamc@626
|
751 {kind = kind, con = con, exp = exp}
|
adamc@417
|
752 end
|
adamc@21
|
753
|
adamc@626
|
754 fun kind namedC env k = #kind (kindConAndExp (namedC, IM.empty)) env k
|
adamc@626
|
755 fun con namedC env c = #con (kindConAndExp (namedC, IM.empty)) env c
|
adamc@626
|
756 fun exp (namedC, namedE) env e = #exp (kindConAndExp (namedC, namedE)) env e
|
adamc@20
|
757
|
adamc@508
|
758 fun reduce file =
|
adamc@508
|
759 let
|
adamc@508
|
760 fun doDecl (d as (_, loc), st as (namedC, namedE)) =
|
adamc@508
|
761 case #1 d of
|
adamc@508
|
762 DCon (x, n, k, c) =>
|
adamc@508
|
763 let
|
adamc@626
|
764 val k = kind namedC [] k
|
adamc@509
|
765 val c = con namedC [] c
|
adamc@508
|
766 in
|
adamc@508
|
767 ((DCon (x, n, k, c), loc),
|
adamc@508
|
768 (IM.insert (namedC, n, c), namedE))
|
adamc@508
|
769 end
|
adamc@807
|
770 | DDatatype dts =>
|
adamc@807
|
771 ((DDatatype (map (fn (x, n, ps, cs) =>
|
adamc@807
|
772 let
|
adamc@807
|
773 val env = map (fn _ => UnknownC) ps
|
adamc@807
|
774 in
|
adamc@807
|
775 (x, n, ps, map (fn (x, n, co) => (x, n, Option.map (con namedC env) co)) cs)
|
adamc@807
|
776 end) dts), loc),
|
adamc@807
|
777 st)
|
adamc@508
|
778 | DVal (x, n, t, e, s) =>
|
adamc@508
|
779 let
|
adamc@509
|
780 val t = con namedC [] t
|
adamc@509
|
781 val e = exp (namedC, namedE) [] e
|
adamc@508
|
782 in
|
adamc@508
|
783 ((DVal (x, n, t, e, s), loc),
|
adamc@508
|
784 (namedC, IM.insert (namedE, n, e)))
|
adamc@508
|
785 end
|
adamc@508
|
786 | DValRec vis =>
|
adamc@910
|
787 ((DValRec (map (fn (x, n, t, e, s) => (x, n, con namedC [] t,
|
adamc@910
|
788 exp (namedC, namedE) [] e, s)) vis), loc),
|
adamc@508
|
789 st)
|
adamc@508
|
790 | DExport _ => (d, st)
|
adamc@707
|
791 | DTable (s, n, c, s', pe, pc, ce, cc) => ((DTable (s, n, con namedC [] c, s',
|
adamc@707
|
792 exp (namedC, namedE) [] pe,
|
adamc@707
|
793 con namedC [] pc,
|
adamc@707
|
794 exp (namedC, namedE) [] ce,
|
adamc@707
|
795 con namedC [] cc), loc), st)
|
adamc@508
|
796 | DSequence _ => (d, st)
|
adamc@754
|
797 | DView (s, n, s', e, c) => ((DView (s, n, s', exp (namedC, namedE) [] e, con namedC [] c), loc), st)
|
adamc@508
|
798 | DDatabase _ => (d, st)
|
adamc@509
|
799 | DCookie (s, n, c, s') => ((DCookie (s, n, con namedC [] c, s'), loc), st)
|
adamc@720
|
800 | DStyle (s, n, s') => ((DStyle (s, n, s'), loc), st)
|
adamc@20
|
801
|
adamc@508
|
802 val (file, _) = ListUtil.foldlMap doDecl (IM.empty, IM.empty) file
|
adamc@508
|
803 in
|
adamc@508
|
804 file
|
adamc@508
|
805 end
|
adamc@20
|
806
|
adamc@20
|
807 end
|