Ur/Web: src/elaborate.sml annotate

annotate src/elaborate.sml @ 2248:e09c3dc102ef

Rewrite effectfulness analysis using MonoUtil.

author	Ziv Scully <ziv@mit.edu>
date	Sat, 15 Aug 2015 23:08:37 -0700
parents	f42fea631c1d
children	010ce27228f1

rev	line source
adam@2044	1 (* Copyright (c) 2008-2014, Adam Chlipala
adamc@445	2 * All rights reserved.
adamc@445	3 *
adamc@445	4 * Redistribution and use in source and binary forms, with or without
adamc@445	5 * modification, are permitted provided that the following conditions are met:
adamc@445	6 *
adamc@445	7 * - Redistributions of source code must retain the above copyright notice,
adamc@445	8 * this list of conditions and the following disclaimer.
adamc@445	9 * - Redistributions in binary form must reproduce the above copyright notice,
adamc@445	10 * this list of conditions and the following disclaimer in the documentation
adamc@445	11 * and/or other materials provided with the distribution.
adamc@445	12 * - The names of contributors may not be used to endorse or promote products
adamc@445	13 * derived from this software without specific prior written permission.
adamc@445	14 *
adamc@445	15 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
adamc@445	16 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
adamc@445	17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
adamc@445	18 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
adamc@445	19 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
adamc@445	20 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
adamc@445	21 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
adamc@445	22 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
adamc@445	23 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
adamc@445	24 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
adamc@445	25 * POSSIBILITY OF SUCH DAMAGE.
adamc@445	26 *)
adamc@403	27
adamc@403	28 structure Elaborate :> ELABORATE = struct
adamc@403	29
adamc@403	30 structure P = Prim
adamc@403	31 structure L = Source
adamc@403	32 structure L' = Elab
adamc@403	33 structure E = ElabEnv
adamc@403	34 structure U = ElabUtil
adamc@403	35 structure D = Disjoint
adamc@403	36
adamc@403	37 open Print
adamc@403	38 open ElabPrint
adamc@403	39 open ElabErr
adamc@403	40
adam@1531	41 val dumpTypes = ref false
adam@1745	42 val dumpTypesOnError = ref false
adam@1723	43 val unifyMore = ref false
adam@1733	44 val incremental = ref false
adam@1744	45 val verbose = ref false
adam@1531	46
adamc@819	47 structure IS = IntBinarySet
adamc@403	48 structure IM = IntBinaryMap
adamc@403	49
adamc@403	50 structure SK = struct
adamc@403	51 type ord_key = string
adamc@403	52 val compare = String.compare
adamc@403	53 end
adamc@403	54
adamc@403	55 structure SS = BinarySetFn(SK)
adamc@403	56 structure SM = BinaryMapFn(SK)
adamc@403	57
adamc@403	58 val basis_r = ref 0
adamc@633	59 val top_r = ref 0
adamc@403	60
adamc@403	61 fun elabExplicitness e =
adamc@403	62 case e of
adamc@403	63 L.Explicit => L'.Explicit
adamc@403	64 \| L.Implicit => L'.Implicit
adamc@403	65
adamc@403	66 fun occursKind r =
adamc@403	67 U.Kind.exists (fn L'.KUnif (_, _, r') => r = r'
adamc@403	68 \| _ => false)
adamc@403	69
adam@1639	70 fun validateCon env c =
adam@1639	71 (U.Con.appB {kind = fn env' => fn k => case k of
adam@1639	72 L'.KRel n => ignore (E.lookupKRel env' n)
adam@1639	73 \| L'.KUnif (_, _, r as ref (L'.KUnknown f)) =>
adam@1639	74 r := L'.KUnknown (fn k => f k andalso validateKind env' k)
adam@1639	75 \| _ => (),
adam@1639	76 con = fn env' => fn c => case c of
adam@1639	77 L'.CRel n => ignore (E.lookupCRel env' n)
adam@1639	78 \| L'.CNamed n => ignore (E.lookupCNamed env' n)
adam@1639	79 \| L'.CModProj (n, _, _) => ignore (E.lookupStrNamed env' n)
adam@1639	80 \| L'.CUnif (_, _, _, _, r as ref (L'.Unknown f)) =>
adam@1639	81 r := L'.Unknown (fn c => f c andalso validateCon env' c)
adam@1639	82 \| _ => (),
adam@1639	83 bind = fn (env', b) => case b of
adam@1639	84 U.Con.RelK x => E.pushKRel env' x
adam@1639	85 \| U.Con.RelC (x, k) => E.pushCRel env' x k
adam@1639	86 \| U.Con.NamedC (x, n, k, co) => E.pushCNamedAs env x n k co}
adam@1639	87 env c;
adam@1639	88 true)
adam@1639	89 handle _ => false
adam@1639	90
adam@1639	91 and validateKind env k = validateCon env (L'.CRecord (k, []), ErrorMsg.dummySpan)
adam@1639	92
adam@1719	93 exception KUnify' of E.env * kunify_error
adamc@403	94
adamc@623	95 fun unifyKinds' env (k1All as (k1, _)) (k2All as (k2, _)) =
adamc@403	96 let
adam@1719	97 fun err f = raise KUnify' (env, f (k1All, k2All))
adamc@403	98 in
adamc@403	99 case (k1, k2) of
adamc@403	100 (L'.KType, L'.KType) => ()
adamc@403	101 \| (L'.KUnit, L'.KUnit) => ()
adamc@403	102
adamc@403	103 \| (L'.KArrow (d1, r1), L'.KArrow (d2, r2)) =>
adamc@623	104 (unifyKinds' env d1 d2;
adamc@623	105 unifyKinds' env r1 r2)
adamc@403	106 \| (L'.KName, L'.KName) => ()
adamc@623	107 \| (L'.KRecord k1, L'.KRecord k2) => unifyKinds' env k1 k2
adamc@403	108 \| (L'.KTuple ks1, L'.KTuple ks2) =>
adamc@623	109 ((ListPair.appEq (fn (k1, k2) => unifyKinds' env k1 k2) (ks1, ks2))
adamc@403	110 handle ListPair.UnequalLengths => err KIncompatible)
adamc@403	111
adamc@623	112 \| (L'.KRel n1, L'.KRel n2) =>
adamc@623	113 if n1 = n2 then
adamc@623	114 ()
adamc@623	115 else
adamc@623	116 err KIncompatible
adamc@623	117 \| (L'.KFun (x, k1), L'.KFun (_, k2)) =>
adamc@623	118 unifyKinds' (E.pushKRel env x) k1 k2
adamc@623	119
adamc@403	120 \| (L'.KError, _) => ()
adamc@403	121 \| (_, L'.KError) => ()
adamc@403	122
adam@1639	123 \| (L'.KUnif (_, _, ref (L'.KKnown k1All)), _) => unifyKinds' env k1All k2All
adam@1639	124 \| (_, L'.KUnif (_, _, ref (L'.KKnown k2All))) => unifyKinds' env k1All k2All
adam@1639	125
adam@1639	126 \| (L'.KTupleUnif (_, _, ref (L'.KKnown k)), _) => unifyKinds' env k k2All
adam@1639	127 \| (_, L'.KTupleUnif (_, _, ref (L'.KKnown k))) => unifyKinds' env k1All k
adam@1639	128
adam@1639	129 \| (L'.KUnif (_, _, r1 as ref (L'.KUnknown f1)), L'.KUnif (_, _, r2 as ref (L'.KUnknown f2))) =>
adamc@403	130 if r1 = r2 then
adamc@403	131 ()
adamc@403	132 else
adam@1639	133 (r1 := L'.KKnown k2All;
adam@1639	134 r2 := L'.KUnknown (fn x => f1 x andalso f2 x))
adam@1639	135
adam@1639	136 \| (L'.KUnif (_, _, r as ref (L'.KUnknown f)), _) =>
adamc@403	137 if occursKind r k2All then
adamc@403	138 err KOccursCheckFailed
adam@1639	139 else if not (f k2All) then
adam@1639	140 err KScope
adamc@403	141 else
adam@1639	142 r := L'.KKnown k2All
adam@1639	143 \| (_, L'.KUnif (_, _, r as ref (L'.KUnknown f))) =>
adamc@403	144 if occursKind r k1All then
adamc@403	145 err KOccursCheckFailed
adam@1639	146 else if not (f k1All) then
adam@1639	147 err KScope
adamc@403	148 else
adam@1639	149 r := L'.KKnown k1All
adam@1639	150
adam@1639	151 \| (L'.KTupleUnif (_, nks, r as ref (L'.KUnknown f)), L'.KTuple ks) =>
adam@1639	152 if not (f k2All) then
adam@1639	153 err KScope
adam@1639	154 else
adam@1639	155 ((app (fn (n, k) => unifyKinds' env k (List.nth (ks, n-1))) nks;
adam@1639	156 r := L'.KKnown k2All)
adam@1639	157 handle Subscript => err KIncompatible)
adam@1639	158 \| (L'.KTuple ks, L'.KTupleUnif (_, nks, r as ref (L'.KUnknown f))) =>
adam@1639	159 if not (f k2All) then
adam@1639	160 err KScope
adam@1639	161 else
adam@1639	162 ((app (fn (n, k) => unifyKinds' env (List.nth (ks, n-1)) k) nks;
adam@1639	163 r := L'.KKnown k1All)
adam@1639	164 handle Subscript => err KIncompatible)
adam@1639	165 \| (L'.KTupleUnif (loc, nks1, r1 as ref (L'.KUnknown f1)), L'.KTupleUnif (_, nks2, r2 as ref (L'.KUnknown f2))) =>
adam@1302	166 let
adam@1302	167 val nks = foldl (fn (p as (n, k1), nks) =>
adam@1302	168 case ListUtil.search (fn (n', k2) =>
adam@1302	169 if n' = n then
adam@1302	170 SOME k2
adam@1302	171 else
adam@1302	172 NONE) nks2 of
adam@1302	173 NONE => p :: nks
adam@1302	174 \| SOME k2 => (unifyKinds' env k1 k2;
adam@1302	175 nks)) nks2 nks1
adam@1302	176
adam@1639	177 val k = (L'.KTupleUnif (loc, nks, ref (L'.KUnknown (fn x => f1 x andalso f2 x))), loc)
adam@1302	178 in
adam@1639	179 r1 := L'.KKnown k;
adam@1639	180 r2 := L'.KKnown k
adam@1302	181 end
adam@1302	182
adamc@403	183 \| _ => err KIncompatible
adamc@403	184 end
adamc@403	185
adam@1719	186 exception KUnify of L'.kind * L'.kind * E.env * kunify_error
adamc@403	187
adamc@623	188 fun unifyKinds env k1 k2 =
adamc@623	189 unifyKinds' env k1 k2
adam@1719	190 handle KUnify' (env', err) => raise KUnify (k1, k2, env', err)
adamc@403	191
adamc@403	192 fun checkKind env c k1 k2 =
adamc@623	193 unifyKinds env k1 k2
adam@1719	194 handle KUnify (k1, k2, env', err) =>
adam@1719	195 conError env (WrongKind (c, k1, k2, env', err))
adamc@403	196
adamc@403	197 val dummy = ErrorMsg.dummySpan
adamc@403	198
adamc@403	199 val ktype = (L'.KType, dummy)
adamc@403	200 val kname = (L'.KName, dummy)
adamc@403	201 val ktype_record = (L'.KRecord ktype, dummy)
adamc@403	202
adamc@403	203 val cerror = (L'.CError, dummy)
adamc@403	204 val kerror = (L'.KError, dummy)
adamc@403	205 val eerror = (L'.EError, dummy)
adamc@403	206 val sgnerror = (L'.SgnError, dummy)
adamc@403	207 val strerror = (L'.StrError, dummy)
adamc@403	208
adamc@403	209 val int = ref cerror
adamc@403	210 val float = ref cerror
adamc@403	211 val string = ref cerror
adamc@821	212 val char = ref cerror
adamc@403	213 val table = ref cerror
adamc@403	214
adam@1639	215
adamc@403	216 local
adamc@403	217 val count = ref 0
adamc@403	218 in
adamc@403	219
adamc@403	220 fun resetKunif () = count := 0
adamc@403	221
adam@1639	222 fun kunif' f loc =
adamc@403	223 let
adamc@403	224 val n = !count
adamc@403	225 val s = if n <= 26 then
adamc@403	226 str (chr (ord #"A" + n))
adamc@403	227 else
adamc@403	228 "U" ^ Int.toString (n - 26)
adamc@403	229 in
adamc@403	230 count := n + 1;
adam@1639	231 (L'.KUnif (loc, s, ref (L'.KUnknown f)), loc)
adamc@403	232 end
adamc@403	233
adam@1639	234 fun kunif env = kunif' (validateKind env)
adam@1639	235
adamc@403	236 end
adamc@403	237
adamc@403	238 local
adamc@403	239 val count = ref 0
adamc@403	240 in
adamc@403	241
adamc@403	242 fun resetCunif () = count := 0
adamc@403	243
adam@1639	244 fun cunif' f (loc, k) =
adamc@403	245 let
adamc@403	246 val n = !count
adamc@712	247 val s = if n < 26 then
adamc@403	248 str (chr (ord #"A" + n))
adamc@403	249 else
adamc@403	250 "U" ^ Int.toString (n - 26)
adamc@403	251 in
adamc@403	252 count := n + 1;
adam@1639	253 (L'.CUnif (0, loc, k, s, ref (L'.Unknown f)), loc)
adamc@403	254 end
adamc@403	255
adam@1639	256 fun cunif env = cunif' (validateCon env)
adam@1639	257
adamc@403	258 end
adamc@403	259
adamc@623	260 fun elabKind env (k, loc) =
adamc@403	261 case k of
adamc@403	262 L.KType => (L'.KType, loc)
adamc@623	263 \| L.KArrow (k1, k2) => (L'.KArrow (elabKind env k1, elabKind env k2), loc)
adamc@403	264 \| L.KName => (L'.KName, loc)
adamc@623	265 \| L.KRecord k => (L'.KRecord (elabKind env k), loc)
adamc@403	266 \| L.KUnit => (L'.KUnit, loc)
adamc@623	267 \| L.KTuple ks => (L'.KTuple (map (elabKind env) ks), loc)
adam@1639	268 \| L.KWild => kunif env loc
adamc@403	269
adamc@623	270 \| L.KVar s => (case E.lookupK env s of
adamc@623	271 NONE =>
adamc@623	272 (kindError env (UnboundKind (loc, s));
adamc@623	273 kerror)
adamc@623	274 \| SOME n => (L'.KRel n, loc))
adamc@623	275 \| L.KFun (x, k) => (L'.KFun (x, elabKind (E.pushKRel env x) k), loc)
adamc@623	276
adamc@621	277 fun mapKind (dom, ran, loc)=
adamc@621	278 (L'.KArrow ((L'.KArrow (dom, ran), loc),
adamc@621	279 (L'.KArrow ((L'.KRecord dom, loc),
adamc@621	280 (L'.KRecord ran, loc)), loc)), loc)
adamc@403	281
adamc@403	282 fun hnormKind (kAll as (k, _)) =
adamc@403	283 case k of
adam@1639	284 L'.KUnif (_, _, ref (L'.KKnown k)) => hnormKind k
adamc@403	285 \| _ => kAll
adamc@403	286
adamc@623	287 open ElabOps
adamc@623	288
adam@1639	289 fun elabConHead env (c as (_, loc)) k =
adamc@623	290 let
adamc@623	291 fun unravel (k, c) =
adamc@623	292 case hnormKind k of
adamc@623	293 (L'.KFun (x, k'), _) =>
adamc@623	294 let
adam@1639	295 val u = kunif env loc
adamc@623	296
adamc@623	297 val k'' = subKindInKind (0, u) k'
adamc@623	298 in
adamc@623	299 unravel (k'', (L'.CKApp (c, u), loc))
adamc@623	300 end
adamc@623	301 \| _ => (c, k)
adamc@623	302 in
adamc@623	303 unravel (k, c)
adamc@623	304 end
adamc@623	305
adamc@403	306 fun elabCon (env, denv) (c, loc) =
adamc@403	307 case c of
adamc@403	308 L.CAnnot (c, k) =>
adamc@403	309 let
adamc@623	310 val k' = elabKind env k
adamc@403	311 val (c', ck, gs) = elabCon (env, denv) c
adamc@403	312 in
adamc@403	313 checkKind env c' ck k';
adamc@403	314 (c', k', gs)
adamc@403	315 end
adamc@403	316
adamc@403	317 \| L.TFun (t1, t2) =>
adamc@403	318 let
adamc@403	319 val (t1', k1, gs1) = elabCon (env, denv) t1
adamc@403	320 val (t2', k2, gs2) = elabCon (env, denv) t2
adamc@403	321 in
adamc@403	322 checkKind env t1' k1 ktype;
adamc@403	323 checkKind env t2' k2 ktype;
adamc@403	324 ((L'.TFun (t1', t2'), loc), ktype, gs1 @ gs2)
adamc@403	325 end
adamc@403	326 \| L.TCFun (e, x, k, t) =>
adamc@403	327 let
adamc@403	328 val e' = elabExplicitness e
adamc@623	329 val k' = elabKind env k
adamc@403	330 val env' = E.pushCRel env x k'
adamc@403	331 val (t', tk, gs) = elabCon (env', D.enter denv) t
adamc@403	332 in
adamc@403	333 checkKind env t' tk ktype;
adamc@403	334 ((L'.TCFun (e', x, k', t'), loc), ktype, gs)
adamc@403	335 end
adamc@623	336 \| L.TKFun (x, t) =>
adamc@623	337 let
adamc@623	338 val env' = E.pushKRel env x
adamc@623	339 val (t', tk, gs) = elabCon (env', denv) t
adamc@623	340 in
adamc@623	341 checkKind env t' tk ktype;
adamc@623	342 ((L'.TKFun (x, t'), loc), ktype, gs)
adamc@623	343 end
adamc@628	344 \| L.TDisjoint (c1, c2, c) =>
adamc@403	345 let
adamc@403	346 val (c1', k1, gs1) = elabCon (env, denv) c1
adamc@403	347 val (c2', k2, gs2) = elabCon (env, denv) c2
adamc@403	348
adam@1639	349 val ku1 = kunif env loc
adam@1639	350 val ku2 = kunif env loc
adamc@403	351
adamc@628	352 val denv' = D.assert env denv (c1', c2')
adamc@403	353 val (c', k, gs4) = elabCon (env, denv') c
adamc@403	354 in
adamc@403	355 checkKind env c1' k1 (L'.KRecord ku1, loc);
adamc@403	356 checkKind env c2' k2 (L'.KRecord ku2, loc);
adam@1351	357 checkKind env c' k (L'.KType, loc);
adamc@403	358
adamc@628	359 ((L'.TDisjoint (c1', c2', c'), loc), k, gs1 @ gs2 @ gs4)
adamc@403	360 end
adamc@403	361 \| L.TRecord c =>
adamc@403	362 let
adamc@403	363 val (c', ck, gs) = elabCon (env, denv) c
adamc@403	364 val k = (L'.KRecord ktype, loc)
adamc@403	365 in
adamc@403	366 checkKind env c' ck k;
adamc@403	367 ((L'.TRecord c', loc), ktype, gs)
adamc@403	368 end
adamc@403	369
adamc@403	370 \| L.CVar ([], s) =>
adamc@403	371 (case E.lookupC env s of
adamc@403	372 E.NotBound =>
adamc@403	373 (conError env (UnboundCon (loc, s));
adamc@403	374 (cerror, kerror, []))
adamc@403	375 \| E.Rel (n, k) =>
adamc@623	376 let
adam@1639	377 val (c, k) = elabConHead env (L'.CRel n, loc) k
adamc@623	378 in
adamc@623	379 (c, k, [])
adamc@623	380 end
adamc@403	381 \| E.Named (n, k) =>
adamc@623	382 let
adam@1639	383 val (c, k) = elabConHead env (L'.CNamed n, loc) k
adamc@623	384 in
adamc@623	385 (c, k, [])
adamc@623	386 end)
adamc@403	387 \| L.CVar (m1 :: ms, s) =>
adamc@403	388 (case E.lookupStr env m1 of
adamc@403	389 NONE => (conError env (UnboundStrInCon (loc, m1));
adamc@403	390 (cerror, kerror, []))
adamc@403	391 \| SOME (n, sgn) =>
adamc@403	392 let
adamc@403	393 val (str, sgn) = foldl (fn (m, (str, sgn)) =>
adamc@403	394 case E.projectStr env {sgn = sgn, str = str, field = m} of
adamc@403	395 NONE => (conError env (UnboundStrInCon (loc, m));
adamc@403	396 (strerror, sgnerror))
adamc@403	397 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adamc@403	398 ((L'.StrVar n, loc), sgn) ms
adamc@403	399
adam@1717	400 val (c, k) = case E.projectCon env {sgn = sgn, str = str, field = s} of
adam@1717	401 NONE => (conError env (UnboundCon (loc, s));
adam@1717	402 (cerror, kerror))
adam@1717	403 \| SOME (k, _) => elabConHead env (L'.CModProj (n, ms, s), loc) k
adamc@403	404 in
adamc@987	405 (c, k, [])
adamc@403	406 end)
adamc@403	407
adamc@403	408 \| L.CApp (c1, c2) =>
adamc@403	409 let
adamc@403	410 val (c1', k1, gs1) = elabCon (env, denv) c1
adamc@403	411 val (c2', k2, gs2) = elabCon (env, denv) c2
adam@1639	412 val dom = kunif env loc
adam@1639	413 val ran = kunif env loc
adamc@403	414 in
adamc@403	415 checkKind env c1' k1 (L'.KArrow (dom, ran), loc);
adamc@403	416 checkKind env c2' k2 dom;
adamc@403	417 ((L'.CApp (c1', c2'), loc), ran, gs1 @ gs2)
adamc@403	418 end
adamc@403	419 \| L.CAbs (x, ko, t) =>
adamc@403	420 let
adamc@403	421 val k' = case ko of
adam@1639	422 NONE => kunif env loc
adamc@623	423 \| SOME k => elabKind env k
adamc@403	424 val env' = E.pushCRel env x k'
adamc@403	425 val (t', tk, gs) = elabCon (env', D.enter denv) t
adamc@403	426 in
adamc@403	427 ((L'.CAbs (x, k', t'), loc),
adamc@403	428 (L'.KArrow (k', tk), loc),
adamc@403	429 gs)
adamc@403	430 end
adamc@623	431 \| L.CKAbs (x, t) =>
adamc@623	432 let
adamc@623	433 val env' = E.pushKRel env x
adamc@623	434 val (t', tk, gs) = elabCon (env', denv) t
adamc@623	435 in
adamc@623	436 ((L'.CKAbs (x, t'), loc),
adamc@623	437 (L'.KFun (x, tk), loc),
adamc@623	438 gs)
adamc@623	439 end
adamc@403	440
adamc@403	441 \| L.CName s =>
adamc@403	442 ((L'.CName s, loc), kname, [])
adamc@403	443
adamc@403	444 \| L.CRecord xcs =>
adamc@403	445 let
adam@1639	446 val k = kunif env loc
adamc@403	447
adamc@403	448 val (xcs', gs) = ListUtil.foldlMap (fn ((x, c), gs) =>
adamc@403	449 let
adamc@403	450 val (x', xk, gs1) = elabCon (env, denv) x
adamc@403	451 val (c', ck, gs2) = elabCon (env, denv) c
adamc@403	452 in
adamc@403	453 checkKind env x' xk kname;
adamc@403	454 checkKind env c' ck k;
adamc@403	455 ((x', c'), gs1 @ gs2 @ gs)
adamc@403	456 end) [] xcs
adamc@403	457
adamc@403	458 val rc = (L'.CRecord (k, xcs'), loc)
adamc@403	459 (* Add duplicate field checking later. *)
adamc@403	460
adamc@403	461 fun prove (xcs, ds) =
adamc@403	462 case xcs of
adamc@403	463 [] => ds
adamc@403	464 \| xc :: rest =>
adamc@403	465 let
adamc@403	466 val r1 = (L'.CRecord (k, [xc]), loc)
adamc@403	467 val ds = foldl (fn (xc', ds) =>
adamc@403	468 let
adamc@403	469 val r2 = (L'.CRecord (k, [xc']), loc)
adamc@403	470 in
adamc@403	471 D.prove env denv (r1, r2, loc) @ ds
adamc@403	472 end)
adamc@403	473 ds rest
adamc@403	474 in
adamc@403	475 prove (rest, ds)
adamc@403	476 end
adamc@403	477 in
adamc@403	478 (rc, (L'.KRecord k, loc), prove (xcs', gs))
adamc@403	479 end
adamc@403	480 \| L.CConcat (c1, c2) =>
adamc@403	481 let
adamc@403	482 val (c1', k1, gs1) = elabCon (env, denv) c1
adamc@403	483 val (c2', k2, gs2) = elabCon (env, denv) c2
adam@1639	484 val ku = kunif env loc
adamc@403	485 val k = (L'.KRecord ku, loc)
adamc@403	486 in
adamc@403	487 checkKind env c1' k1 k;
adamc@403	488 checkKind env c2' k2 k;
adamc@403	489 ((L'.CConcat (c1', c2'), loc), k,
adamc@403	490 D.prove env denv (c1', c2', loc) @ gs1 @ gs2)
adamc@403	491 end
adamc@621	492 \| L.CMap =>
adamc@403	493 let
adam@1639	494 val dom = kunif env loc
adam@1639	495 val ran = kunif env loc
adamc@403	496 in
adamc@621	497 ((L'.CMap (dom, ran), loc),
adamc@621	498 mapKind (dom, ran, loc),
adamc@403	499 [])
adamc@403	500 end
adamc@403	501
adamc@403	502 \| L.CUnit => ((L'.CUnit, loc), (L'.KUnit, loc), [])
adamc@403	503
adamc@403	504 \| L.CTuple cs =>
adamc@403	505 let
adamc@403	506 val (cs', ks, gs) = foldl (fn (c, (cs', ks, gs)) =>
adamc@403	507 let
adamc@403	508 val (c', k, gs') = elabCon (env, denv) c
adamc@403	509 in
adamc@403	510 (c' :: cs', k :: ks, gs' @ gs)
adamc@403	511 end) ([], [], []) cs
adamc@403	512 in
adamc@403	513 ((L'.CTuple (rev cs'), loc), (L'.KTuple (rev ks), loc), gs)
adamc@403	514 end
adamc@403	515 \| L.CProj (c, n) =>
adamc@403	516 let
adamc@403	517 val (c', k, gs) = elabCon (env, denv) c
adam@1302	518
adam@1639	519 val k' = kunif env loc
adamc@403	520 in
adam@1302	521 if n <= 0 then
adam@1302	522 (conError env (ProjBounds (c', n));
adam@1302	523 (cerror, kerror, []))
adam@1302	524 else
adam@1639	525 (checkKind env c' k (L'.KTupleUnif (loc, [(n, k')], ref (L'.KUnknown (validateKind env))), loc);
adam@1302	526 ((L'.CProj (c', n), loc), k', gs))
adamc@403	527 end
adamc@403	528
adamc@403	529 \| L.CWild k =>
adamc@403	530 let
adamc@623	531 val k' = elabKind env k
adamc@403	532 in
adam@1639	533 (cunif env (loc, k'), k', [])
adamc@403	534 end
adamc@403	535
adamc@403	536 fun kunifsRemain k =
adamc@403	537 case k of
adam@1639	538 L'.KUnif (_, _, ref (L'.KUnknown _)) => true
adam@1639	539 \| L'.KTupleUnif (_, _, ref (L'.KUnknown _)) => true
adamc@403	540 \| _ => false
adamc@403	541 fun cunifsRemain c =
adamc@403	542 case c of
adam@1639	543 L'.CUnif (_, loc, k, _, r as ref (L'.Unknown _)) =>
adam@1326	544 (case #1 (hnormKind k) of
adam@1639	545 L'.KUnit => (r := L'.Known (L'.CUnit, loc); false)
adam@1584	546 \| _ => true)
adam@1584	547 \| _ => false
adamc@403	548
adamc@403	549 val kunifsInDecl = U.Decl.exists {kind = kunifsRemain,
adamc@403	550 con = fn _ => false,
adamc@403	551 exp = fn _ => false,
adamc@403	552 sgn_item = fn _ => false,
adamc@403	553 sgn = fn _ => false,
adamc@403	554 str = fn _ => false,
adamc@403	555 decl = fn _ => false}
adamc@403	556
adam@1584	557 val cunifsInDecl = U.Decl.exists {kind = fn _ => false,
adamc@403	558 con = cunifsRemain,
adam@1584	559 exp = fn _ => false,
adam@1584	560 sgn_item = fn _ => false,
adam@1584	561 sgn = fn _ => false,
adam@1584	562 str = fn _ => false,
adam@1584	563 decl = fn _ => false}
adamc@403	564
adamc@403	565 fun occursCon r =
adamc@403	566 U.Con.exists {kind = fn _ => false,
adam@1303	567 con = fn L'.CUnif (_, _, _, _, r') => r = r'
adamc@403	568 \| _ => false}
adamc@403	569
adam@1719	570 exception CUnify' of E.env * cunify_error
adamc@403	571
adamc@403	572 type record_summary = {
adamc@403	573 fields : (L'.con * L'.con) list,
adam@1639	574 unifs : (L'.con * L'.cunif ref) list,
adamc@403	575 others : L'.con list
adamc@403	576 }
adamc@403	577
adamc@403	578 fun summaryToCon {fields, unifs, others} =
adamc@403	579 let
adam@1626	580 fun concat (c1, c2) =
adam@1626	581 case #1 c1 of
adam@1626	582 L'.CRecord (_, []) => c2
adam@1626	583 \| _ => case #1 c2 of
adam@1626	584 L'.CRecord (_, []) => c1
adam@1626	585 \| _ => (L'.CConcat (c1, c2), dummy)
adam@1626	586
adamc@403	587 val c = (L'.CRecord (ktype, []), dummy)
adam@1626	588 val c = List.foldr concat c others
adam@1626	589 val c = List.foldr (fn ((c', _), c) => concat (c', c)) c unifs
adamc@403	590 in
adam@1626	591 concat ((L'.CRecord (ktype, fields), dummy), c)
adamc@403	592 end
adamc@403	593
adamc@403	594 fun p_summary env s = p_con env (summaryToCon s)
adamc@403	595
adam@1719	596 exception CUnify of L'.con * L'.con * E.env * cunify_error
adamc@403	597
adamc@403	598 fun kindof env (c, loc) =
adamc@403	599 case c of
adamc@403	600 L'.TFun _ => ktype
adamc@403	601 \| L'.TCFun _ => ktype
adamc@403	602 \| L'.TRecord _ => ktype
adamc@628	603 \| L'.TDisjoint _ => ktype
adamc@403	604
adamc@403	605 \| L'.CRel xn => #2 (E.lookupCRel env xn)
adamc@403	606 \| L'.CNamed xn => #2 (E.lookupCNamed env xn)
adamc@403	607 \| L'.CModProj (n, ms, x) =>
adamc@403	608 let
adamc@403	609 val (_, sgn) = E.lookupStrNamed env n
adamc@403	610 val (str, sgn) = foldl (fn (m, (str, sgn)) =>
adamc@403	611 case E.projectStr env {sgn = sgn, str = str, field = m} of
adamc@403	612 NONE => raise Fail "kindof: Unknown substructure"
adamc@403	613 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adamc@403	614 ((L'.StrVar n, loc), sgn) ms
adamc@403	615 in
adamc@403	616 case E.projectCon env {sgn = sgn, str = str, field = x} of
adamc@403	617 NONE => raise Fail "kindof: Unknown con in structure"
adamc@403	618 \| SOME (k, _) => k
adamc@403	619 end
adamc@403	620
adamc@403	621 \| L'.CApp (c, _) =>
adamc@403	622 (case hnormKind (kindof env c) of
adamc@403	623 (L'.KArrow (_, k), _) => k
adamc@403	624 \| (L'.KError, _) => kerror
adam@1719	625 \| k => raise CUnify' (env, CKindof (k, c, "arrow")))
adamc@403	626 \| L'.CAbs (x, k, c) => (L'.KArrow (k, kindof (E.pushCRel env x k) c), loc)
adamc@628	627
adamc@403	628
adamc@403	629 \| L'.CName _ => kname
adamc@403	630
adamc@403	631 \| L'.CRecord (k, _) => (L'.KRecord k, loc)
adamc@403	632 \| L'.CConcat (c, _) => kindof env c
adamc@621	633 \| L'.CMap (dom, ran) => mapKind (dom, ran, loc)
adamc@403	634
adamc@403	635 \| L'.CUnit => (L'.KUnit, loc)
adamc@403	636
adamc@403	637 \| L'.CTuple cs => (L'.KTuple (map (kindof env) cs), loc)
adamc@403	638 \| L'.CProj (c, n) =>
adamc@403	639 (case hnormKind (kindof env c) of
adamc@403	640 (L'.KTuple ks, _) => List.nth (ks, n - 1)
adam@1311	641 \| (L'.KUnif (_, _, r), _) =>
adam@1311	642 let
adam@1639	643 val ku = kunif env loc
adam@1639	644 val k = (L'.KTupleUnif (loc, [(n, ku)], r), loc)
adam@1311	645 in
adam@1639	646 r := L'.KKnown k;
adam@1311	647 k
adam@1311	648 end
adam@1311	649 \| (L'.KTupleUnif (_, nks, r), _) =>
adam@1311	650 (case ListUtil.search (fn (n', k) => if n' = n then SOME k else NONE) nks of
adam@1311	651 SOME k => k
adam@1311	652 \| NONE =>
adam@1311	653 let
adam@1639	654 val ku = kunif env loc
adam@1639	655 val k = (L'.KTupleUnif (loc, ((n, ku) :: nks), r), loc)
adam@1311	656 in
adam@1639	657 r := L'.KKnown k;
adam@1311	658 k
adam@1311	659 end)
adam@1719	660 \| k => raise CUnify' (env, CKindof (k, c, "tuple")))
adamc@403	661
adamc@403	662 \| L'.CError => kerror
adam@1303	663 \| L'.CUnif (_, _, k, _, _) => k
adamc@403	664
adamc@623	665 \| L'.CKAbs (x, c) => (L'.KFun (x, kindof (E.pushKRel env x) c), loc)
adamc@623	666 \| L'.CKApp (c, k) =>
adamc@623	667 (case hnormKind (kindof env c) of
adamc@623	668 (L'.KFun (_, k'), _) => subKindInKind (0, k) k'
adam@1719	669 \| k => raise CUnify' (env, CKindof (k, c, "kapp")))
adamc@623	670 \| L'.TKFun _ => ktype
adamc@403	671
adamc@621	672 exception GuessFailure
adamc@403	673
adamc@513	674 fun isUnitCon env (c, loc) =
adamc@513	675 case c of
adamc@513	676 L'.TFun _ => false
adamc@513	677 \| L'.TCFun _ => false
adamc@513	678 \| L'.TRecord _ => false
adamc@628	679 \| L'.TDisjoint _ => false
adamc@513	680
adam@1316	681 \| L'.CRel xn => #1 (hnormKind (#2 (E.lookupCRel env xn))) = L'.KUnit
adam@1316	682 \| L'.CNamed xn => #1 (hnormKind (#2 (E.lookupCNamed env xn))) = L'.KUnit
adamc@518	683 \| L'.CModProj (n, ms, x) => false
adamc@518	684 (*let
adamc@513	685 val (_, sgn) = E.lookupStrNamed env n
adamc@513	686 val (str, sgn) = foldl (fn (m, (str, sgn)) =>
adamc@513	687 case E.projectStr env {sgn = sgn, str = str, field = m} of
adamc@513	688 NONE => raise Fail "kindof: Unknown substructure"
adamc@513	689 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adamc@513	690 ((L'.StrVar n, loc), sgn) ms
adamc@513	691 in
adamc@513	692 case E.projectCon env {sgn = sgn, str = str, field = x} of
adamc@513	693 NONE => raise Fail "kindof: Unknown con in structure"
adamc@513	694 \| SOME ((k, _), _) => k = L'.KUnit
adamc@518	695 end*)
adamc@518	696
adamc@518	697 \| L'.CApp (c, _) => false
adamc@518	698 (*(case hnormKind (kindof env c) of
adamc@513	699 (L'.KArrow (_, k), _) => #1 k = L'.KUnit
adamc@513	700 \| (L'.KError, _) => false
adamc@518	701 \| k => raise CUnify' (CKindof (k, c, "arrow")))*)
adamc@513	702 \| L'.CAbs _ => false
adamc@513	703
adamc@513	704 \| L'.CName _ => false
adamc@513	705
adamc@513	706 \| L'.CRecord _ => false
adamc@513	707 \| L'.CConcat _ => false
adamc@621	708 \| L'.CMap _ => false
adamc@513	709
adamc@513	710 \| L'.CUnit => true
adamc@513	711
adamc@513	712 \| L'.CTuple _ => false
adamc@518	713 \| L'.CProj (c, n) => false
adamc@518	714 (*(case hnormKind (kindof env c) of
adamc@513	715 (L'.KTuple ks, _) => #1 (List.nth (ks, n - 1)) = L'.KUnit
adamc@518	716 \| k => raise CUnify' (CKindof (k, c, "tuple")))*)
adamc@513	717
adamc@513	718 \| L'.CError => false
adam@1316	719 \| L'.CUnif (_, _, k, _, _) => #1 (hnormKind k) = L'.KUnit
adamc@513	720
adamc@623	721 \| L'.CKAbs _ => false
adamc@623	722 \| L'.CKApp _ => false
adamc@623	723 \| L'.TKFun _ => false
adamc@623	724
adamc@709	725 val recdCounter = ref 0
adamc@709	726
adamc@713	727 val mayDelay = ref false
adamc@777	728 val delayedUnifs = ref ([] : (ErrorMsg.span * E.env * L'.kind * record_summary * record_summary) list)
adamc@777	729
adamc@830	730 val delayedExhaustives = ref ([] : (E.env * L'.con * L'.pat list * ErrorMsg.span) list)
adamc@830	731
adam@1304	732 exception CantSquish
adam@1304	733
adam@1304	734 fun squish by =
adam@1304	735 U.Con.mapB {kind = fn _ => fn k => k,
adam@1304	736 con = fn bound => fn c =>
adam@1304	737 case c of
adam@1304	738 L'.CRel xn =>
adam@1304	739 if xn < bound then
adam@1304	740 c
adam@1304	741 else if bound <= xn andalso xn < bound + by then
adam@1304	742 raise CantSquish
adam@1304	743 else
adam@1304	744 L'.CRel (xn - by)
adam@1304	745 \| L'.CUnif _ => raise CantSquish
adam@1304	746 \| _ => c,
adam@1304	747 bind = fn (bound, U.Con.RelC _) => bound + 1
adam@1304	748 \| (bound, _) => bound} 0
adam@1304	749
adam@1582	750 val reducedSummaries = ref (NONE : (Print.PD.pp_desc * Print.PD.pp_desc) option)
adam@1582	751
adamc@777	752 fun unifyRecordCons env (loc, c1, c2) =
adamc@403	753 let
adamc@403	754 fun rkindof c =
adamc@403	755 case hnormKind (kindof env c) of
adamc@403	756 (L'.KRecord k, _) => k
adamc@403	757 \| (L'.KError, _) => kerror
adam@1639	758 \| (L'.KUnif (_, _, r as ref (L'.KUnknown f)), _) =>
adamc@753	759 let
adam@1639	760 val k = kunif' f (#2 c)
adamc@753	761 in
adam@1639	762 r := L'.KKnown (L'.KRecord k, #2 c);
adamc@753	763 k
adamc@753	764 end
adam@1719	765 \| k => raise CUnify' (env, CKindof (k, c, "record"))
adamc@403	766
adamc@403	767 val k1 = rkindof c1
adamc@403	768 val k2 = rkindof c2
adamc@403	769
adamc@628	770 val r1 = recordSummary env c1
adamc@628	771 val r2 = recordSummary env c2
adamc@403	772 in
adamc@623	773 unifyKinds env k1 k2;
adamc@777	774 unifySummaries env (loc, k1, r1, r2)
adamc@403	775 end
adamc@403	776
adamc@777	777 and normalizeRecordSummary env (r : record_summary) =
adamc@777	778 recordSummary env (summaryToCon r)
adamc@777	779
adamc@628	780 and recordSummary env c =
adamc@403	781 let
adamc@628	782 val c = hnormCon env c
adamc@628	783
adamc@628	784 val sum =
adamc@403	785 case c of
adamc@628	786 (L'.CRecord (_, xcs), _) => {fields = xcs, unifs = [], others = []}
adamc@403	787 \| (L'.CConcat (c1, c2), _) =>
adamc@403	788 let
adamc@628	789 val s1 = recordSummary env c1
adamc@628	790 val s2 = recordSummary env c2
adamc@403	791 in
adamc@628	792 {fields = #fields s1 @ #fields s2,
adamc@628	793 unifs = #unifs s1 @ #unifs s2,
adamc@628	794 others = #others s1 @ #others s2}
adamc@403	795 end
adam@1639	796 \| (L'.CUnif (nl, _, _, _, ref (L'.Known c)), _) => recordSummary env (E.mliftConInCon nl c)
adam@1303	797 \| c' as (L'.CUnif (0, _, _, _, r), _) => {fields = [], unifs = [(c', r)], others = []}
adamc@628	798 \| c' => {fields = [], unifs = [], others = [c']}
adamc@403	799 in
adamc@628	800 sum
adamc@403	801 end
adamc@403	802
adamc@987	803 and consEq env loc (c1, c2) =
adamc@777	804 let
adamc@777	805 val mayDelay' = !mayDelay
adamc@777	806 in
adamc@777	807 (mayDelay := false;
adamc@987	808 unifyCons env loc c1 c2;
adamc@777	809 mayDelay := mayDelay';
adamc@777	810 true)
adamc@777	811 handle CUnify _ => (mayDelay := mayDelay'; false)
adamc@777	812 end
adamc@403	813
adamc@403	814 and consNeq env (c1, c2) =
adamc@628	815 case (#1 (hnormCon env c1), #1 (hnormCon env c2)) of
adamc@403	816 (L'.CName x1, L'.CName x2) => x1 <> x2
adamc@1093	817 \| (L'.CName _, L'.CRel _) => true
adamc@1093	818 \| (L'.CRel _, L'.CName _) => true
adamc@1093	819 \| (L'.CRel n1, L'.CRel n2) => n1 <> n2
adamc@1093	820 \| (L'.CRel _, L'.CNamed _) => true
adamc@1093	821 \| (L'.CNamed _, L'.CRel _) => true
adamc@1093	822 \| (L'.CRel _, L'.CModProj _) => true
adamc@1093	823 \| (L'.CModProj _, L'.CRel _) => true
adamc@1269	824 \| (L'.CModProj (_, _, n1), L'.CModProj (_, _, n2)) => n1 <> n2
adam@1589	825 \| (L'.CModProj _, L'.CName _) => true
adam@1589	826 \| (L'.CName _, L'.CModProj _) => true
adam@1589	827 \| (L'.CNamed _, L'.CName _) => true
adam@1589	828 \| (L'.CName _, L'.CNamed _) => true
adamc@403	829 \| _ => false
adamc@403	830
adamc@777	831 and unifySummaries env (loc, k, s1 : record_summary, s2 : record_summary) =
adamc@403	832 let
adam@1583	833 val () = reducedSummaries := NONE
adam@1583	834
adamc@848	835 (*val () = eprefaces "Summaries" [("loc", PD.string (ErrorMsg.spanToString loc)),
adam@1303	836 ("#1", p_summary env s1),
adam@1303	837 ("#2", p_summary env s2)]*)
adamc@403	838
adamc@403	839 fun eatMatching p (ls1, ls2) =
adamc@403	840 let
adamc@403	841 fun em (ls1, ls2, passed1) =
adamc@403	842 case ls1 of
adamc@403	843 [] => (rev passed1, ls2)
adamc@403	844 \| h1 :: t1 =>
adamc@403	845 let
adamc@403	846 fun search (ls2', passed2) =
adamc@403	847 case ls2' of
adamc@403	848 [] => em (t1, ls2, h1 :: passed1)
adamc@403	849 \| h2 :: t2 =>
adamc@403	850 if p (h1, h2) then
adamc@403	851 em (t1, List.revAppend (passed2, t2), passed1)
adamc@403	852 else
adamc@403	853 search (t2, h2 :: passed2)
adamc@403	854 in
adamc@403	855 search (ls2, [])
adamc@403	856 end
adamc@403	857 in
adamc@403	858 em (ls1, ls2, [])
adamc@403	859 end
adamc@403	860
adamc@403	861 val (fs1, fs2) = eatMatching (fn ((x1, c1), (x2, c2)) =>
adamc@403	862 not (consNeq env (x1, x2))
adamc@987	863 andalso consEq env loc (c1, c2)
adamc@987	864 andalso consEq env loc (x1, x2))
adamc@403	865 (#fields s1, #fields s2)
adamc@403	866 (*val () = eprefaces "Summaries2" [("#1", p_summary env {fields = fs1, unifs = #unifs s1, others = #others s1}),
adamc@403	867 ("#2", p_summary env {fields = fs2, unifs = #unifs s2, others = #others s2})]*)
adamc@646	868
adamc@403	869 val (unifs1, unifs2) = eatMatching (fn ((_, r1), (_, r2)) => r1 = r2) (#unifs s1, #unifs s2)
adamc@646	870
adam@1660	871 val hasUnifs = U.Con.exists {kind = fn _ => false,
adam@1660	872 con = fn L'.CUnif _ => true
adam@1660	873 \| _ => false}
adam@1657	874
adam@1657	875 val (others1, others2) = eatMatching (fn (c1, c2) =>
adam@1964	876 c1 = c2
adam@1964	877 orelse (not (hasUnifs c1 andalso hasUnifs c2)
adam@1964	878 andalso consEq env loc (c1, c2))) (#others s1, #others s2)
adamc@403	879 (*val () = eprefaces "Summaries3" [("#1", p_summary env {fields = fs1, unifs = unifs1, others = others1}),
adamc@403	880 ("#2", p_summary env {fields = fs2, unifs = unifs2, others = others2})]*)
adamc@403	881
adamc@709	882 fun unsummarize {fields, unifs, others} =
adamc@709	883 let
adamc@709	884 val c = (L'.CRecord (k, fields), loc)
adamc@709	885
adamc@709	886 val c = foldl (fn ((c1, _), c2) => (L'.CConcat (c1, c2), loc))
adamc@709	887 c unifs
adamc@709	888 in
adamc@709	889 foldl (fn (c1, c2) => (L'.CConcat (c1, c2), loc))
adamc@709	890 c others
adamc@709	891 end
adamc@709	892
adamc@710	893 val empties = ([], [], [], [], [], [])
adamc@710	894
adamc@709	895 val (unifs1, fs1, others1, unifs2, fs2, others2) =
adamc@709	896 case (unifs1, fs1, others1, unifs2, fs2, others2) of
adam@1639	897 orig as ([(_, r as ref (L'.Unknown f))], [], [], _, _, _) =>
adamc@709	898 let
adamc@709	899 val c = unsummarize {fields = fs2, others = others2, unifs = unifs2}
adamc@709	900 in
adam@1639	901 if occursCon r c orelse not (f c) then
adamc@709	902 orig
adamc@709	903 else
adam@1639	904 (r := L'.Known c;
adamc@710	905 empties)
adamc@709	906 end
adam@1639	907 \| orig as (_, _, _, [(_, r as ref (L'.Unknown f))], [], []) =>
adamc@709	908 let
adamc@709	909 val c = unsummarize {fields = fs1, others = others1, unifs = unifs1}
adamc@709	910 in
adam@1639	911 if occursCon r c orelse not (f c) then
adamc@709	912 orig
adamc@709	913 else
adam@1639	914 (r := L'.Known c;
adamc@710	915 empties)
adamc@709	916 end
adam@1639	917 \| orig as ([(_, r1 as ref (L'.Unknown f1))], _, [], [(_, r2 as ref (L'.Unknown f2))], _, []) =>
adamc@710	918 if List.all (fn (x1, _) => List.all (fn (x2, _) => consNeq env (x1, x2)) fs2) fs1 then
adamc@710	919 let
adamc@838	920 val kr = (L'.KRecord k, loc)
adam@1639	921 val u = cunif env (loc, kr)
adam@1639	922
adam@1639	923 val c1 = (L'.CConcat ((L'.CRecord (k, fs2), loc), u), loc)
adam@1639	924 val c2 = (L'.CConcat ((L'.CRecord (k, fs1), loc), u), loc)
adamc@710	925 in
adam@1639	926 if not (f1 c1) orelse not (f2 c2) then
adam@1639	927 orig
adam@1639	928 else
adam@1639	929 (r1 := L'.Known c1;
adam@1639	930 r2 := L'.Known c2;
adam@1639	931 empties)
adamc@710	932 end
adamc@710	933 else
adamc@710	934 orig
adamc@709	935 \| orig => orig
adamc@709	936
adamc@403	937 (*val () = eprefaces "Summaries4" [("#1", p_summary env {fields = fs1, unifs = unifs1, others = others1}),
adamc@777	938 ("#2", p_summary env {fields = fs2, unifs = unifs2, others = others2})]*)
adamc@403	939
adamc@753	940 fun isGuessable (other, fs, unifs) =
adamc@753	941 let
adamc@753	942 val c = (L'.CRecord (k, fs), loc)
adamc@753	943 val c = foldl (fn ((c', _), c) => (L'.CConcat (c', c), loc)) c unifs
adamc@753	944 in
adamc@987	945 (guessMap env loc (other, c, GuessFailure);
adamc@753	946 true)
adamc@753	947 handle GuessFailure => false
adamc@753	948 end
adamc@403	949
adamc@754	950 val (fs1, fs2, others1, others2, unifs1, unifs2) =
adamc@753	951 case (fs1, fs2, others1, others2, unifs1, unifs2) of
adamc@753	952 ([], _, [other1], [], [], _) =>
adamc@753	953 if isGuessable (other1, fs2, unifs2) then
adamc@754	954 ([], [], [], [], [], [])
adamc@403	955 else
adamc@754	956 (fs1, fs2, others1, others2, unifs1, unifs2)
adamc@753	957 \| (_, [], [], [other2], _, []) =>
adamc@777	958 if isGuessable (other2, fs1, unifs1) then
adamc@777	959 ([], [], [], [], [], [])
adamc@777	960 else
adamc@777	961 (fs1, fs2, others1, others2, unifs1, unifs2)
adamc@754	962 \| _ => (fs1, fs2, others1, others2, unifs1, unifs2)
adamc@403	963
adam@1582	964 val () = if !mayDelay then
adam@1582	965 ()
adam@1582	966 else
adam@1626	967 let
adam@1626	968 val c1 = summaryToCon {fields = fs1, unifs = unifs1, others = others1}
adam@1626	969 val c2 = summaryToCon {fields = fs2, unifs = unifs2, others = others2}
adam@1626	970 in
adam@1626	971 case (c1, c2) of
adam@1626	972 ((L'.CRecord (_, []), _), (L'.CRecord (_, []), _)) => reducedSummaries := NONE
adam@1626	973 \| _ => reducedSummaries := SOME (p_con env c1, p_con env c2)
adam@1626	974 end
adam@1582	975
adamc@403	976 (*val () = eprefaces "Summaries5" [("#1", p_summary env {fields = fs1, unifs = unifs1, others = others1}),
adamc@646	977 ("#2", p_summary env {fields = fs2, unifs = unifs2, others = others2})]*)
adamc@403	978
adamc@838	979 val empty = (L'.CRecord (k, []), loc)
adamc@1071	980 fun failure () =
adamc@1071	981 let
adamc@1071	982 val fs2 = #fields s2
adamc@1071	983
adamc@1071	984 fun findPointwise fs1 =
adamc@1071	985 case fs1 of
adamc@1071	986 [] => NONE
adamc@1071	987 \| (nm1, c1) :: fs1 =>
adamc@1071	988 case List.find (fn (nm2, _) => consEq env loc (nm1, nm2)) fs2 of
adamc@1071	989 NONE => findPointwise fs1
adamc@1071	990 \| SOME (_, c2) =>
adamc@1071	991 if consEq env loc (c1, c2) then
adamc@1071	992 findPointwise fs1
adamc@1071	993 else
adam@1588	994 SOME (nm1, c1, c2, (unifyCons env loc c1 c2; NONE)
adam@1719	995 handle CUnify (_, _, env', err) => (reducedSummaries := NONE;
adam@1719	996 SOME (env', err)))
adamc@1071	997 in
adam@1719	998 raise CUnify' (env, CRecordFailure (unsummarize s1, unsummarize s2, findPointwise (#fields s1)))
adamc@1071	999 end
adam@1341	1000
adam@1341	1001 fun default () = if !mayDelay then
adam@1341	1002 delayedUnifs := (loc, env, k, s1, s2) :: !delayedUnifs
adam@1341	1003 else
adam@1341	1004 failure ()
adamc@709	1005 in
adamc@777	1006 (case (unifs1, fs1, others1, unifs2, fs2, others2) of
adamc@777	1007 (_, [], [], [], [], []) =>
adam@1639	1008 app (fn (_, r) => r := L'.Known empty) unifs1
adamc@777	1009 \| ([], [], [], _, [], []) =>
adam@1639	1010 app (fn (_, r) => r := L'.Known empty) unifs2
adam@1639	1011 \| (_, _, _, [], [], [cr as (L'.CUnif (nl, _, _, _, r as ref (L'.Unknown f)), _)]) =>
adam@1341	1012 let
adam@1341	1013 val c = summaryToCon {fields = fs1, unifs = unifs1, others = others1}
adam@1341	1014 in
adam@1341	1015 if occursCon r c then
adam@1588	1016 (reducedSummaries := NONE;
adam@1719	1017 raise CUnify' (env, COccursCheckFailed (cr, c)))
adam@1341	1018 else
adam@1639	1019 let
adam@1639	1020 val sq = squish nl c
adam@1639	1021 in
adam@1639	1022 if not (f sq) then
adam@1639	1023 default ()
adam@1639	1024 else
adam@1639	1025 r := L'.Known sq
adam@1639	1026 end
adam@1341	1027 handle CantSquish => default ()
adam@1341	1028 end
adam@1639	1029 \| ([], [], [cr as (L'.CUnif (nl, _, _, _, r as ref (L'.Unknown f)), _)], _, _, _) =>
adam@1341	1030 let
adam@1341	1031 val c = summaryToCon {fields = fs2, unifs = unifs2, others = others2}
adam@1341	1032 in
adam@1341	1033 if occursCon r c then
adam@1588	1034 (reducedSummaries := NONE;
adam@1719	1035 raise CUnify' (env, COccursCheckFailed (cr, c)))
adam@1341	1036 else
adam@1639	1037 let
adam@1639	1038 val sq = squish nl c
adam@1639	1039 in
adam@1639	1040 if not (f sq) then
adam@1639	1041 default ()
adam@1639	1042 else
adam@1639	1043 r := L'.Known sq
adam@1639	1044 end
adam@1341	1045 handle CantSquish => default ()
adam@1341	1046 end
adam@1341	1047 \| _ => default ())
adam@1341	1048
adamc@777	1049 (*before eprefaces "Summaries'" [("#1", p_summary env (normalizeRecordSummary env s1)),
adamc@777	1050 ("#2", p_summary env (normalizeRecordSummary env s2))]*)
adamc@403	1051 end
adamc@403	1052
adamc@987	1053 and guessMap env loc (c1, c2, ex) =
adamc@403	1054 let
adamc@621	1055 fun unfold (dom, ran, f, r, c) =
adamc@403	1056 let
adamc@621	1057 fun unfold (r, c) =
adamc@754	1058 case #1 (hnormCon env c) of
adamc@987	1059 L'.CRecord (_, []) => unifyCons env loc r (L'.CRecord (dom, []), loc)
adamc@628	1060 \| L'.CRecord (_, [(x, v)]) =>
adamc@628	1061 let
adamc@628	1062 val v' = case dom of
adamc@628	1063 (L'.KUnit, _) => (L'.CUnit, loc)
adam@1639	1064 \| _ => cunif env (loc, dom)
adamc@628	1065 in
adamc@987	1066 unifyCons env loc v (L'.CApp (f, v'), loc);
adamc@987	1067 unifyCons env loc r (L'.CRecord (dom, [(x, v')]), loc)
adamc@628	1068 end
adamc@628	1069 \| L'.CRecord (_, (x, v) :: rest) =>
adamc@628	1070 let
adam@1639	1071 val r1 = cunif env (loc, (L'.KRecord dom, loc))
adam@1639	1072 val r2 = cunif env (loc, (L'.KRecord dom, loc))
adamc@628	1073 in
adamc@628	1074 unfold (r1, (L'.CRecord (ran, [(x, v)]), loc));
adamc@628	1075 unfold (r2, (L'.CRecord (ran, rest), loc));
adamc@987	1076 unifyCons env loc r (L'.CConcat (r1, r2), loc)
adamc@628	1077 end
adamc@628	1078 \| L'.CConcat (c1', c2') =>
adamc@628	1079 let
adam@1639	1080 val r1 = cunif env (loc, (L'.KRecord dom, loc))
adam@1639	1081 val r2 = cunif env (loc, (L'.KRecord dom, loc))
adamc@628	1082 in
adamc@628	1083 unfold (r1, c1');
adamc@628	1084 unfold (r2, c2');
adamc@987	1085 unifyCons env loc r (L'.CConcat (r1, r2), loc)
adamc@628	1086 end
adam@1639	1087 \| L'.CUnif (0, _, _, _, ur as ref (L'.Unknown rf)) =>
adam@1639	1088 let
adam@1639	1089 val c' = (L'.CApp ((L'.CApp ((L'.CMap (dom, ran), loc), f), loc), r), loc)
adam@1639	1090 in
adam@1639	1091 if not (rf c') then
adam@1639	1092 cunifyError env (CScope (c, c'))
adam@1639	1093 else
adam@1639	1094 ur := L'.Known c'
adam@1639	1095 end
adamc@628	1096 \| _ => raise ex
adamc@403	1097 in
adamc@621	1098 unfold (r, c)
adamc@403	1099 end
adamc@632	1100 handle _ => raise ex
adamc@403	1101 in
adamc@403	1102 case (#1 c1, #1 c2) of
adamc@621	1103 (L'.CApp ((L'.CApp ((L'.CMap (dom, ran), _), f), _), r), _) =>
adamc@621	1104 unfold (dom, ran, f, r, c2)
adamc@621	1105 \| (_, L'.CApp ((L'.CApp ((L'.CMap (dom, ran), _), f), _), r)) =>
adamc@621	1106 unfold (dom, ran, f, r, c1)
adamc@403	1107 \| _ => raise ex
adamc@403	1108 end
adamc@403	1109
adamc@987	1110 and unifyCons' env loc c1 c2 =
adamc@628	1111 if isUnitCon env c1 andalso isUnitCon env c2 then
adamc@628	1112 ()
adamc@628	1113 else
adamc@403	1114 let
adamc@628	1115 (*val befor = Time.now ()
adamc@628	1116 val old1 = c1
adamc@628	1117 val old2 = c2*)
adamc@628	1118 val c1 = hnormCon env c1
adamc@628	1119 val c2 = hnormCon env c2
adamc@403	1120 in
adamc@987	1121 unifyCons'' env loc c1 c2
adamc@987	1122 handle ex => guessMap env loc (c1, c2, ex)
adamc@403	1123 end
adamc@628	1124
adamc@987	1125 and unifyCons'' env loc (c1All as (c1, _)) (c2All as (c2, _)) =
adamc@403	1126 let
adam@1719	1127 fun err f = raise CUnify' (env, f (c1All, c2All))
adamc@403	1128
adamc@706	1129 fun projSpecial1 (c1, n1, onFail) =
adamc@403	1130 let
adamc@632	1131 fun trySnd () =
adamc@632	1132 case #1 (hnormCon env c2All) of
adamc@632	1133 L'.CProj (c2, n2) =>
adamc@632	1134 let
adamc@632	1135 fun tryNormal () =
adamc@632	1136 if n1 = n2 then
adamc@987	1137 unifyCons' env loc c1 c2
adamc@632	1138 else
adamc@706	1139 onFail ()
adamc@632	1140 in
adamc@632	1141 case #1 (hnormCon env c2) of
adam@1639	1142 L'.CUnif (0, _, k, _, r as ref (L'.Unknown f)) =>
adamc@632	1143 (case #1 (hnormKind k) of
adamc@632	1144 L'.KTuple ks =>
adamc@632	1145 let
adamc@632	1146 val loc = #2 c2
adam@1639	1147 val us = map (fn k => cunif' f (loc, k)) ks
adamc@632	1148 in
adam@1639	1149 r := L'.Known (L'.CTuple us, loc);
adamc@987	1150 unifyCons' env loc c1All (List.nth (us, n2 - 1))
adamc@632	1151 end
adamc@632	1152 \| _ => tryNormal ())
adamc@632	1153 \| _ => tryNormal ()
adamc@632	1154 end
adamc@706	1155 \| _ => onFail ()
adamc@403	1156 in
adamc@632	1157 case #1 (hnormCon env c1) of
adam@1639	1158 L'.CUnif (0, _, k, _, r as ref (L'.Unknown f)) =>
adamc@632	1159 (case #1 (hnormKind k) of
adamc@632	1160 L'.KTuple ks =>
adamc@632	1161 let
adamc@632	1162 val loc = #2 c1
adam@1639	1163 val us = map (fn k => cunif' f (loc, k)) ks
adamc@632	1164 in
adam@1639	1165 r := L'.Known (L'.CTuple us, loc);
adamc@987	1166 unifyCons' env loc (List.nth (us, n1 - 1)) c2All
adamc@632	1167 end
adamc@632	1168 \| _ => trySnd ())
adamc@632	1169 \| _ => trySnd ()
adamc@403	1170 end
adamc@632	1171
adamc@706	1172 fun projSpecial2 (c2, n2, onFail) =
adamc@706	1173 case #1 (hnormCon env c2) of
adam@1639	1174 L'.CUnif (0, _, k, _, r as ref (L'.Unknown f)) =>
adamc@706	1175 (case #1 (hnormKind k) of
adamc@706	1176 L'.KTuple ks =>
adamc@706	1177 let
adamc@706	1178 val loc = #2 c2
adam@1639	1179 val us = map (fn k => cunif' f (loc, k)) ks
adamc@706	1180 in
adam@1639	1181 r := L'.Known (L'.CTuple us, loc);
adamc@987	1182 unifyCons' env loc c1All (List.nth (us, n2 - 1))
adamc@706	1183 end
adamc@706	1184 \| _ => onFail ())
adamc@706	1185 \| _ => onFail ()
adamc@706	1186
adamc@777	1187 fun isRecord' () = unifyRecordCons env (loc, c1All, c2All)
adamc@706	1188
adamc@706	1189 fun isRecord () =
adamc@706	1190 case (c1, c2) of
adamc@706	1191 (L'.CProj (c1, n1), _) => projSpecial1 (c1, n1, isRecord')
adamc@706	1192 \| (_, L'.CProj (c2, n2)) => projSpecial2 (c2, n2, isRecord')
adamc@706	1193 \| _ => isRecord' ()
adam@2044	1194
adam@2044	1195 fun maybeIsRecord c =
adam@2044	1196 case c of
adam@2044	1197 L'.CRecord _ => isRecord ()
adam@2044	1198 \| L'.CConcat _ => isRecord ()
adam@2044	1199 \| _ => err COccursCheckFailed
adamc@706	1200 in
adam@1668	1201 (*eprefaces "unifyCons''" [("c1", p_con env c1All),
adam@1668	1202 ("c2", p_con env c2All)];*)
adam@1668	1203
adam@1668	1204 (case (c1, c2) of
adamc@706	1205 (L'.CError, _) => ()
adamc@706	1206 \| (_, L'.CError) => ()
adamc@403	1207
adam@1639	1208 \| (L'.CUnif (nl1, loc1, k1, _, r1 as ref (L'.Unknown f1)), L'.CUnif (nl2, loc2, k2, _, r2 as ref (L'.Unknown f2))) =>
adam@1668	1209 if r1 = r2 then
adam@1668	1210 if nl1 = nl2 then
adam@1668	1211 ()
adam@1668	1212 else
adam@1668	1213 err (fn _ => TooLifty (loc1, loc2))
adam@1303	1214 else if nl1 = 0 then
adamc@705	1215 (unifyKinds env k1 k2;
adam@1639	1216 if f1 c2All then
adam@1639	1217 r1 := L'.Known c2All
adam@1639	1218 else
adam@1639	1219 err CScope)
adam@1303	1220 else if nl2 = 0 then
adam@1303	1221 (unifyKinds env k1 k2;
adam@1639	1222 if f2 c1All then
adam@1639	1223 r2 := L'.Known c1All
adam@1639	1224 else
adam@1639	1225 err CScope)
adam@1303	1226 else
adam@1303	1227 err (fn _ => TooLifty (loc1, loc2))
adam@1303	1228
adam@2049	1229 \| (L'.CUnif (0, _, k1, _, r as ref (L'.Unknown f)), _) =>
adam@2049	1230 (unifyKinds env k1 (kindof env c2All);
adam@2049	1231 if occursCon r c2All then
adam@2049	1232 maybeIsRecord c2
adam@2049	1233 else if f c2All then
adam@2049	1234 r := L'.Known c2All
adam@2049	1235 else
adam@2049	1236 err CScope)
adam@2049	1237 \| (_, L'.CUnif (0, _, k2, _, r as ref (L'.Unknown f))) =>
adam@2049	1238 (unifyKinds env (kindof env c1All) k2;
adam@2049	1239 if occursCon r c1All then
adam@2049	1240 maybeIsRecord c1
adam@2049	1241 else if f c1All then
adam@2049	1242 r := L'.Known c1All
adam@2049	1243 else
adam@2049	1244 err CScope)
adam@2049	1245
adam@2049	1246 \| (L'.CUnif (nl, _, k1, _, r as ref (L'.Unknown f)), _) =>
adamc@705	1247 if occursCon r c2All then
adam@2044	1248 maybeIsRecord c2
adamc@705	1249 else
adam@2049	1250 (unifyKinds env k1 (kindof env c2All);
adam@2049	1251 let
adam@1639	1252 val sq = squish nl c2All
adam@1639	1253 in
adam@1639	1254 if f sq then
adam@1639	1255 r := L'.Known sq
adam@1639	1256 else
adam@1639	1257 err CScope
adam@1639	1258 end
adam@1639	1259 handle CantSquish => err (fn _ => TooDeep))
adam@2049	1260 \| (_, L'.CUnif (nl, _, k2, _, r as ref (L'.Unknown f))) =>
adamc@705	1261 if occursCon r c1All then
adam@2044	1262 maybeIsRecord c1
adamc@705	1263 else
adam@2049	1264 (unifyKinds env (kindof env c1All) k2;
adam@2049	1265 let
adam@1639	1266 val sq = squish nl c1All
adam@1639	1267 in
adam@1639	1268 if f sq then
adam@1639	1269 r := L'.Known sq
adam@1639	1270 else
adam@1639	1271 err CScope
adam@1639	1272 end
adam@1306	1273 handle CantSquish => err (fn _ => TooDeep))
adam@1304	1274
adam@2044	1275 \| (L'.CRecord _, _) => isRecord ()
adam@2044	1276 \| (_, L'.CRecord _) => isRecord ()
adam@2044	1277 \| (L'.CConcat _, _) => isRecord ()
adam@2044	1278 \| (_, L'.CConcat _) => isRecord ()
adam@2044	1279
adam@1341	1280
adamc@705	1281 \| (L'.CUnit, L'.CUnit) => ()
adamc@705	1282
adamc@705	1283 \| (L'.TFun (d1, r1), L'.TFun (d2, r2)) =>
adamc@987	1284 (unifyCons' env loc d1 d2;
adam@1639	1285 unifyCons' env loc r1 r2)
adamc@705	1286 \| (L'.TCFun (expl1, x1, d1, r1), L'.TCFun (expl2, _, d2, r2)) =>
adamc@705	1287 if expl1 <> expl2 then
adamc@705	1288 err CExplicitness
adamc@705	1289 else
adamc@705	1290 (unifyKinds env d1 d2;
adamc@705	1291 let
adamc@705	1292 (val befor = Time.now ())
adamc@705	1293 val env' = E.pushCRel env x1 d1
adamc@705	1294 in
adamc@705	1295 (*TextIO.print ("E.pushCRel: "
adamc@705	1296 ^ LargeReal.toString (Time.toReal (Time.- (Time.now (), befor)))
adamc@705	1297 ^ "\n");*)
adamc@987	1298 unifyCons' env' loc r1 r2
adamc@705	1299 end)
adamc@987	1300 \| (L'.TRecord r1, L'.TRecord r2) => unifyCons' env loc r1 r2
adamc@705	1301 \| (L'.TDisjoint (c1, d1, e1), L'.TDisjoint (c2, d2, e2)) =>
adamc@987	1302 (unifyCons' env loc c1 c2;
adamc@987	1303 unifyCons' env loc d1 d2;
adamc@987	1304 unifyCons' env loc e1 e2)
adamc@705	1305
adamc@705	1306 \| (L'.CRel n1, L'.CRel n2) =>
adamc@705	1307 if n1 = n2 then
adamc@705	1308 ()
adamc@705	1309 else
adamc@705	1310 err CIncompatible
adamc@705	1311 \| (L'.CNamed n1, L'.CNamed n2) =>
adamc@705	1312 if n1 = n2 then
adamc@705	1313 ()
adamc@705	1314 else
adamc@705	1315 err CIncompatible
adamc@705	1316
adamc@705	1317 \| (L'.CApp (d1, r1), L'.CApp (d2, r2)) =>
adamc@987	1318 (unifyCons' env loc d1 d2;
adamc@987	1319 unifyCons' env loc r1 r2)
adamc@705	1320 \| (L'.CAbs (x1, k1, c1), L'.CAbs (_, k2, c2)) =>
adamc@705	1321 (unifyKinds env k1 k2;
adamc@987	1322 unifyCons' (E.pushCRel env x1 k1) loc c1 c2)
adamc@705	1323
adamc@705	1324 \| (L'.CName n1, L'.CName n2) =>
adamc@705	1325 if n1 = n2 then
adamc@705	1326 ()
adamc@705	1327 else
adamc@705	1328 err CIncompatible
adamc@705	1329
adamc@705	1330 \| (L'.CModProj (n1, ms1, x1), L'.CModProj (n2, ms2, x2)) =>
adamc@705	1331 if n1 = n2 andalso ms1 = ms2 andalso x1 = x2 then
adamc@705	1332 ()
adamc@705	1333 else
adamc@705	1334 err CIncompatible
adamc@705	1335
adamc@705	1336 \| (L'.CTuple cs1, L'.CTuple cs2) =>
adamc@987	1337 ((ListPair.appEq (fn (c1, c2) => unifyCons' env loc c1 c2) (cs1, cs2))
adamc@705	1338 handle ListPair.UnequalLengths => err CIncompatible)
adamc@705	1339
adamc@706	1340 \| (L'.CProj (c1, n1), _) => projSpecial1 (c1, n1, fn () => err CIncompatible)
adamc@706	1341 \| (_, L'.CProj (c2, n2)) => projSpecial2 (c2, n2, fn () => err CIncompatible)
adamc@706	1342
adamc@623	1343 \| (L'.CMap (dom1, ran1), L'.CMap (dom2, ran2)) =>
adamc@623	1344 (unifyKinds env dom1 dom2;
adamc@628	1345 unifyKinds env ran1 ran2)
adamc@623	1346
adamc@623	1347 \| (L'.CKAbs (x, c1), L'.CKAbs (_, c2)) =>
adamc@987	1348 unifyCons' (E.pushKRel env x) loc c1 c2
adamc@623	1349 \| (L'.CKApp (c1, k1), L'.CKApp (c2, k2)) =>
adamc@623	1350 (unifyKinds env k1 k2;
adamc@987	1351 unifyCons' env loc c1 c2)
adamc@623	1352 \| (L'.TKFun (x, c1), L'.TKFun (_, c2)) =>
adamc@987	1353 unifyCons' (E.pushKRel env x) loc c1 c2
adamc@628	1354
adam@1668	1355 \| _ => err CIncompatible)(*;
adam@1668	1356 eprefaces "/unifyCons''" [("c1", p_con env c1All),
adam@1668	1357 ("c2", p_con env c2All)]*)
adamc@403	1358 end
adamc@403	1359
adamc@987	1360 and unifyCons env loc c1 c2 =
adamc@987	1361 unifyCons' env loc c1 c2
adam@1719	1362 handle CUnify' (env', err) => raise CUnify (c1, c2, env', err)
adam@1719	1363 \| KUnify (arg as {3 = env', ...}) => raise CUnify (c1, c2, env', CKind arg)
adamc@403	1364
adamc@628	1365 fun checkCon env e c1 c2 =
adamc@987	1366 unifyCons env (#2 e) c1 c2
adam@1719	1367 handle CUnify (c1, c2, env', err) =>
adam@1719	1368 expError env (Unify (e, c1, c2, env', err))
adamc@628	1369
adamc@628	1370 fun checkPatCon env p c1 c2 =
adamc@987	1371 unifyCons env (#2 p) c1 c2
adam@1719	1372 handle CUnify (c1, c2, env', err) =>
adam@1719	1373 expError env (PatUnify (p, c1, c2, env', err))
adamc@71	1374
adamc@403	1375 fun primType env p =
adamc@403	1376 case p of
adamc@403	1377 P.Int _ => !int
adamc@403	1378 \| P.Float _ => !float
adamc@403	1379 \| P.String _ => !string
adamc@821	1380 \| P.Char _ => !char
adamc@623	1381
adamc@403	1382 datatype constraint =
adamc@403	1383 Disjoint of D.goal
adamc@403	1384 \| TypeClass of E.env * L'.con * L'.exp option ref * ErrorMsg.span
adamc@403	1385
adam@1591	1386 fun relocConstraint loc c =
adam@1591	1387 case c of
adam@1591	1388 Disjoint (_, a, b, c, d) => Disjoint (loc, a, b, c, d)
adam@1591	1389 \| TypeClass (a, b, c, _) => TypeClass (a, b, c, loc)
adam@1591	1390
adamc@403	1391 val enD = map Disjoint
adamc@403	1392
adamc@634	1393 fun isClassOrFolder env cl =
adamc@634	1394 E.isClass env cl
adamc@634	1395 orelse case hnormCon env cl of
adamc@634	1396 (L'.CKApp (cl, _), _) =>
adamc@634	1397 (case hnormCon env cl of
adamc@634	1398 (L'.CModProj (top_n, [], "folder"), _) => top_n = !top_r
adamc@634	1399 \| _ => false)
adamc@634	1400 \| _ => false
adamc@634	1401
adam@1303	1402 fun subConInCon env x y =
adam@1303	1403 ElabOps.subConInCon x y
adam@1303	1404 handle SubUnif => (cunifyError env (TooUnify (#2 x, y));
adam@1303	1405 cerror)
adam@1303	1406
adamc@629	1407 fun elabHead (env, denv) infer (e as (_, loc)) t =
adamc@403	1408 let
adamc@898	1409 fun unravelKind (t, e) =
adamc@898	1410 case hnormCon env t of
adamc@898	1411 (L'.TKFun (x, t'), _) =>
adamc@898	1412 let
adam@1639	1413 val u = kunif env loc
adamc@898	1414
adamc@898	1415 val t'' = subKindInCon (0, u) t'
adamc@898	1416 in
adamc@898	1417 unravelKind (t'', (L'.EKApp (e, u), loc))
adamc@898	1418 end
adamc@898	1419 \| t => (e, t, [])
adamc@898	1420
adamc@403	1421 fun unravel (t, e) =
adamc@628	1422 case hnormCon env t of
adamc@628	1423 (L'.TKFun (x, t'), _) =>
adamc@628	1424 let
adam@1639	1425 val u = kunif env loc
adamc@628	1426
adamc@628	1427 val t'' = subKindInCon (0, u) t'
adamc@628	1428 in
adamc@628	1429 unravel (t'', (L'.EKApp (e, u), loc))
adamc@628	1430 end
adamc@628	1431 \| (L'.TCFun (L'.Implicit, x, k, t'), _) =>
adamc@628	1432 let
adam@1639	1433 val u = cunif env (loc, k)
adamc@628	1434
adam@1303	1435 val t'' = subConInCon env (0, u) t'
adamc@628	1436 in
adamc@628	1437 unravel (t'', (L'.ECApp (e, u), loc))
adamc@628	1438 end
adamc@633	1439 \| (L'.TFun (dom, ran), _) =>
adamc@628	1440 let
adamc@633	1441 fun default () = (e, t, [])
adamc@750	1442
adamc@750	1443 fun isInstance () =
adamc@750	1444 if infer <> L.TypesOnly then
adamc@750	1445 let
adamc@750	1446 val r = ref NONE
adamc@750	1447 val (e, t, gs) = unravel (ran, (L'.EApp (e, (L'.EUnif r, loc)), loc))
adamc@750	1448 in
adamc@750	1449 (e, t, TypeClass (env, dom, r, loc) :: gs)
adamc@750	1450 end
adamc@750	1451 else
adamc@750	1452 default ()
adamc@750	1453
adamc@750	1454 fun hasInstance c =
adamc@753	1455 case hnormCon env c of
adamc@753	1456 (L'.TRecord c, _) => U.Con.exists {kind = fn _ => false,
adamc@753	1457 con = fn c =>
adam@1767	1458 isClassOrFolder env (hnormCon env (c, loc))} c
adamc@753	1459 \| c =>
adamc@750	1460 let
adamc@753	1461 fun findHead c =
adamc@753	1462 case #1 c of
adamc@753	1463 L'.CApp (f, _) => findHead f
adamc@753	1464 \| _ => c
adamc@753	1465
adamc@753	1466 val cl = hnormCon env (findHead c)
adamc@750	1467 in
adamc@750	1468 isClassOrFolder env cl
adamc@750	1469 end
adamc@628	1470 in
adamc@750	1471 if hasInstance dom then
adamc@750	1472 isInstance ()
adamc@750	1473 else
adamc@750	1474 default ()
adamc@628	1475 end
adamc@629	1476 \| (L'.TDisjoint (r1, r2, t'), loc) =>
adamc@629	1477 if infer <> L.TypesOnly then
adamc@629	1478 let
adamc@792	1479 val gs = D.prove env denv (r1, r2, #2 e)
adamc@629	1480 val (e, t, gs') = unravel (t', e)
adamc@629	1481 in
adamc@629	1482 (e, t, enD gs @ gs')
adamc@629	1483 end
adamc@629	1484 else
adamc@629	1485 (e, t, [])
adamc@628	1486 \| t => (e, t, [])
adam@1591	1487
adam@1591	1488 val (e, t, gs) = case infer of
adam@1591	1489 L.DontInfer => unravelKind (t, e)
adam@1591	1490 \| _ => unravel (t, e)
adamc@704	1491 in
adam@1591	1492 ((#1 e, loc), (#1 t, loc), map (relocConstraint loc) gs)
adamc@704	1493 end
adamc@15	1494
adamc@628	1495 fun elabPat (pAll as (p, loc), (env, bound)) =
adamc@171	1496 let
adamc@171	1497 val perror = (L'.PWild, loc)
adamc@171	1498 val terror = (L'.CError, loc)
adamc@171	1499 val pterror = (perror, terror)
adamc@171	1500 val rerror = (pterror, (env, bound))
adamc@171	1501
adamc@191	1502 fun pcon (pc, po, xs, to, dn, dk) =
adamc@188	1503 case (po, to) of
adamc@188	1504 (NONE, SOME _) => (expError env (PatHasNoArg loc);
adamc@188	1505 rerror)
adamc@188	1506 \| (SOME _, NONE) => (expError env (PatHasArg loc);
adamc@188	1507 rerror)
adamc@191	1508 \| (NONE, NONE) =>
adamc@191	1509 let
adamc@191	1510 val k = (L'.KType, loc)
adam@1639	1511 val unifs = map (fn _ => cunif env (loc, k)) xs
adamc@191	1512 val dn = foldl (fn (u, dn) => (L'.CApp (dn, u), loc)) dn unifs
adamc@191	1513 in
adamc@191	1514 (((L'.PCon (dk, pc, unifs, NONE), loc), dn),
adamc@191	1515 (env, bound))
adamc@191	1516 end
adamc@188	1517 \| (SOME p, SOME t) =>
adamc@188	1518 let
adamc@628	1519 val ((p', pt), (env, bound)) = elabPat (p, (env, bound))
adamc@191	1520
adamc@191	1521 val k = (L'.KType, loc)
adam@1639	1522 val unifs = map (fn _ => cunif env (loc, k)) xs
adamc@194	1523 val nxs = length unifs - 1
adam@1304	1524 val t = ListUtil.foldli (fn (i, u, t) => subConInCon env (nxs - i,
adam@1304	1525 E.mliftConInCon (nxs - i) u) t) t unifs
adamc@191	1526 val dn = foldl (fn (u, dn) => (L'.CApp (dn, u), loc)) dn unifs
adamc@188	1527 in
adamc@628	1528 ignore (checkPatCon env p' pt t);
adamc@191	1529 (((L'.PCon (dk, pc, unifs, SOME p'), loc), dn),
adamc@188	1530 (env, bound))
adamc@188	1531 end
adamc@171	1532 in
adamc@171	1533 case p of
adam@1639	1534 L.PWild => (((L'.PWild, loc), cunif env (loc, (L'.KType, loc))),
adamc@171	1535 (env, bound))
adamc@171	1536 \| L.PVar x =>
adamc@171	1537 let
adamc@171	1538 val t = if SS.member (bound, x) then
adamc@171	1539 (expError env (DuplicatePatternVariable (loc, x));
adamc@171	1540 terror)
adamc@171	1541 else
adam@1639	1542 cunif env (loc, (L'.KType, loc))
adamc@171	1543 in
adamc@182	1544 (((L'.PVar (x, t), loc), t),
adamc@171	1545 (E.pushERel env x t, SS.add (bound, x)))
adamc@171	1546 end
adamc@173	1547 \| L.PPrim p => (((L'.PPrim p, loc), primType env p),
adamc@173	1548 (env, bound))
adamc@171	1549 \| L.PCon ([], x, po) =>
adamc@171	1550 (case E.lookupConstructor env x of
adamc@174	1551 NONE => (expError env (UnboundConstructor (loc, [], x));
adamc@171	1552 rerror)
adamc@191	1553 \| SOME (dk, n, xs, to, dn) => pcon (L'.PConVar n, po, xs, to, (L'.CNamed dn, loc), dk))
adamc@174	1554 \| L.PCon (m1 :: ms, x, po) =>
adamc@174	1555 (case E.lookupStr env m1 of
adamc@174	1556 NONE => (expError env (UnboundStrInExp (loc, m1));
adamc@174	1557 rerror)
adamc@174	1558 \| SOME (n, sgn) =>
adamc@174	1559 let
adamc@174	1560 val (str, sgn) = foldl (fn (m, (str, sgn)) =>
adamc@174	1561 case E.projectStr env {sgn = sgn, str = str, field = m} of
adamc@182	1562 NONE => raise Fail "elabPat: Unknown substructure"
adamc@174	1563 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adamc@174	1564 ((L'.StrVar n, loc), sgn) ms
adamc@174	1565 in
adamc@174	1566 case E.projectConstructor env {str = str, sgn = sgn, field = x} of
adamc@174	1567 NONE => (expError env (UnboundConstructor (loc, m1 :: ms, x));
adamc@174	1568 rerror)
adamc@191	1569 \| SOME (dk, _, xs, to, dn) => pcon (L'.PConProj (n, ms, x), po, xs, to, dn, dk)
adamc@174	1570 end)
adamc@174	1571
adamc@175	1572 \| L.PRecord (xps, flex) =>
adamc@175	1573 let
adamc@175	1574 val (xpts, (env, bound, _)) =
adamc@175	1575 ListUtil.foldlMap (fn ((x, p), (env, bound, fbound)) =>
adamc@175	1576 let
adamc@628	1577 val ((p', t), (env, bound)) = elabPat (p, (env, bound))
adamc@175	1578 in
adamc@175	1579 if SS.member (fbound, x) then
adamc@175	1580 expError env (DuplicatePatField (loc, x))
adamc@175	1581 else
adamc@175	1582 ();
adamc@175	1583 ((x, p', t), (env, bound, SS.add (fbound, x)))
adamc@175	1584 end)
adamc@175	1585 (env, bound, SS.empty) xps
adamc@175	1586
adamc@175	1587 val k = (L'.KType, loc)
adamc@175	1588 val c = (L'.CRecord (k, map (fn (x, _, t) => ((L'.CName x, loc), t)) xpts), loc)
adamc@176	1589 val c =
adamc@175	1590 if flex then
adam@1639	1591 (L'.CConcat (c, cunif env (loc, (L'.KRecord k, loc))), loc)
adamc@175	1592 else
adamc@176	1593 c
adamc@175	1594 in
adamc@182	1595 (((L'.PRecord xpts, loc),
adamc@175	1596 (L'.TRecord c, loc)),
adamc@175	1597 (env, bound))
adamc@175	1598 end
adamc@822	1599
adamc@822	1600 \| L.PAnnot (p, t) =>
adamc@822	1601 let
adamc@822	1602 val ((p', pt), (env, bound)) = elabPat (p, (env, bound))
adamc@822	1603 val (t', k, _) = elabCon (env, D.empty) t
adamc@822	1604 in
adamc@822	1605 checkPatCon env p' pt t';
adamc@822	1606 ((p', t'), (env, bound))
adamc@822	1607 end
adamc@171	1608 end
adamc@171	1609
adamc@819	1610 (* This exhaustiveness checking follows Luc Maranget's paper "Warnings for pattern matching." *)
adamc@819	1611 fun exhaustive (env, t, ps, loc) =
adamc@819	1612 let
adamc@819	1613 fun fail n = raise Fail ("Elaborate.exhaustive: Impossible " ^ Int.toString n)
adamc@819	1614
adamc@819	1615 fun patConNum pc =
adamc@819	1616 case pc of
adamc@819	1617 L'.PConVar n => n
adamc@819	1618 \| L'.PConProj (m1, ms, x) =>
adamc@819	1619 let
adamc@819	1620 val (str, sgn) = E.chaseMpath env (m1, ms)
adamc@819	1621 in
adamc@819	1622 case E.projectConstructor env {str = str, sgn = sgn, field = x} of
adamc@819	1623 NONE => raise Fail "exhaustive: Can't project datatype"
adamc@819	1624 \| SOME (_, n, _, _, _) => n
adamc@819	1625 end
adamc@819	1626
adamc@819	1627 fun nameOfNum (t, n) =
adamc@819	1628 case t of
adamc@819	1629 L'.CModProj (m1, ms, x) =>
adamc@819	1630 let
adamc@819	1631 val (str, sgn) = E.chaseMpath env (m1, ms)
adamc@819	1632 in
adamc@819	1633 case E.projectDatatype env {str = str, sgn = sgn, field = x} of
adamc@819	1634 NONE => raise Fail "exhaustive: Can't project datatype"
adamc@819	1635 \| SOME (_, cons) =>
adamc@819	1636 case ListUtil.search (fn (name, n', _) =>
adamc@819	1637 if n' = n then
adamc@819	1638 SOME name
adamc@819	1639 else
adamc@819	1640 NONE) cons of
adamc@819	1641 NONE => fail 9
adamc@819	1642 \| SOME name => L'.PConProj (m1, ms, name)
adamc@819	1643 end
adamc@819	1644 \| _ => L'.PConVar n
adamc@819	1645
adamc@819	1646 fun S (args, c, P) =
adamc@819	1647 List.mapPartial
adamc@819	1648 (fn [] => fail 1
adamc@819	1649 \| p1 :: ps =>
adamc@819	1650 let
adamc@819	1651 val loc = #2 p1
adamc@819	1652
adamc@819	1653 fun wild () =
adamc@819	1654 SOME (map (fn _ => (L'.PWild, loc)) args @ ps)
adamc@819	1655 in
adamc@819	1656 case #1 p1 of
adamc@819	1657 L'.PPrim _ => NONE
adamc@819	1658 \| L'.PCon (_, c', _, NONE) =>
adamc@819	1659 if patConNum c' = c then
adamc@819	1660 SOME ps
adamc@819	1661 else
adamc@819	1662 NONE
adamc@819	1663 \| L'.PCon (_, c', _, SOME p) =>
adamc@819	1664 if patConNum c' = c then
adamc@819	1665 SOME (p :: ps)
adamc@819	1666 else
adamc@819	1667 NONE
adamc@819	1668 \| L'.PRecord xpts =>
adamc@819	1669 SOME (map (fn x =>
adamc@819	1670 case ListUtil.search (fn (x', p, _) =>
adamc@819	1671 if x = x' then
adamc@819	1672 SOME p
adamc@819	1673 else
adamc@819	1674 NONE) xpts of
adamc@819	1675 NONE => (L'.PWild, loc)
adamc@819	1676 \| SOME p => p) args @ ps)
adamc@819	1677 \| L'.PWild => wild ()
adamc@819	1678 \| L'.PVar _ => wild ()
adamc@819	1679 end)
adamc@819	1680 P
adamc@819	1681
adamc@819	1682 fun D P =
adamc@819	1683 List.mapPartial
adamc@819	1684 (fn [] => fail 2
adamc@819	1685 \| (p1, _) :: ps =>
adamc@819	1686 case p1 of
adamc@819	1687 L'.PWild => SOME ps
adamc@819	1688 \| L'.PVar _ => SOME ps
adamc@819	1689 \| L'.PPrim _ => NONE
adamc@819	1690 \| L'.PCon _ => NONE
adamc@819	1691 \| L'.PRecord _ => NONE)
adamc@819	1692 P
adamc@819	1693
adamc@819	1694 fun I (P, q) =
adamc@819	1695 (*(prefaces "I" [("P", p_list (fn P' => box [PD.string "[", p_list (p_pat env) P', PD.string "]"]) P),
adamc@819	1696 ("q", p_list (p_con env) q)];*)
adamc@819	1697 case q of
adamc@819	1698 [] => (case P of
adamc@819	1699 [] => SOME []
adamc@819	1700 \| _ => NONE)
adamc@819	1701 \| q1 :: qs =>
adamc@819	1702 let
adamc@819	1703 val loc = #2 q1
adamc@819	1704
adamc@819	1705 fun unapp (t, acc) =
adamc@830	1706 case #1 t of
adamc@830	1707 L'.CApp (t, arg) => unapp (t, arg :: acc)
adamc@819	1708 \| _ => (t, rev acc)
adamc@819	1709
adamc@830	1710 val (t1, args) = unapp (hnormCon env q1, [])
adamc@830	1711 val t1 = hnormCon env t1
adam@1303	1712 fun doSub t = foldl (fn (arg, t) => subConInCon env (0, arg) t) t args
adamc@819	1713
adamc@819	1714 fun dtype (dtO, names) =
adamc@819	1715 let
adamc@819	1716 val nameSet = IS.addList (IS.empty, names)
adamc@819	1717 val nameSet = foldl (fn (ps, nameSet) =>
adamc@819	1718 case ps of
adamc@819	1719 [] => fail 4
adamc@819	1720 \| (L'.PCon (_, pc, _, _), _) :: _ =>
adamc@819	1721 (IS.delete (nameSet, patConNum pc)
adamc@819	1722 handle NotFound => nameSet)
adamc@819	1723 \| _ => nameSet)
adamc@819	1724 nameSet P
adamc@819	1725 in
adamc@819	1726 nameSet
adamc@819	1727 end
adamc@819	1728
adamc@819	1729 fun default () = (NONE, IS.singleton 0, [])
adamc@819	1730
adamc@819	1731 val (dtO, unused, cons) =
adamc@830	1732 case #1 t1 of
adamc@819	1733 L'.CNamed n =>
adamc@819	1734 let
adamc@819	1735 val dt = E.lookupDatatype env n
adamc@819	1736 val cons = E.constructors dt
adamc@819	1737 in
adamc@819	1738 (SOME dt,
adamc@819	1739 dtype (SOME dt, map #2 cons),
adamc@819	1740 map (fn (_, n, co) =>
adamc@819	1741 (n,
adamc@819	1742 case co of
adamc@819	1743 NONE => []
adamc@819	1744 \| SOME t => [("", doSub t)])) cons)
adamc@819	1745 end
adamc@819	1746 \| L'.CModProj (m1, ms, x) =>
adamc@819	1747 let
adamc@819	1748 val (str, sgn) = E.chaseMpath env (m1, ms)
adamc@819	1749 in
adamc@819	1750 case E.projectDatatype env {str = str, sgn = sgn, field = x} of
adamc@819	1751 NONE => default ()
adamc@819	1752 \| SOME (_, cons) =>
adamc@819	1753 (NONE,
adamc@819	1754 dtype (NONE, map #2 cons),
adamc@819	1755 map (fn (s, _, co) =>
adamc@819	1756 (patConNum (L'.PConProj (m1, ms, s)),
adamc@819	1757 case co of
adamc@819	1758 NONE => []
adamc@819	1759 \| SOME t => [("", doSub t)])) cons)
adamc@819	1760 end
adamc@830	1761 \| L'.TRecord t =>
adamc@830	1762 (case #1 (hnormCon env t) of
adamc@830	1763 L'.CRecord (_, xts) =>
adamc@830	1764 let
adamc@830	1765 val xts = map (fn ((L'.CName x, _), co) => SOME (x, co)
adamc@830	1766 \| _ => NONE) xts
adamc@830	1767 in
adamc@830	1768 if List.all Option.isSome xts then
adamc@830	1769 let
adamc@830	1770 val xts = List.mapPartial (fn x => x) xts
adamc@830	1771 val xts = ListMergeSort.sort (fn ((x1, _), (x2, _)) =>
adamc@830	1772 String.compare (x1, x2) = GREATER) xts
adamc@830	1773 in
adamc@830	1774 (NONE, IS.empty, [(0, xts)])
adamc@830	1775 end
adamc@830	1776 else
adamc@830	1777 default ()
adamc@830	1778 end
adamc@830	1779 \| _ => default ())
adamc@819	1780 \| _ => default ()
adamc@819	1781 in
adamc@819	1782 if IS.isEmpty unused then
adamc@819	1783 let
adamc@819	1784 fun recurse cons =
adamc@819	1785 case cons of
adamc@819	1786 [] => NONE
adamc@819	1787 \| (name, args) :: cons =>
adamc@819	1788 case I (S (map #1 args, name, P),
adamc@819	1789 map #2 args @ qs) of
adamc@819	1790 NONE => recurse cons
adamc@819	1791 \| SOME ps =>
adamc@819	1792 let
adamc@819	1793 val nargs = length args
adamc@819	1794 val argPs = List.take (ps, nargs)
adamc@819	1795 val restPs = List.drop (ps, nargs)
adamc@819	1796
adamc@819	1797 val p = case name of
adamc@819	1798 0 => L'.PRecord (ListPair.map
adamc@819	1799 (fn ((name, t), p) => (name, p, t))
adamc@819	1800 (args, argPs))
adamc@830	1801 \| _ => L'.PCon (L'.Default, nameOfNum (#1 t1, name), [],
adamc@819	1802 case argPs of
adamc@819	1803 [] => NONE
adamc@819	1804 \| [p] => SOME p
adamc@819	1805 \| _ => fail 3)
adamc@819	1806 in
adamc@819	1807 SOME ((p, loc) :: restPs)
adamc@819	1808 end
adamc@819	1809 in
adamc@819	1810 recurse cons
adamc@819	1811 end
adamc@819	1812 else
adamc@819	1813 case I (D P, qs) of
adamc@819	1814 NONE => NONE
adamc@819	1815 \| SOME ps =>
adamc@819	1816 let
adamc@819	1817 val p = case cons of
adamc@819	1818 [] => L'.PWild
adamc@819	1819 \| (0, _) :: _ => L'.PWild
adamc@819	1820 \| _ =>
adamc@819	1821 case IS.find (fn _ => true) unused of
adamc@819	1822 NONE => fail 6
adamc@819	1823 \| SOME name =>
adamc@819	1824 case ListUtil.search (fn (name', args) =>
adamc@819	1825 if name = name' then
adamc@819	1826 SOME (name', args)
adamc@819	1827 else
adamc@819	1828 NONE) cons of
adamc@819	1829 SOME (n, []) =>
adamc@830	1830 L'.PCon (L'.Default, nameOfNum (#1 t1, n), [], NONE)
adamc@819	1831 \| SOME (n, [_]) =>
adamc@830	1832 L'.PCon (L'.Default, nameOfNum (#1 t1, n), [], SOME (L'.PWild, loc))
adamc@819	1833 \| _ => fail 7
adamc@819	1834 in
adamc@819	1835 SOME ((p, loc) :: ps)
adamc@819	1836 end
adamc@819	1837 end
adamc@819	1838 in
adamc@819	1839 case I (map (fn x => [x]) ps, [t]) of
adamc@819	1840 NONE => NONE
adamc@819	1841 \| SOME [p] => SOME p
adamc@819	1842 \| _ => fail 7
adamc@819	1843 end
adamc@819	1844
adamc@217	1845 fun unmodCon env (c, loc) =
adamc@217	1846 case c of
adamc@217	1847 L'.CNamed n =>
adamc@217	1848 (case E.lookupCNamed env n of
adamc@217	1849 (_, _, SOME (c as (L'.CModProj _, _))) => unmodCon env c
adamc@217	1850 \| _ => (c, loc))
adamc@217	1851 \| L'.CModProj (m1, ms, x) =>
adamc@217	1852 let
adamc@217	1853 val (str, sgn) = E.chaseMpath env (m1, ms)
adamc@217	1854 in
adamc@217	1855 case E.projectCon env {str = str, sgn = sgn, field = x} of
adamc@217	1856 NONE => raise Fail "unmodCon: Can't projectCon"
adamc@217	1857 \| SOME (_, SOME (c as (L'.CModProj _, _))) => unmodCon env c
adamc@217	1858 \| _ => (c, loc)
adamc@217	1859 end
adamc@217	1860 \| _ => (c, loc)
adamc@217	1861
adamc@721	1862 fun normClassKey env c =
adamc@467	1863 let
adamc@721	1864 val c = hnormCon env c
adamc@467	1865 in
adamc@467	1866 case #1 c of
adamc@467	1867 L'.CApp (c1, c2) =>
adamc@467	1868 let
adamc@721	1869 val c1 = normClassKey env c1
adamc@721	1870 val c2 = normClassKey env c2
adamc@467	1871 in
adamc@467	1872 (L'.CApp (c1, c2), #2 c)
adamc@467	1873 end
adamc@721	1874 \| L'.CRecord (k, xcs) => (L'.CRecord (k, map (fn (x, c) => (normClassKey env x,
adamc@721	1875 normClassKey env c)) xcs), #2 c)
adamc@721	1876 \| _ => unmodCon env c
adamc@467	1877 end
adamc@467	1878
adamc@467	1879 fun normClassConstraint env (c, loc) =
adamc@217	1880 case c of
adamc@217	1881 L'.CApp (f, x) =>
adamc@217	1882 let
adamc@721	1883 val f = normClassKey env f
adamc@467	1884 val x = normClassKey env x
adamc@217	1885 in
adamc@467	1886 (L'.CApp (f, x), loc)
adamc@217	1887 end
adamc@674	1888 \| L'.TFun (c1, c2) =>
adamc@674	1889 let
adamc@674	1890 val c1 = normClassConstraint env c1
adamc@674	1891 val c2 = normClassConstraint env c2
adamc@674	1892 in
adamc@674	1893 (L'.TFun (c1, c2), loc)
adamc@674	1894 end
adamc@674	1895 \| L'.TCFun (expl, x, k, c1) => (L'.TCFun (expl, x, k, normClassConstraint env c1), loc)
adam@1639	1896 \| L'.CUnif (nl, _, _, _, ref (L'.Known c)) => normClassConstraint env (E.mliftConInCon nl c)
adamc@721	1897 \| _ => unmodCon env (c, loc)
adamc@216	1898
adamc@1093	1899 fun findHead e e' =
adamc@1093	1900 let
adamc@1093	1901 fun findHead (e, _) =
adamc@1093	1902 case e of
adamc@1093	1903 L.EVar (_, _, infer) =>
adamc@1093	1904 let
adamc@1093	1905 fun findHead' (e, _) =
adamc@1093	1906 case e of
adamc@1093	1907 L'.ENamed _ => true
adamc@1093	1908 \| L'.EModProj _ => true
adam@1472	1909 \| L'.ERel _ => true
adamc@1093	1910 \| L'.EApp (e, _) => findHead' e
adamc@1093	1911 \| L'.ECApp (e, _) => findHead' e
adamc@1093	1912 \| L'.EKApp (e, _) => findHead' e
adamc@1093	1913 \| _ => false
adamc@1093	1914 in
adamc@1093	1915 if findHead' e' then
adamc@1093	1916 SOME infer
adamc@1093	1917 else
adamc@1093	1918 NONE
adamc@1093	1919 end
adamc@1093	1920 \| L.EApp (e, _) => findHead e
adamc@1093	1921 \| L.ECApp (e, _) => findHead e
adamc@1093	1922 \| L.EDisjointApp e => findHead e
adamc@1093	1923 \| _ => NONE
adamc@1093	1924 in
adamc@1093	1925 findHead e
adamc@1093	1926 end
adamc@1093	1927
adam@1640	1928 datatype needed = Needed of {Cons : (L'.kind * int) SM.map,
adam@1640	1929 NextCon : int,
adamc@1264	1930 Constraints : (E.env * (L'.con * L'.con) * ErrorMsg.span) list,
adamc@1264	1931 Vals : SS.set,
adamc@1270	1932 Mods : (E.env * needed) SM.map}
adamc@1264	1933
adam@1640	1934 fun ncons (Needed r) = map (fn (k, (v, _)) => (k, v))
adam@1640	1935 (ListMergeSort.sort (fn ((_, (_, n1)), (_, (_, n2))) => n1 > n2)
adam@1640	1936 (SM.listItemsi (#Cons r)))
adamc@1264	1937 fun nconstraints (Needed r) = #Constraints r
adamc@1264	1938 fun nvals (Needed r) = #Vals r
adamc@1264	1939 fun nmods (Needed r) = #Mods r
adamc@1264	1940
adamc@1264	1941 val nempty = Needed {Cons = SM.empty,
adam@1640	1942 NextCon = 0,
adamc@1264	1943 Constraints = nil,
adamc@1264	1944 Vals = SS.empty,
adamc@1264	1945 Mods = SM.empty}
adamc@1264	1946
adamc@1264	1947 fun naddCon (r : needed, k, v) =
adamc@1264	1948 let
adamc@1264	1949 val Needed r = r
adamc@1264	1950 in
adam@1640	1951 Needed {Cons = SM.insert (#Cons r, k, (v, #NextCon r)),
adam@1640	1952 NextCon = #NextCon r + 1,
adamc@1264	1953 Constraints = #Constraints r,
adamc@1264	1954 Vals = #Vals r,
adamc@1264	1955 Mods = #Mods r}
adamc@1264	1956 end
adamc@1264	1957
adamc@1264	1958 fun naddConstraint (r : needed, v) =
adamc@1264	1959 let
adamc@1264	1960 val Needed r = r
adamc@1264	1961 in
adamc@1264	1962 Needed {Cons = #Cons r,
adam@1640	1963 NextCon = #NextCon r,
adamc@1264	1964 Constraints = v :: #Constraints r,
adamc@1264	1965 Vals = #Vals r,
adamc@1264	1966 Mods = #Mods r}
adamc@1264	1967 end
adamc@1264	1968
adamc@1264	1969 fun naddVal (r : needed, k) =
adamc@1264	1970 let
adamc@1264	1971 val Needed r = r
adamc@1264	1972 in
adamc@1264	1973 Needed {Cons = #Cons r,
adam@1640	1974 NextCon = #NextCon r,
adamc@1264	1975 Constraints = #Constraints r,
adamc@1264	1976 Vals = SS.add (#Vals r, k),
adamc@1264	1977 Mods = #Mods r}
adamc@1264	1978 end
adamc@1264	1979
adamc@1264	1980 fun naddMod (r : needed, k, v) =
adamc@1264	1981 let
adamc@1264	1982 val Needed r = r
adamc@1264	1983 in
adamc@1264	1984 Needed {Cons = #Cons r,
adam@1640	1985 NextCon = #NextCon r,
adamc@1264	1986 Constraints = #Constraints r,
adamc@1264	1987 Vals = #Vals r,
adamc@1264	1988 Mods = SM.insert (#Mods r, k, v)}
adamc@1264	1989 end
adamc@1264	1990
adamc@1264	1991 fun ndelCon (r : needed, k) =
adamc@1264	1992 let
adamc@1264	1993 val Needed r = r
adamc@1264	1994 in
adamc@1264	1995 Needed {Cons = #1 (SM.remove (#Cons r, k)) handle NotFound => #Cons r,
adam@1640	1996 NextCon = #NextCon r,
adamc@1264	1997 Constraints = #Constraints r,
adamc@1264	1998 Vals = #Vals r,
adamc@1264	1999 Mods = #Mods r}
adamc@1264	2000 end
adamc@1264	2001
adamc@1264	2002 fun ndelVal (r : needed, k) =
adamc@1264	2003 let
adamc@1264	2004 val Needed r = r
adamc@1264	2005 in
adamc@1264	2006 Needed {Cons = #Cons r,
adam@1640	2007 NextCon = #NextCon r,
adamc@1264	2008 Constraints = #Constraints r,
adamc@1264	2009 Vals = SS.delete (#Vals r, k) handle NotFound => #Vals r,
adamc@1264	2010 Mods = #Mods r}
adamc@1264	2011 end
adamc@1264	2012
adam@1591	2013 fun chaseUnifs c =
adam@1591	2014 case #1 c of
adam@1639	2015 L'.CUnif (_, _, _, _, ref (L'.Known c)) => chaseUnifs c
adam@1591	2016 \| _ => c
adam@1591	2017
adam@2092	2018 val consEqSimple =
adam@2092	2019 let
adam@2092	2020 fun ces env (c1 : L'.con, c2 : L'.con) =
adam@2092	2021 let
adam@2092	2022 val c1 = hnormCon env c1
adam@2092	2023 val c2 = hnormCon env c2
adam@2092	2024 in
adam@2092	2025 case (#1 c1, #1 c2) of
adam@2092	2026 (L'.CRel n1, L'.CRel n2) => n1 = n2
adam@2092	2027 \| (L'.CNamed n1, L'.CNamed n2) =>
adam@2092	2028 n1 = n2 orelse
adam@2092	2029 (case #3 (E.lookupCNamed env n1) of
adam@2092	2030 SOME (L'.CNamed n2', _) => n2' = n1
adam@2092	2031 \| _ => false)
adam@2092	2032 \| (L'.CModProj n1, L'.CModProj n2) => n1 = n2
adam@2092	2033 \| (L'.CApp (f1, x1), L'.CApp (f2, x2)) => ces env (f1, f2) andalso ces env (x1, x2)
adam@2092	2034 \| (L'.CAbs (x1, k1, c1), L'.CAbs (_, _, c2)) => ces (E.pushCRel env x1 k1) (c1, c2)
adam@2092	2035 \| (L'.CName x1, L'.CName x2) => x1 = x2
adam@2092	2036 \| (L'.CRecord (_, xts1), L'.CRecord (_, xts2)) =>
adam@2092	2037 ListPair.all (fn ((x1, t1), (x2, t2)) =>
adam@2092	2038 ces env (x1, x2) andalso ces env (t2, t2)) (xts1, xts2)
adam@2092	2039 \| (L'.CConcat (x1, y1), L'.CConcat (x2, y2)) =>
adam@2092	2040 ces env (x1, x2) andalso ces env (y1, y2)
adam@2092	2041 \| (L'.CMap _, L'.CMap _) => true
adam@2092	2042 \| (L'.CUnit, L'.CUnit) => true
adam@2092	2043 \| (L'.CTuple cs1, L'.CTuple cs2) => ListPair.all (ces env) (cs1, cs2)
adam@2092	2044 \| (L'.CProj (c1, n1), L'.CProj (c2, n2)) => ces env (c1, c2) andalso n1 = n2
adam@2092	2045 \| (L'.CUnif (_, _, _, _, r1), L'.CUnif (_, _, _, _, r2)) => r1 = r2
adam@2101	2046
adam@2101	2047 \| (L'.TFun (d1, r1), L'.TFun (d2, r2)) => ces env (d1, d2) andalso ces env (r1, r2)
adam@2101	2048 \| (L'.TRecord c1, L'.TRecord c2) => ces env (c1, c2)
adam@2101	2049
adam@2092	2050 \| _ => false
adam@2092	2051 end
adam@2092	2052 in
adam@2092	2053 ces
adam@2092	2054 end
adam@2092	2055
adam@2092	2056
adamc@92	2057 fun elabExp (env, denv) (eAll as (e, loc)) =
adamc@91	2058 let
adamc@848	2059 (val () = eprefaces "elabExp" [("eAll", SourcePrint.p_exp eAll)])
adamc@514	2060 (val befor = Time.now ())
adamc@280	2061
adamc@280	2062 val r = case e of
adamc@91	2063 L.EAnnot (e, t) =>
adamc@91	2064 let
adamc@91	2065 val (e', et, gs1) = elabExp (env, denv) e
adamc@91	2066 val (t', _, gs2) = elabCon (env, denv) t
adamc@91	2067 in
adamc@628	2068 checkCon env e' et t';
adamc@628	2069 (e', t', gs1 @ enD gs2)
adamc@91	2070 end
adamc@34	2071
adamc@91	2072 \| L.EPrim p => ((L'.EPrim p, loc), primType env p, [])
adamc@403	2073 \| L.EVar ([], s, infer) =>
adamc@91	2074 (case E.lookupE env s of
adamc@91	2075 E.NotBound =>
adamc@91	2076 (expError env (UnboundExp (loc, s));
adamc@91	2077 (eerror, cerror, []))
adamc@629	2078 \| E.Rel (n, t) => elabHead (env, denv) infer (L'.ERel n, loc) t
adamc@629	2079 \| E.Named (n, t) => elabHead (env, denv) infer (L'.ENamed n, loc) t)
adamc@403	2080 \| L.EVar (m1 :: ms, s, infer) =>
adamc@91	2081 (case E.lookupStr env m1 of
adamc@91	2082 NONE => (expError env (UnboundStrInExp (loc, m1));
adamc@91	2083 (eerror, cerror, []))
adamc@91	2084 \| SOME (n, sgn) =>
adamc@91	2085 let
adamc@91	2086 val (str, sgn) = foldl (fn (m, (str, sgn)) =>
adamc@91	2087 case E.projectStr env {sgn = sgn, str = str, field = m} of
adamc@91	2088 NONE => (conError env (UnboundStrInCon (loc, m));
adamc@91	2089 (strerror, sgnerror))
adamc@91	2090 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adamc@91	2091 ((L'.StrVar n, loc), sgn) ms
adamc@10	2092
adamc@91	2093 val t = case E.projectVal env {sgn = sgn, str = str, field = s} of
adamc@91	2094 NONE => (expError env (UnboundExp (loc, s));
adamc@91	2095 cerror)
adamc@91	2096 \| SOME t => t
adamc@91	2097 in
adamc@629	2098 elabHead (env, denv) infer (L'.EModProj (n, ms, s), loc) t
adamc@91	2099 end)
adamc@86	2100
adamc@349	2101 \| L.EWild =>
adamc@210	2102 let
adamc@349	2103 val r = ref NONE
adam@1639	2104 val c = cunif env (loc, (L'.KType, loc))
adamc@210	2105 in
adamc@349	2106 ((L'.EUnif r, loc), c, [TypeClass (env, c, r, loc)])
adamc@210	2107 end
adamc@210	2108
adamc@91	2109 \| L.EApp (e1, e2) =>
adamc@91	2110 let
adamc@91	2111 val (e1', t1, gs1) = elabExp (env, denv) e1
adamc@1093	2112
adamc@403	2113 val (e2', t2, gs2) = elabExp (env, denv) e2
adamc@71	2114
adam@1639	2115 val dom = cunif env (loc, ktype)
adam@1639	2116 val ran = cunif env (loc, ktype)
adamc@838	2117 val t = (L'.TFun (dom, ran), loc)
adamc@1093	2118
adamc@1093	2119 val () = checkCon env e1' t1 t
adamc@1093	2120 val () = checkCon env e2' t2 dom
adamc@1093	2121
adamc@1093	2122 val ef = (L'.EApp (e1', e2'), loc)
adamc@1093	2123 val (ef, et, gs3) =
adamc@1093	2124 case findHead e1 e1' of
adam@1591	2125 NONE => (ef, (#1 (chaseUnifs ran), loc), [])
adamc@1093	2126 \| SOME infer => elabHead (env, denv) infer ef ran
adamc@91	2127 in
adamc@1093	2128 (ef, et, gs1 @ gs2 @ gs3)
adamc@91	2129 end
adamc@91	2130 \| L.EAbs (x, to, e) =>
adamc@91	2131 let
adamc@91	2132 val (t', gs1) = case to of
adam@1639	2133 NONE => (cunif env (loc, ktype), [])
adamc@91	2134 \| SOME t =>
adamc@91	2135 let
adamc@91	2136 val (t', tk, gs) = elabCon (env, denv) t
adamc@91	2137 in
adamc@91	2138 checkKind env t' tk ktype;
adamc@91	2139 (t', gs)
adamc@91	2140 end
adamc@467	2141 val dom = normClassConstraint env t'
adamc@467	2142 val (e', et, gs2) = elabExp (E.pushERel env x dom, denv) e
adamc@91	2143 in
adamc@91	2144 ((L'.EAbs (x, t', et, e'), loc),
adamc@91	2145 (L'.TFun (t', et), loc),
adamc@467	2146 enD gs1 @ gs2)
adamc@91	2147 end
adamc@91	2148 \| L.ECApp (e, c) =>
adamc@91	2149 let
adamc@91	2150 val (e', et, gs1) = elabExp (env, denv) e
adamc@1093	2151
adamc@328	2152 val oldEt = et
adamc@403	2153 val (c', ck, gs2) = elabCon (env, denv) c
adamc@628	2154 val (et', _) = hnormCon env et
adamc@91	2155 in
adamc@91	2156 case et' of
adamc@91	2157 L'.CError => (eerror, cerror, [])
adamc@328	2158 \| L'.TCFun (_, x, k, eb) =>
adamc@91	2159 let
adamc@91	2160 val () = checkKind env c' ck k
adam@1303	2161 val eb' = subConInCon env (0, c') eb
adamc@1093	2162
adamc@1093	2163 val ef = (L'.ECApp (e', c'), loc)
adamc@1093	2164 val (ef, eb', gs3) =
adamc@1093	2165 case findHead e e' of
adamc@1093	2166 NONE => (ef, eb', [])
adamc@1093	2167 \| SOME infer => elabHead (env, denv) infer ef eb'
adamc@91	2168 in
adamc@328	2169 (*prefaces "Elab ECApp" [("e", SourcePrint.p_exp eAll),
adamc@328	2170 ("et", p_con env oldEt),
adamc@328	2171 ("x", PD.string x),
adamc@328	2172 ("eb", p_con (E.pushCRel env x k) eb),
adamc@328	2173 ("c", p_con env c'),
adamc@328	2174 ("eb'", p_con env eb')];*)
adam@1591	2175 (ef, (#1 eb', loc), gs1 @ enD gs2 @ gs3)
adamc@91	2176 end
adamc@91	2177
adamc@91	2178 \| _ =>
adamc@91	2179 (expError env (WrongForm ("constructor function", e', et));
adamc@91	2180 (eerror, cerror, []))
adamc@91	2181 end
adamc@91	2182 \| L.ECAbs (expl, x, k, e) =>
adamc@91	2183 let
adamc@91	2184 val expl' = elabExplicitness expl
adamc@623	2185 val k' = elabKind env k
adamc@328	2186
adamc@328	2187 val env' = E.pushCRel env x k'
adamc@328	2188 val (e', et, gs) = elabExp (env', D.enter denv) e
adamc@91	2189 in
adamc@91	2190 ((L'.ECAbs (expl', x, k', e'), loc),
adamc@91	2191 (L'.TCFun (expl', x, k', et), loc),
adamc@91	2192 gs)
adamc@91	2193 end
adamc@623	2194 \| L.EKAbs (x, e) =>
adamc@623	2195 let
adamc@623	2196 val env' = E.pushKRel env x
adamc@623	2197 val (e', et, gs) = elabExp (env', denv) e
adamc@623	2198 in
adamc@623	2199 ((L'.EKAbs (x, e'), loc),
adamc@623	2200 (L'.TKFun (x, et), loc),
adamc@623	2201 gs)
adamc@623	2202 end
adamc@91	2203
adamc@91	2204 \| L.EDisjoint (c1, c2, e) =>
adamc@91	2205 let
adamc@91	2206 val (c1', k1, gs1) = elabCon (env, denv) c1
adamc@91	2207 val (c2', k2, gs2) = elabCon (env, denv) c2
adamc@91	2208
adam@1639	2209 val ku1 = kunif env loc
adam@1639	2210 val ku2 = kunif env loc
adamc@91	2211
adamc@628	2212 val denv' = D.assert env denv (c1', c2')
adamc@628	2213 val (e', t, gs3) = elabExp (env, denv') e
adamc@91	2214 in
adamc@91	2215 checkKind env c1' k1 (L'.KRecord ku1, loc);
adamc@91	2216 checkKind env c2' k2 (L'.KRecord ku2, loc);
adamc@91	2217
adamc@628	2218 (e', (L'.TDisjoint (c1', c2', t), loc), enD gs1 @ enD gs2 @ gs3)
adamc@91	2219 end
adamc@629	2220 \| L.EDisjointApp e =>
adamc@629	2221 let
adamc@629	2222 val (e', t, gs1) = elabExp (env, denv) e
adamc@629	2223
adam@1639	2224 val k1 = kunif env loc
adam@1639	2225 val c1 = cunif env (loc, (L'.KRecord k1, loc))
adam@1639	2226 val k2 = kunif env loc
adam@1639	2227 val c2 = cunif env (loc, (L'.KRecord k2, loc))
adam@1639	2228 val t' = cunif env (loc, ktype)
adamc@629	2229 val () = checkCon env e' t (L'.TDisjoint (c1, c2, t'), loc)
adamc@629	2230 val gs2 = D.prove env denv (c1, c2, loc)
adamc@629	2231 in
adam@1591	2232 (e', (#1 (chaseUnifs t'), loc), enD gs2 @ gs1)
adamc@629	2233 end
adamc@91	2234
adam@2009	2235 \| L.ERecord (xes, flex) =>
adamc@91	2236 let
adam@2009	2237 val () = if flex then
adam@2009	2238 expError env (IllegalFlex eAll)
adam@2009	2239 else
adam@2009	2240 ()
adam@2009	2241
adamc@91	2242 val (xes', gs) = ListUtil.foldlMap (fn ((x, e), gs) =>
adamc@91	2243 let
adamc@91	2244 val (x', xk, gs1) = elabCon (env, denv) x
adamc@91	2245 val (e', et, gs2) = elabExp (env, denv) e
adamc@91	2246 in
adamc@91	2247 checkKind env x' xk kname;
adamc@228	2248 ((x', e', et), enD gs1 @ gs2 @ gs)
adamc@91	2249 end)
adamc@91	2250 [] xes
adamc@91	2251
adamc@91	2252 val k = (L'.KType, loc)
adamc@91	2253
adamc@91	2254 fun prove (xets, gs) =
adamc@91	2255 case xets of
adamc@91	2256 [] => gs
adamc@91	2257 \| (x, _, t) :: rest =>
adamc@91	2258 let
adamc@91	2259 val xc = (x, t)
adamc@91	2260 val r1 = (L'.CRecord (k, [xc]), loc)
adamc@91	2261 val gs = foldl (fn ((x', _, t'), gs) =>
adamc@91	2262 let
adamc@91	2263 val xc' = (x', t')
adamc@91	2264 val r2 = (L'.CRecord (k, [xc']), loc)
adamc@91	2265 in
adamc@91	2266 D.prove env denv (r1, r2, loc) @ gs
adamc@91	2267 end)
adamc@91	2268 gs rest
adamc@91	2269 in
adamc@91	2270 prove (rest, gs)
adamc@91	2271 end
adamc@228	2272
adamc@228	2273 val gsD = List.mapPartial (fn Disjoint d => SOME d \| _ => NONE) gs
adamc@228	2274 val gsO = List.filter (fn Disjoint _ => false \| _ => true) gs
adamc@91	2275 in
adamc@255	2276 (TextIO.print ("\|gsO\| = " ^ Int.toString (length gsO) ^ "\n");)
adamc@91	2277 ((L'.ERecord xes', loc),
adamc@91	2278 (L'.TRecord (L'.CRecord (ktype, map (fn (x', _, et) => (x', et)) xes'), loc), loc),
adamc@228	2279 enD (prove (xes', gsD)) @ gsO)
adamc@91	2280 end
adamc@91	2281
adamc@91	2282 \| L.EField (e, c) =>
adamc@91	2283 let
adamc@91	2284 val (e', et, gs1) = elabExp (env, denv) e
adamc@91	2285 val (c', ck, gs2) = elabCon (env, denv) c
adamc@91	2286
adam@1639	2287 val ft = cunif env (loc, ktype)
adam@1639	2288 val rest = cunif env (loc, ktype_record)
adamc@91	2289 val first = (L'.CRecord (ktype, [(c', ft)]), loc)
adamc@629	2290 val () = checkCon env e' et
adamc@629	2291 (L'.TRecord (L'.CConcat (first, rest), loc), loc);
adamc@628	2292 val gs3 = D.prove env denv (first, rest, loc)
adamc@91	2293 in
adamc@628	2294 ((L'.EField (e', c', {field = ft, rest = rest}), loc), ft, gs1 @ enD gs2 @ enD gs3)
adamc@91	2295 end
adamc@91	2296
adamc@445	2297 \| L.EConcat (e1, e2) =>
adamc@339	2298 let
adamc@339	2299 val (e1', e1t, gs1) = elabExp (env, denv) e1
adamc@445	2300 val (e2', e2t, gs2) = elabExp (env, denv) e2
adamc@445	2301
adam@1639	2302 val r1 = cunif env (loc, ktype_record)
adam@1639	2303 val r2 = cunif env (loc, ktype_record)
adamc@445	2304
adamc@629	2305 val () = checkCon env e1' e1t (L'.TRecord r1, loc)
adamc@629	2306 val () = checkCon env e2' e2t (L'.TRecord r2, loc)
adamc@629	2307
adamc@628	2308 val gs3 = D.prove env denv (r1, r2, loc)
adamc@339	2309 in
adamc@445	2310 ((L'.EConcat (e1', r1, e2', r2), loc),
adamc@445	2311 (L'.TRecord ((L'.CConcat (r1, r2), loc)), loc),
adamc@628	2312 gs1 @ gs2 @ enD gs3)
adamc@339	2313 end
adamc@149	2314 \| L.ECut (e, c) =>
adamc@149	2315 let
adamc@149	2316 val (e', et, gs1) = elabExp (env, denv) e
adamc@149	2317 val (c', ck, gs2) = elabCon (env, denv) c
adamc@149	2318
adam@1639	2319 val ft = cunif env (loc, ktype)
adam@1639	2320 val rest = cunif env (loc, ktype_record)
adamc@149	2321 val first = (L'.CRecord (ktype, [(c', ft)]), loc)
adamc@629	2322
adamc@629	2323 val () = checkCon env e' et
adamc@629	2324 (L'.TRecord (L'.CConcat (first, rest), loc), loc)
adamc@149	2325
adamc@628	2326 val gs3 = D.prove env denv (first, rest, loc)
adamc@149	2327 in
adam@1299	2328 checkKind env c' ck kname;
adamc@228	2329 ((L'.ECut (e', c', {field = ft, rest = rest}), loc), (L'.TRecord rest, loc),
adamc@628	2330 gs1 @ enD gs2 @ enD gs3)
adamc@149	2331 end
adamc@493	2332 \| L.ECutMulti (e, c) =>
adamc@493	2333 let
adamc@493	2334 val (e', et, gs1) = elabExp (env, denv) e
adamc@493	2335 val (c', ck, gs2) = elabCon (env, denv) c
adamc@493	2336
adam@1639	2337 val rest = cunif env (loc, ktype_record)
adamc@629	2338
adamc@629	2339 val () = checkCon env e' et
adamc@629	2340 (L'.TRecord (L'.CConcat (c', rest), loc), loc)
adamc@493	2341
adamc@628	2342 val gs3 = D.prove env denv (c', rest, loc)
adamc@493	2343 in
adam@1299	2344 checkKind env c' ck (L'.KRecord ktype, loc);
adamc@493	2345 ((L'.ECutMulti (e', c', {rest = rest}), loc), (L'.TRecord rest, loc),
adamc@628	2346 gs1 @ enD gs2 @ enD gs3)
adamc@493	2347 end
adamc@149	2348
adamc@171	2349 \| L.ECase (e, pes) =>
adamc@171	2350 let
adamc@171	2351 val (e', et, gs1) = elabExp (env, denv) e
adam@1639	2352 val result = cunif env (loc, (L'.KType, loc))
adamc@171	2353 val (pes', gs) = ListUtil.foldlMap
adamc@171	2354 (fn ((p, e), gs) =>
adamc@171	2355 let
adamc@628	2356 val ((p', pt), (env, _)) = elabPat (p, (env, SS.empty))
adamc@628	2357
adamc@629	2358 val (e', et', gs1) = elabExp (env, denv) e
adamc@171	2359 in
adamc@628	2360 checkPatCon env p' pt et;
adamc@629	2361 checkCon env e' et' result;
adamc@628	2362 ((p', e'), gs1 @ gs)
adamc@171	2363 end)
adamc@171	2364 gs1 pes
adamc@171	2365 in
adamc@819	2366 case exhaustive (env, et, map #1 pes', loc) of
adamc@819	2367 NONE => ()
adamc@830	2368 \| SOME p => if !mayDelay then
adamc@830	2369 delayedExhaustives := (env, et, map #1 pes', loc) :: !delayedExhaustives
adamc@830	2370 else
adamc@830	2371 expError env (Inexhaustive (loc, p));
adamc@172	2372
adamc@628	2373 ((L'.ECase (e', pes', {disc = et, result = result}), loc), result, gs)
adamc@171	2374 end
adamc@447	2375
adamc@447	2376 \| L.ELet (eds, e) =>
adamc@447	2377 let
adamc@447	2378 val (eds, (env, gs1)) = ListUtil.foldlMap (elabEdecl denv) (env, []) eds
adamc@447	2379 val (e, t, gs2) = elabExp (env, denv) e
adamc@447	2380 in
adamc@825	2381 ((L'.ELet (eds, e, t), loc), t, gs1 @ gs2)
adamc@447	2382 end
adamc@280	2383 in
adamc@819	2384 (prefaces "/elabExp" [("e", SourcePrint.p_exp eAll)];)
adamc@280	2385 r
adamc@91	2386 end
adamc@31	2387
adamc@628	2388 and elabEdecl denv (dAll as (d, loc), (env, gs)) =
adamc@447	2389 let
adamc@447	2390 val r =
adamc@447	2391 case d of
adamc@825	2392 L.EDVal (p, e) =>
adamc@447	2393 let
adamc@825	2394 val ((p', pt), (env', _)) = elabPat (p, (env, SS.empty))
adamc@825	2395 val (e', et, gs1) = elabExp (env, denv) e
adamc@825	2396
adamc@825	2397 val () = checkCon env e' et pt
adamc@825	2398
adam@1554	2399 val env' = E.patBinds env p'
adam@1554	2400 (* Redo to get proper detection of type class witnesses *)
adam@1554	2401
adamc@825	2402 val pt = normClassConstraint env pt
adamc@447	2403 in
adamc@830	2404 case exhaustive (env, et, [p'], loc) of
adamc@830	2405 NONE => ()
adamc@830	2406 \| SOME p => if !mayDelay then
adamc@830	2407 delayedExhaustives := (env, et, [p'], loc) :: !delayedExhaustives
adamc@830	2408 else
adamc@830	2409 expError env (Inexhaustive (loc, p));
adamc@830	2410
adamc@825	2411 ((L'.EDVal (p', pt, e'), loc), (env', gs1 @ gs))
adamc@447	2412 end
adamc@447	2413 \| L.EDValRec vis =>
adamc@447	2414 let
adamc@447	2415 fun allowable (e, _) =
adamc@447	2416 case e of
adamc@447	2417 L.EAbs _ => true
adamc@447	2418 \| L.ECAbs (_, _, _, e) => allowable e
adamc@623	2419 \| L.EKAbs (_, e) => allowable e
adamc@447	2420 \| L.EDisjoint (_, _, e) => allowable e
adamc@447	2421 \| _ => false
adamc@447	2422
adamc@447	2423 val (vis, gs) = ListUtil.foldlMap
adamc@447	2424 (fn ((x, co, e), gs) =>
adamc@447	2425 let
adamc@447	2426 val (c', _, gs1) = case co of
adam@1639	2427 NONE => (cunif env (loc, ktype), ktype, [])
adamc@447	2428 \| SOME c => elabCon (env, denv) c
adamc@447	2429 in
adamc@447	2430 ((x, c', e), enD gs1 @ gs)
adamc@447	2431 end) gs vis
adamc@447	2432
adamc@447	2433 val env = foldl (fn ((x, c', _), env) => E.pushERel env x c') env vis
adamc@447	2434
adamc@447	2435 val (vis, gs) = ListUtil.foldlMap (fn ((x, c', e), gs) =>
adamc@447	2436 let
adamc@447	2437 val (e', et, gs1) = elabExp (env, denv) e
adamc@447	2438 in
adamc@628	2439 checkCon env e' et c';
adamc@447	2440 if allowable e then
adamc@447	2441 ()
adamc@447	2442 else
adamc@447	2443 expError env (IllegalRec (x, e'));
adamc@628	2444 ((x, c', e'), gs1 @ gs)
adamc@447	2445 end) gs vis
adamc@447	2446 in
adamc@447	2447 ((L'.EDValRec vis, loc), (env, gs))
adamc@447	2448 end
adamc@447	2449 in
adamc@447	2450 r
adamc@447	2451 end
adamc@447	2452
adamc@42	2453 val hnormSgn = E.hnormSgn
adamc@31	2454
adamc@210	2455 fun tableOf () = (L'.CModProj (!basis_r, [], "sql_table"), ErrorMsg.dummySpan)
adamc@338	2456 fun sequenceOf () = (L'.CModProj (!basis_r, [], "sql_sequence"), ErrorMsg.dummySpan)
adamc@754	2457 fun viewOf () = (L'.CModProj (!basis_r, [], "sql_view"), ErrorMsg.dummySpan)
adamc@754	2458 fun queryOf () = (L'.CModProj (!basis_r, [], "sql_query"), ErrorMsg.dummySpan)
adamc@459	2459 fun cookieOf () = (L'.CModProj (!basis_r, [], "http_cookie"), ErrorMsg.dummySpan)
adamc@718	2460 fun styleOf () = (L'.CModProj (!basis_r, [], "css_class"), ErrorMsg.dummySpan)
adamc@205	2461
adamc@469	2462 fun dopenConstraints (loc, env, denv) {str, strs} =
adamc@469	2463 case E.lookupStr env str of
adamc@469	2464 NONE => (strError env (UnboundStr (loc, str));
adamc@469	2465 denv)
adamc@469	2466 \| SOME (n, sgn) =>
adamc@469	2467 let
adamc@469	2468 val (st, sgn) = foldl (fn (m, (str, sgn)) =>
adamc@469	2469 case E.projectStr env {str = str, sgn = sgn, field = m} of
adamc@469	2470 NONE => (strError env (UnboundStr (loc, m));
adamc@469	2471 (strerror, sgnerror))
adamc@469	2472 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adamc@469	2473 ((L'.StrVar n, loc), sgn) strs
adamc@1030	2474
adamc@1030	2475 fun collect first (st, sgn) =
adamc@1030	2476 case E.projectConstraints env {sgn = sgn, str = st} of
adamc@1182	2477 NONE => []
adamc@1030	2478 \| SOME cs =>
adamc@1030	2479 case #1 (hnormSgn env sgn) of
adamc@1030	2480 L'.SgnConst sgis =>
adamc@1030	2481 foldl (fn (sgi, cs) =>
adamc@1030	2482 case #1 sgi of
adamc@1030	2483 L'.SgiStr (x, _, _) =>
adamc@1030	2484 (case E.projectStr env {sgn = sgn, str = st, field = x} of
adamc@1030	2485 NONE => raise Fail "Elaborate: projectStr in collect"
adamc@1030	2486 \| SOME sgn' =>
adamc@1030	2487 List.revAppend (collect false ((L'.StrProj (st, x), loc), sgn'),
adamc@1030	2488 cs))
adamc@1030	2489 \| _ => cs) cs sgis
adamc@1030	2490 \| _ => cs
adamc@469	2491 in
adamc@1030	2492 foldl (fn ((c1, c2), denv) =>
adamc@1030	2493 D.assert env denv (c1, c2)) denv (collect true (st, sgn))
adamc@469	2494 end
adamc@469	2495
adamc@88	2496 fun elabSgn_item ((sgi, loc), (env, denv, gs)) =
adamc@1270	2497 ((Print.preface ("elabSgi", SourcePrint.p_sgn_item (sgi, loc));)
adamc@1270	2498 case sgi of
adamc@1270	2499 L.SgiConAbs (x, k) =>
adamc@1270	2500 let
adamc@1270	2501 val k' = elabKind env k
adamc@1270	2502
adamc@1270	2503 val (env', n) = E.pushCNamed env x k' NONE
adamc@1270	2504 in
adamc@1270	2505 ([(L'.SgiConAbs (x, n, k'), loc)], (env', denv, gs))
adamc@1270	2506 end
adamc@1270	2507
adamc@1270	2508 \| L.SgiCon (x, ko, c) =>
adamc@1270	2509 let
adamc@1270	2510 val k' = case ko of
adam@1639	2511 NONE => kunif env loc
adamc@1270	2512 \| SOME k => elabKind env k
adamc@1270	2513
adamc@1270	2514 val (c', ck, gs') = elabCon (env, denv) c
adamc@1270	2515 val (env', n) = E.pushCNamed env x k' (SOME c')
adamc@1270	2516 in
adamc@1270	2517 checkKind env c' ck k';
adamc@1270	2518
adamc@1270	2519 ([(L'.SgiCon (x, n, k', c'), loc)], (env', denv, gs' @ gs))
adamc@1270	2520 end
adamc@1270	2521
adamc@1270	2522 \| L.SgiDatatype dts =>
adamc@1270	2523 let
adamc@1270	2524 val k = (L'.KType, loc)
adamc@1270	2525
adamc@1270	2526 val (dts, env) = ListUtil.foldlMap (fn ((x, xs, xcs), env) =>
adamc@1270	2527 let
adamc@1270	2528 val k' = foldl (fn (_, k') => (L'.KArrow (k, k'), loc)) k xs
adamc@1270	2529 val (env, n) = E.pushCNamed env x k' NONE
adamc@1270	2530 in
adamc@1270	2531 ((x, n, xs, xcs), env)
adamc@1270	2532 end)
adamc@1270	2533 env dts
adamc@1270	2534
adamc@1270	2535 val (dts, env) = ListUtil.foldlMap
adamc@1270	2536 (fn ((x, n, xs, xcs), env) =>
adamc@1270	2537 let
adamc@1270	2538 val t = (L'.CNamed n, loc)
adamc@1270	2539 val nxs = length xs - 1
adamc@1270	2540 val t = ListUtil.foldli (fn (i, _, t) =>
adamc@1270	2541 (L'.CApp (t, (L'.CRel (nxs - i), loc)), loc)) t xs
adamc@1270	2542
adamc@1270	2543 val (env', denv') = foldl (fn (x, (env', denv')) =>
adamc@1270	2544 (E.pushCRel env' x k,
adamc@1270	2545 D.enter denv')) (env, denv) xs
adamc@1270	2546
adamc@1270	2547 val (xcs, (used, env, gs)) =
adamc@1270	2548 ListUtil.foldlMap
adamc@1270	2549 (fn ((x, to), (used, env, gs)) =>
adamc@1270	2550 let
adamc@1270	2551 val (to, t, gs') = case to of
adamc@1270	2552 NONE => (NONE, t, gs)
adamc@1270	2553 \| SOME t' =>
adamc@1270	2554 let
adamc@1270	2555 val (t', tk, gs') =
adamc@1270	2556 elabCon (env', denv') t'
adamc@1270	2557 in
adamc@1270	2558 checkKind env' t' tk k;
adamc@1270	2559 (SOME t',
adamc@1270	2560 (L'.TFun (t', t), loc),
adamc@1270	2561 gs' @ gs)
adamc@1270	2562 end
adamc@1270	2563 val t = foldl (fn (x, t) => (L'.TCFun (L'.Implicit, x, k, t), loc))
adamc@1270	2564 t xs
adamc@1270	2565
adamc@1270	2566 val (env, n') = E.pushENamed env x t
adamc@1270	2567 in
adamc@1270	2568 if SS.member (used, x) then
adamc@1270	2569 strError env (DuplicateConstructor (x, loc))
adamc@1270	2570 else
adamc@1270	2571 ();
adamc@1270	2572 ((x, n', to), (SS.add (used, x), env, gs'))
adamc@1270	2573 end)
adamc@1270	2574 (SS.empty, env, []) xcs
adamc@1270	2575 in
adamc@1270	2576 ((x, n, xs, xcs), E.pushDatatype env n xs xcs)
adamc@1270	2577 end)
adamc@1270	2578 env dts
adamc@1270	2579 in
adamc@1270	2580 ([(L'.SgiDatatype dts, loc)], (env, denv, gs))
adamc@1270	2581 end
adamc@1270	2582
adamc@1270	2583 \| L.SgiDatatypeImp (_, [], _) => raise Fail "Empty SgiDatatypeImp"
adamc@1270	2584
adamc@1270	2585 \| L.SgiDatatypeImp (x, m1 :: ms, s) =>
adamc@1270	2586 (case E.lookupStr env m1 of
adamc@1270	2587 NONE => (strError env (UnboundStr (loc, m1));
adamc@1270	2588 ([], (env, denv, gs)))
adamc@1270	2589 \| SOME (n, sgn) =>
adamc@1270	2590 let
adamc@1270	2591 val (str, sgn) = foldl (fn (m, (str, sgn)) =>
adamc@1270	2592 case E.projectStr env {sgn = sgn, str = str, field = m} of
adamc@1270	2593 NONE => (conError env (UnboundStrInCon (loc, m));
adamc@1270	2594 (strerror, sgnerror))
adamc@1270	2595 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adamc@1270	2596 ((L'.StrVar n, loc), sgn) ms
adamc@1270	2597 in
adamc@1270	2598 case hnormCon env (L'.CModProj (n, ms, s), loc) of
adamc@1270	2599 (L'.CModProj (n, ms, s), _) =>
adamc@1270	2600 (case E.projectDatatype env {sgn = sgn, str = str, field = s} of
adamc@1270	2601 NONE => (conError env (UnboundDatatype (loc, s));
adamc@1270	2602 ([], (env, denv, [])))
adamc@1270	2603 \| SOME (xs, xncs) =>
adamc@1270	2604 let
adamc@1270	2605 val k = (L'.KType, loc)
adamc@1270	2606 val k' = foldl (fn (_, k') => (L'.KArrow (k, k'), loc)) k xs
adamc@1270	2607
adamc@1270	2608 val t = (L'.CModProj (n, ms, s), loc)
adamc@1270	2609 val (env, n') = E.pushCNamed env x k' (SOME t)
adamc@1270	2610 val env = E.pushDatatype env n' xs xncs
adamc@1270	2611
adamc@1270	2612 val t = (L'.CNamed n', loc)
adamc@1270	2613 val env = foldl (fn ((x, n, to), env) =>
adamc@805	2614 let
adamc@1270	2615 val t = case to of
adamc@1270	2616 NONE => t
adamc@1270	2617 \| SOME t' => (L'.TFun (t', t), loc)
adamc@1270	2618
adamc@1270	2619 val t = foldr (fn (x, t) =>
adamc@1270	2620 (L'.TCFun (L'.Implicit, x, k, t), loc))
adamc@1270	2621 t xs
adamc@805	2622 in
adamc@1270	2623 E.pushENamedAs env x n t
adamc@1270	2624 end) env xncs
adamc@1270	2625 in
adamc@1270	2626 ([(L'.SgiDatatypeImp (x, n', n, ms, s, xs, xncs), loc)], (env, denv, []))
adamc@1270	2627 end)
adamc@1270	2628 \| _ => (strError env (NotDatatype loc);
adamc@1270	2629 ([], (env, denv, [])))
adamc@1270	2630 end)
adamc@1270	2631
adamc@1270	2632 \| L.SgiVal (x, c) =>
adamc@1270	2633 let
adamc@1270	2634 val (c', ck, gs') = elabCon (env, denv) c
adamc@1270	2635
adamc@1270	2636 val old = c'
adamc@1270	2637 val c' = normClassConstraint env c'
adamc@1270	2638 val (env', n) = E.pushENamed env x c'
adamc@1270	2639 in
adamc@1270	2640 (unifyKinds env ck ktype
adam@1719	2641 handle KUnify arg => strError env (NotType (loc, ck, arg)));
adamc@1270	2642
adamc@1270	2643 ([(L'.SgiVal (x, n, c'), loc)], (env', denv, gs' @ gs))
adamc@1270	2644 end
adamc@1270	2645
adamc@1270	2646 \| L.SgiTable (x, c, pe, ce) =>
adamc@1270	2647 let
adamc@1270	2648 val cstK = (L'.KRecord (L'.KRecord (L'.KUnit, loc), loc), loc)
adamc@1270	2649
adamc@1270	2650 val (c', ck, gs') = elabCon (env, denv) c
adam@1639	2651 val pkey = cunif env (loc, cstK)
adam@1639	2652 val visible = cunif env (loc, cstK)
adam@1886	2653
adam@1886	2654 val x' = x ^ "_hidden_constraints"
adam@1886	2655 val (env', hidden_n) = E.pushCNamed env x' cstK NONE
adam@1886	2656 val hidden = (L'.CNamed hidden_n, loc)
adam@1886	2657
adam@1886	2658 val uniques = (L'.CConcat (visible, hidden), loc)
adamc@1270	2659
adamc@1270	2660 val ct = tableOf ()
adamc@1270	2661 val ct = (L'.CApp (ct, c'), loc)
adamc@1270	2662 val ct = (L'.CApp (ct, (L'.CConcat (pkey, uniques), loc)), loc)
adamc@1270	2663
adamc@1270	2664 val (pe', pet, gs'') = elabExp (env', denv) pe
adamc@1270	2665 val gs'' = List.mapPartial (fn Disjoint x => SOME x
adamc@707	2666 \| _ => NONE) gs''
adamc@707	2667
adamc@1270	2668 val pst = (L'.CModProj (!basis_r, [], "primary_key"), loc)
adamc@1270	2669 val pst = (L'.CApp (pst, c'), loc)
adamc@1270	2670 val pst = (L'.CApp (pst, pkey), loc)
adamc@1270	2671
adamc@1270	2672 val (ce', cet, gs''') = elabExp (env', denv) ce
adamc@1270	2673 val gs''' = List.mapPartial (fn Disjoint x => SOME x
adamc@1270	2674 \| _ => NONE) gs'''
adamc@1270	2675
adamc@1270	2676 val cst = (L'.CModProj (!basis_r, [], "sql_constraints"), loc)
adamc@1270	2677 val cst = (L'.CApp (cst, c'), loc)
adamc@1270	2678 val cst = (L'.CApp (cst, visible), loc)
adam@1886	2679
adam@1886	2680 val (env', n) = E.pushENamed env' x ct
adamc@1270	2681 in
adamc@1270	2682 checkKind env c' ck (L'.KRecord (L'.KType, loc), loc);
adamc@1270	2683 checkCon env' pe' pet pst;
adamc@1270	2684 checkCon env' ce' cet cst;
adamc@1270	2685
adam@1886	2686 ([(L'.SgiConAbs (x', hidden_n, cstK), loc),
adam@1912	2687 (L'.SgiConstraint ((L'.CConcat (pkey, visible), loc), hidden), loc),
adam@1886	2688 (L'.SgiVal (x, n, ct), loc)], (env', denv, gs''' @ gs'' @ gs' @ gs))
adamc@1270	2689 end
adamc@1270	2690
adamc@1270	2691 \| L.SgiStr (x, sgn) =>
adamc@1270	2692 let
adamc@1270	2693 val (sgn', gs') = elabSgn (env, denv) sgn
adamc@1270	2694 val (env', n) = E.pushStrNamed env x sgn'
adam@1864	2695 val denv' = dopenConstraints (loc, env', denv) {str = x, strs = []}
adamc@1270	2696 in
adam@1864	2697 ([(L'.SgiStr (x, n, sgn'), loc)], (env', denv', gs' @ gs))
adamc@1270	2698 end
adamc@1270	2699
adamc@1270	2700 \| L.SgiSgn (x, sgn) =>
adamc@1270	2701 let
adamc@1270	2702 val (sgn', gs') = elabSgn (env, denv) sgn
adamc@1270	2703 val (env', n) = E.pushSgnNamed env x sgn'
adamc@1270	2704 in
adamc@1270	2705 ([(L'.SgiSgn (x, n, sgn'), loc)], (env', denv, gs' @ gs))
adamc@1270	2706 end
adamc@1270	2707
adamc@1270	2708 \| L.SgiInclude sgn =>
adamc@1270	2709 let
adamc@1270	2710 val (sgn', gs') = elabSgn (env, denv) sgn
adamc@1270	2711 in
adamc@1270	2712 case #1 (hnormSgn env sgn') of
adamc@1270	2713 L'.SgnConst sgis =>
adamc@1270	2714 (sgis, (foldl (fn (sgi, env) => E.sgiBinds env sgi) env sgis, denv, gs' @ gs))
adamc@1270	2715 \| _ => (sgnError env (NotIncludable sgn');
adamc@1270	2716 ([], (env, denv, [])))
adamc@1270	2717 end
adamc@1270	2718
adamc@1270	2719 \| L.SgiConstraint (c1, c2) =>
adamc@1270	2720 let
adamc@1270	2721 val (c1', k1, gs1) = elabCon (env, denv) c1
adamc@1270	2722 val (c2', k2, gs2) = elabCon (env, denv) c2
adamc@1270	2723
adamc@1270	2724 val denv = D.assert env denv (c1', c2')
adamc@1270	2725 in
adam@1639	2726 checkKind env c1' k1 (L'.KRecord (kunif env loc), loc);
adam@1639	2727 checkKind env c2' k2 (L'.KRecord (kunif env loc), loc);
adamc@1270	2728
adamc@1270	2729 ([(L'.SgiConstraint (c1', c2'), loc)], (env, denv, gs1 @ gs2))
adamc@1270	2730 end
adamc@1270	2731
adamc@1270	2732 \| L.SgiClassAbs (x, k) =>
adamc@1270	2733 let
adamc@1270	2734 val k = elabKind env k
adamc@1270	2735 val (env, n) = E.pushCNamed env x k NONE
adamc@1270	2736 val env = E.pushClass env n
adamc@1270	2737 in
adamc@1270	2738 ([(L'.SgiClassAbs (x, n, k), loc)], (env, denv, []))
adamc@1270	2739 end
adamc@1270	2740
adamc@1270	2741 \| L.SgiClass (x, k, c) =>
adamc@1270	2742 let
adamc@1270	2743 val k = elabKind env k
adamc@1270	2744 val (c', ck, gs) = elabCon (env, denv) c
adamc@1270	2745 val (env, n) = E.pushCNamed env x k (SOME c')
adamc@1270	2746 val env = E.pushClass env n
adamc@1270	2747 in
adamc@1270	2748 checkKind env c' ck k;
adamc@1270	2749 ([(L'.SgiClass (x, n, k, c'), loc)], (env, denv, []))
adamc@1270	2750 end)
adamc@211	2751
adamc@83	2752 and elabSgn (env, denv) (sgn, loc) =
adamc@31	2753 case sgn of
adamc@31	2754 L.SgnConst sgis =>
adamc@31	2755 let
adamc@88	2756 val (sgis', (_, _, gs)) = ListUtil.foldlMapConcat elabSgn_item (env, denv, []) sgis
adamc@62	2757
adamc@62	2758 val _ = foldl (fn ((sgi, loc), (cons, vals, sgns, strs)) =>
adamc@62	2759 case sgi of
adamc@62	2760 L'.SgiConAbs (x, _, _) =>
adamc@62	2761 (if SS.member (cons, x) then
adamc@62	2762 sgnError env (DuplicateCon (loc, x))
adamc@62	2763 else
adamc@62	2764 ();
adamc@62	2765 (SS.add (cons, x), vals, sgns, strs))
adamc@62	2766 \| L'.SgiCon (x, _, _, _) =>
adamc@62	2767 (if SS.member (cons, x) then
adamc@62	2768 sgnError env (DuplicateCon (loc, x))
adamc@62	2769 else
adamc@62	2770 ();
adamc@62	2771 (SS.add (cons, x), vals, sgns, strs))
adamc@805	2772 \| L'.SgiDatatype dts =>
adamc@156	2773 let
adamc@805	2774 val (cons, vals) =
adamc@805	2775 let
adamc@805	2776 fun doOne ((x, _, _, xncs), (cons, vals)) =
adamc@805	2777 let
adamc@805	2778 val vals = foldl (fn ((x, _, _), vals) =>
adamc@805	2779 (if SS.member (vals, x) then
adamc@805	2780 sgnError env (DuplicateVal (loc, x))
adamc@805	2781 else
adamc@805	2782 ();
adamc@805	2783 SS.add (vals, x)))
adamc@805	2784 vals xncs
adamc@805	2785 in
adamc@805	2786 if SS.member (cons, x) then
adamc@805	2787 sgnError env (DuplicateCon (loc, x))
adamc@805	2788 else
adamc@805	2789 ();
adamc@805	2790 (SS.add (cons, x), vals)
adamc@805	2791 end
adamc@805	2792 in
adamc@805	2793 foldl doOne (cons, vals) dts
adamc@805	2794 end
adamc@156	2795 in
adamc@805	2796 (cons, vals, sgns, strs)
adamc@156	2797 end
adamc@191	2798 \| L'.SgiDatatypeImp (x, _, _, _, _, _, _) =>
adamc@156	2799 (if SS.member (cons, x) then
adamc@156	2800 sgnError env (DuplicateCon (loc, x))
adamc@156	2801 else
adamc@156	2802 ();
adamc@156	2803 (SS.add (cons, x), vals, sgns, strs))
adamc@62	2804 \| L'.SgiVal (x, _, _) =>
adamc@62	2805 (if SS.member (vals, x) then
adamc@62	2806 sgnError env (DuplicateVal (loc, x))
adamc@62	2807 else
adamc@62	2808 ();
adamc@62	2809 (cons, SS.add (vals, x), sgns, strs))
adamc@62	2810 \| L'.SgiSgn (x, _, _) =>
adamc@62	2811 (if SS.member (sgns, x) then
adamc@62	2812 sgnError env (DuplicateSgn (loc, x))
adamc@62	2813 else
adamc@62	2814 ();
adamc@62	2815 (cons, vals, SS.add (sgns, x), strs))
adamc@62	2816 \| L'.SgiStr (x, _, _) =>
adamc@62	2817 (if SS.member (strs, x) then
adamc@62	2818 sgnError env (DuplicateStr (loc, x))
adamc@62	2819 else
adamc@62	2820 ();
adamc@88	2821 (cons, vals, sgns, SS.add (strs, x)))
adamc@203	2822 \| L'.SgiConstraint _ => (cons, vals, sgns, strs)
adamc@563	2823 \| L'.SgiClassAbs (x, _, _) =>
adamc@211	2824 (if SS.member (cons, x) then
adamc@211	2825 sgnError env (DuplicateCon (loc, x))
adamc@211	2826 else
adamc@211	2827 ();
adamc@211	2828 (SS.add (cons, x), vals, sgns, strs))
adamc@563	2829 \| L'.SgiClass (x, _, _, _) =>
adamc@211	2830 (if SS.member (cons, x) then
adamc@211	2831 sgnError env (DuplicateCon (loc, x))
adamc@211	2832 else
adamc@211	2833 ();
adamc@460	2834 (SS.add (cons, x), vals, sgns, strs)))
adamc@62	2835 (SS.empty, SS.empty, SS.empty, SS.empty) sgis'
adamc@31	2836 in
adamc@83	2837 ((L'.SgnConst sgis', loc), gs)
adamc@31	2838 end
adamc@31	2839 \| L.SgnVar x =>
adamc@31	2840 (case E.lookupSgn env x of
adamc@31	2841 NONE =>
adamc@31	2842 (sgnError env (UnboundSgn (loc, x));
adamc@83	2843 ((L'.SgnError, loc), []))
adamc@83	2844 \| SOME (n, sgis) => ((L'.SgnVar n, loc), []))
adamc@41	2845 \| L.SgnFun (m, dom, ran) =>
adamc@41	2846 let
adamc@83	2847 val (dom', gs1) = elabSgn (env, denv) dom
adamc@41	2848 val (env', n) = E.pushStrNamed env m dom'
adamc@469	2849 val denv' = dopenConstraints (loc, env', denv) {str = m, strs = []}
adamc@469	2850 val (ran', gs2) = elabSgn (env', denv') ran
adamc@41	2851 in
adamc@83	2852 ((L'.SgnFun (m, n, dom', ran'), loc), gs1 @ gs2)
adamc@41	2853 end
adam@1864	2854 \| L.SgnWhere (sgn, ms, x, c) =>
adamc@42	2855 let
adamc@83	2856 val (sgn', ds1) = elabSgn (env, denv) sgn
adamc@83	2857 val (c', ck, ds2) = elabCon (env, denv) c
adam@1864	2858
adam@1864	2859 fun checkPath (ms, sgn') =
adam@1864	2860 case #1 (hnormSgn env sgn') of
adam@1864	2861 L'.SgnConst sgis =>
adam@1864	2862 List.exists (fn (L'.SgiConAbs (x', _, k), _) =>
adam@1864	2863 List.null ms andalso x' = x andalso
adam@1864	2864 (unifyKinds env k ck
adam@1864	2865 handle KUnify x => sgnError env (WhereWrongKind x);
adam@1864	2866 true)
adam@1864	2867 \| (L'.SgiStr (x', _, sgn''), _) =>
adam@1864	2868 (case ms of
adam@1864	2869 [] => false
adam@1864	2870 \| m :: ms' =>
adam@1864	2871 m = x' andalso
adam@1864	2872 checkPath (ms', sgn''))
adam@1864	2873 \| _ => false) sgis
adam@1864	2874 \| _ => false
adam@1864	2875 in
adam@1864	2876 if checkPath (ms, sgn') then
adam@1864	2877 ((L'.SgnWhere (sgn', ms, x, c'), loc), ds1 @ ds2)
adam@1864	2878 else
adam@1864	2879 (sgnError env (UnWhereable (sgn', x));
adam@1864	2880 (sgnerror, []))
adamc@42	2881 end
adamc@59	2882 \| L.SgnProj (m, ms, x) =>
adamc@59	2883 (case E.lookupStr env m of
adamc@59	2884 NONE => (strError env (UnboundStr (loc, m));
adamc@83	2885 (sgnerror, []))
adamc@59	2886 \| SOME (n, sgn) =>
adamc@59	2887 let
adamc@59	2888 val (str, sgn) = foldl (fn (m, (str, sgn)) =>
adamc@59	2889 case E.projectStr env {sgn = sgn, str = str, field = m} of
adamc@59	2890 NONE => (strError env (UnboundStr (loc, m));
adamc@59	2891 (strerror, sgnerror))
adamc@59	2892 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adamc@59	2893 ((L'.StrVar n, loc), sgn) ms
adamc@59	2894 in
adamc@59	2895 case E.projectSgn env {sgn = sgn, str = str, field = x} of
adamc@59	2896 NONE => (sgnError env (UnboundSgn (loc, x));
adamc@83	2897 (sgnerror, []))
adamc@83	2898 \| SOME _ => ((L'.SgnProj (n, ms, x), loc), [])
adamc@59	2899 end)
adamc@59	2900
adamc@31	2901
adamc@706	2902 and selfify env {str, strs, sgn} =
adamc@66	2903 case #1 (hnormSgn env sgn) of
adamc@66	2904 L'.SgnError => sgn
adamc@66	2905 \| L'.SgnVar _ => sgn
adamc@66	2906
adamc@66	2907 \| L'.SgnConst sgis =>
adam@1387	2908 (L'.SgnConst (#1 (ListUtil.foldlMapConcat
adam@1387	2909 (fn (sgi, env) =>
adam@1387	2910 (case sgi of (L'.SgiConAbs (x, n, k), loc) =>
adam@1387	2911 [(L'.SgiCon (x, n, k, (L'.CModProj (str, strs, x), loc)), loc)]
adam@1387	2912 \| (L'.SgiDatatype dts, loc) =>
adam@1387	2913 map (fn (x, n, xs, xncs) => (L'.SgiDatatypeImp (x, n, str, strs, x, xs, xncs), loc)) dts
adam@1387	2914 \| (L'.SgiClassAbs (x, n, k), loc) =>
adam@1387	2915 [(L'.SgiClass (x, n, k, (L'.CModProj (str, strs, x), loc)), loc)]
adam@1387	2916 \| (L'.SgiStr (x, n, sgn), loc) =>
adam@1387	2917 [(L'.SgiStr (x, n, selfify env {str = str, strs = strs @ [x], sgn = sgn}), loc)]
adam@1387	2918 \| x => [x],
adam@1387	2919 E.sgiBinds env sgi)) env sgis)), #2 sgn)
adamc@66	2920 \| L'.SgnFun _ => sgn
adamc@66	2921 \| L'.SgnWhere _ => sgn
adamc@66	2922 \| L'.SgnProj (m, ms, x) =>
adamc@66	2923 case E.projectSgn env {str = foldl (fn (m, str) => (L'.StrProj (str, m), #2 sgn))
adamc@66	2924 (L'.StrVar m, #2 sgn) ms,
adamc@66	2925 sgn = #2 (E.lookupStrNamed env m),
adamc@66	2926 field = x} of
adamc@66	2927 NONE => raise Fail "Elaborate.selfify: projectSgn returns NONE"
adamc@66	2928 \| SOME sgn => selfify env {str = str, strs = strs, sgn = sgn}
adamc@66	2929
adamc@706	2930 and selfifyAt env {str, sgn} =
adamc@66	2931 let
adamc@66	2932 fun self (str, _) =
adamc@66	2933 case str of
adamc@66	2934 L'.StrVar x => SOME (x, [])
adamc@66	2935 \| L'.StrProj (str, x) =>
adamc@66	2936 (case self str of
adamc@66	2937 NONE => NONE
adamc@66	2938 \| SOME (m, ms) => SOME (m, ms @ [x]))
adamc@66	2939 \| _ => NONE
adamc@66	2940 in
adamc@66	2941 case self str of
adamc@66	2942 NONE => sgn
adamc@66	2943 \| SOME (str, strs) => selfify env {sgn = sgn, str = str, strs = strs}
adamc@66	2944 end
adamc@66	2945
adamc@706	2946 and dopen env {str, strs, sgn} =
adamc@66	2947 let
adam@1527	2948 fun isVisible x = x <> "" andalso String.sub (x, 0) <> #"?"
adam@1527	2949
adamc@66	2950 val m = foldl (fn (m, str) => (L'.StrProj (str, m), #2 sgn))
adamc@66	2951 (L'.StrVar str, #2 sgn) strs
adamc@66	2952 in
adamc@66	2953 case #1 (hnormSgn env sgn) of
adamc@66	2954 L'.SgnConst sgis =>
adamc@805	2955 ListUtil.foldlMapConcat
adamc@805	2956 (fn ((sgi, loc), env') =>
adamc@805	2957 let
adamc@805	2958 val d =
adamc@805	2959 case sgi of
adamc@805	2960 L'.SgiConAbs (x, n, k) =>
adam@1527	2961 if isVisible x then
adam@1527	2962 let
adam@1527	2963 val c = (L'.CModProj (str, strs, x), loc)
adam@1527	2964 in
adam@1527	2965 [(L'.DCon (x, n, k, c), loc)]
adam@1527	2966 end
adam@1527	2967 else
adam@1527	2968 []
adamc@805	2969 \| L'.SgiCon (x, n, k, c) =>
adam@1527	2970 if isVisible x then
adam@1527	2971 [(L'.DCon (x, n, k, (L'.CModProj (str, strs, x), loc)), loc)]
adam@1527	2972 else
adam@1527	2973 []
adamc@805	2974 \| L'.SgiDatatype dts =>
adam@1527	2975 List.mapPartial (fn (x, n, xs, xncs) => if isVisible x then
adam@1527	2976 SOME (L'.DDatatypeImp (x, n, str, strs, x, xs, xncs), loc)
adam@1527	2977 else
adam@1527	2978 NONE) dts
adamc@805	2979 \| L'.SgiDatatypeImp (x, n, m1, ms, x', xs, xncs) =>
adam@1527	2980 if isVisible x then
adam@1527	2981 [(L'.DDatatypeImp (x, n, m1, ms, x', xs, xncs), loc)]
adam@1527	2982 else
adam@1527	2983 []
adamc@805	2984 \| L'.SgiVal (x, n, t) =>
adam@1527	2985 if isVisible x then
adam@1527	2986 [(L'.DVal (x, n, t, (L'.EModProj (str, strs, x), loc)), loc)]
adam@1527	2987 else
adam@1527	2988 []
adamc@805	2989 \| L'.SgiStr (x, n, sgn) =>
adam@1527	2990 if isVisible x then
adam@1527	2991 [(L'.DStr (x, n, sgn, (L'.StrProj (m, x), loc)), loc)]
adam@1527	2992 else
adam@1527	2993 []
adamc@805	2994 \| L'.SgiSgn (x, n, sgn) =>
adam@1527	2995 if isVisible x then
adam@1527	2996 [(L'.DSgn (x, n, (L'.SgnProj (str, strs, x), loc)), loc)]
adam@1527	2997 else
adam@1527	2998 []
adamc@805	2999 \| L'.SgiConstraint (c1, c2) =>
adamc@805	3000 [(L'.DConstraint (c1, c2), loc)]
adamc@805	3001 \| L'.SgiClassAbs (x, n, k) =>
adam@1527	3002 if isVisible x then
adam@1527	3003 let
adam@1527	3004 val c = (L'.CModProj (str, strs, x), loc)
adam@1527	3005 in
adam@1527	3006 [(L'.DCon (x, n, k, c), loc)]
adam@1527	3007 end
adam@1527	3008 else
adam@1527	3009 []
adamc@805	3010 \| L'.SgiClass (x, n, k, _) =>
adam@1527	3011 if isVisible x then
adam@1527	3012 let
adam@1527	3013 val c = (L'.CModProj (str, strs, x), loc)
adam@1527	3014 in
adam@1527	3015 [(L'.DCon (x, n, k, c), loc)]
adam@1527	3016 end
adam@1527	3017 else
adam@1527	3018 []
adamc@805	3019 in
adamc@805	3020 (d, foldl (fn (d, env') => E.declBinds env' d) env' d)
adamc@805	3021 end)
adamc@805	3022 env sgis
adamc@66	3023 \| _ => (strError env (UnOpenable sgn);
adamc@628	3024 ([], env))
adamc@66	3025 end
adamc@66	3026
adamc@706	3027 and sgiOfDecl (d, loc) =
adamc@31	3028 case d of
adamc@123	3029 L'.DCon (x, n, k, c) => [(L'.SgiCon (x, n, k, c), loc)]
adamc@156	3030 \| L'.DDatatype x => [(L'.SgiDatatype x, loc)]
adamc@156	3031 \| L'.DDatatypeImp x => [(L'.SgiDatatypeImp x, loc)]
adamc@123	3032 \| L'.DVal (x, n, t, _) => [(L'.SgiVal (x, n, t), loc)]
adamc@123	3033 \| L'.DValRec vis => map (fn (x, n, t, _) => (L'.SgiVal (x, n, t), loc)) vis
adamc@123	3034 \| L'.DSgn (x, n, sgn) => [(L'.SgiSgn (x, n, sgn), loc)]
adamc@123	3035 \| L'.DStr (x, n, sgn, _) => [(L'.SgiStr (x, n, sgn), loc)]
adamc@123	3036 \| L'.DFfiStr (x, n, sgn) => [(L'.SgiStr (x, n, sgn), loc)]
adamc@123	3037 \| L'.DConstraint cs => [(L'.SgiConstraint cs, loc)]
adamc@123	3038 \| L'.DExport _ => []
adamc@707	3039 \| L'.DTable (tn, x, n, c, _, pc, _, cc) =>
adamc@707	3040 [(L'.SgiVal (x, n, (L'.CApp ((L'.CApp (tableOf (), c), loc),
adamc@707	3041 (L'.CConcat (pc, cc), loc)), loc)), loc)]
adamc@460	3042 \| L'.DSequence (tn, x, n) => [(L'.SgiVal (x, n, sequenceOf ()), loc)]
adamc@754	3043 \| L'.DView (tn, x, n, _, c) =>
adamc@754	3044 [(L'.SgiVal (x, n, (L'.CApp (viewOf (), c), loc)), loc)]
adamc@271	3045 \| L'.DDatabase _ => []
adamc@460	3046 \| L'.DCookie (tn, x, n, c) => [(L'.SgiVal (x, n, (L'.CApp (cookieOf (), c), loc)), loc)]
adamc@720	3047 \| L'.DStyle (tn, x, n) => [(L'.SgiVal (x, n, styleOf ()), loc)]
adamc@1075	3048 \| L'.DTask _ => []
adamc@1199	3049 \| L'.DPolicy _ => []
adam@1294	3050 \| L'.DOnError _ => []
adam@2010	3051 \| L'.DFfi (x, n, _, t) => [(L'.SgiVal (x, n, t), loc)]
adamc@88	3052
adamc@1000	3053 and subSgn' counterparts env strLoc sgn1 (sgn2 as (_, loc2)) =
adamc@469	3054 ((*prefaces "subSgn" [("sgn1", p_sgn env sgn1),
adamc@469	3055 ("sgn2", p_sgn env sgn2)];*)
adamc@35	3056 case (#1 (hnormSgn env sgn1), #1 (hnormSgn env sgn2)) of
adamc@31	3057 (L'.SgnError, _) => ()
adamc@31	3058 \| (_, L'.SgnError) => ()
adamc@31	3059
adamc@31	3060 \| (L'.SgnConst sgis1, L'.SgnConst sgis2) =>
adamc@31	3061 let
adam@2092	3062 (*val () = prefaces "subSgn" [("sgn1", p_sgn env sgn1),
adamc@362	3063 ("sgn2", p_sgn env sgn2),
adamc@362	3064 ("sgis1", p_sgn env (L'.SgnConst sgis1, loc2)),
adamc@362	3065 ("sgis2", p_sgn env (L'.SgnConst sgis2, loc2))]*)
adamc@362	3066
adamc@838	3067 fun cpart n = IM.find (!counterparts, n)
adamc@838	3068 fun cparts (n2, n1) = counterparts := IM.insert (!counterparts, n2, n1)
adamc@838	3069
adamc@838	3070 val sub2 = U.Con.map {kind = fn k => k,
adamc@838	3071 con = fn c =>
adamc@838	3072 case c of
adamc@838	3073 L'.CNamed n2 =>
adamc@838	3074 (case cpart n2 of
adamc@838	3075 NONE => c
adamc@838	3076 \| SOME n1 => L'.CNamed n1)
adamc@838	3077 \| _ => c}
adamc@838	3078
adamc@628	3079 fun folder (sgi2All as (sgi, loc), env) =
adamc@31	3080 let
adam@1668	3081 (val () = prefaces "folder" [("sgi2", p_sgn_item env sgi2All)])
adamc@362	3082
adamc@805	3083 fun seek' f p =
adamc@31	3084 let
adamc@628	3085 fun seek env ls =
adamc@31	3086 case ls of
adamc@805	3087 [] => f env
adamc@31	3088 \| h :: t =>
adamc@469	3089 case p (env, h) of
adamc@469	3090 NONE =>
adamc@469	3091 let
adamc@469	3092 val env = case #1 h of
adamc@469	3093 L'.SgiCon (x, n, k, c) =>
adamc@471	3094 if E.checkENamed env n then
adamc@471	3095 env
adamc@471	3096 else
adamc@471	3097 E.pushCNamedAs env x n k (SOME c)
adamc@469	3098 \| L'.SgiConAbs (x, n, k) =>
adamc@471	3099 if E.checkENamed env n then
adamc@471	3100 env
adamc@471	3101 else
adamc@471	3102 E.pushCNamedAs env x n k NONE
adamc@469	3103 \| _ => env
adamc@469	3104 in
adamc@628	3105 seek (E.sgiBinds env h) t
adamc@469	3106 end
adamc@88	3107 \| SOME envs => envs
adamc@31	3108 in
adamc@628	3109 seek env sgis1
adamc@31	3110 end
adamc@805	3111
adamc@1000	3112 val seek = seek' (fn env => (sgnError env (UnmatchedSgi (strLoc, sgi2All));
adamc@805	3113 env))
adamc@31	3114 in
adamc@31	3115 case sgi of
adamc@31	3116 L'.SgiConAbs (x, n2, k2) =>
adam@1591	3117 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@31	3118 let
adamc@41	3119 fun found (x', n1, k1, co1) =
adamc@41	3120 if x = x' then
adamc@41	3121 let
adamc@623	3122 val () = unifyKinds env k1 k2
adam@1719	3123 handle KUnify (k1, k2, env', err) =>
adam@1591	3124 sgnError env (SgiWrongKind (loc, sgi1All, k1,
adam@1719	3125 sgi2All, k2, env', err))
adamc@41	3126 val env = E.pushCNamedAs env x n1 k1 co1
adamc@41	3127 in
adamc@41	3128 SOME (if n1 = n2 then
adamc@41	3129 env
adamc@41	3130 else
adamc@838	3131 (cparts (n2, n1);
adamc@838	3132 E.pushCNamedAs env x n2 k2 (SOME (L'.CNamed n1, loc2))))
adamc@41	3133 end
adamc@41	3134 else
adamc@41	3135 NONE
adamc@31	3136 in
adamc@31	3137 case sgi1 of
adamc@41	3138 L'.SgiConAbs (x', n1, k1) => found (x', n1, k1, NONE)
adamc@41	3139 \| L'.SgiCon (x', n1, k1, c1) => found (x', n1, k1, SOME c1)
adamc@805	3140 \| L'.SgiDatatype dts =>
adamc@191	3141 let
adamc@191	3142 val k = (L'.KType, loc)
adamc@805	3143
adamc@805	3144 fun search dts =
adamc@805	3145 case dts of
adamc@805	3146 [] => NONE
adamc@805	3147 \| (x', n1, xs, _) :: dts =>
adamc@805	3148 let
adamc@805	3149 val k' = foldl (fn (_, k') => (L'.KArrow (k, k'), loc)) k xs
adamc@805	3150 in
adamc@805	3151 case found (x', n1, k', NONE) of
adamc@805	3152 NONE => search dts
adamc@805	3153 \| x => x
adamc@805	3154 end
adamc@191	3155 in
adamc@805	3156 search dts
adamc@191	3157 end
adamc@191	3158 \| L'.SgiDatatypeImp (x', n1, m1, ms, s, xs, _) =>
adamc@191	3159 let
adamc@191	3160 val k = (L'.KType, loc)
adamc@191	3161 val k' = foldl (fn (_, k') => (L'.KArrow (k, k'), loc)) k xs
adamc@191	3162 in
adamc@191	3163 found (x', n1, k', SOME (L'.CModProj (m1, ms, s), loc))
adamc@191	3164 end
adamc@711	3165 \| L'.SgiClassAbs (x', n1, k) => found (x', n1, k, NONE)
adamc@711	3166 \| L'.SgiClass (x', n1, k, c) => found (x', n1, k, SOME c)
adamc@31	3167 \| _ => NONE
adamc@31	3168 end)
adamc@31	3169
adamc@31	3170 \| L'.SgiCon (x, n2, k2, c2) =>
adam@1591	3171 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@211	3172 let
adamc@211	3173 fun found (x', n1, k1, c1) =
adamc@211	3174 if x = x' then
adamc@211	3175 let
adamc@838	3176 val c2 = sub2 c2
adamc@838	3177
adamc@327	3178 fun good () =
adamc@327	3179 let
adamc@327	3180 val env = E.pushCNamedAs env x n2 k2 (SOME c2)
adamc@327	3181 val env = if n1 = n2 then
adamc@327	3182 env
adamc@327	3183 else
adamc@839	3184 (cparts (n2, n1);
adamc@839	3185 E.pushCNamedAs env x n1 k1 (SOME c1))
adamc@327	3186 in
adamc@628	3187 SOME env
adamc@327	3188 end
adamc@211	3189 in
adamc@987	3190 (unifyCons env loc c1 c2;
adamc@628	3191 good ())
adam@1719	3192 handle CUnify (c1, c2, env', err) =>
adam@1591	3193 (sgnError env (SgiWrongCon (loc, sgi1All, c1,
adam@1719	3194 sgi2All, c2, env', err));
adamc@211	3195 good ())
adamc@211	3196 end
adamc@211	3197 else
adamc@211	3198 NONE
adamc@211	3199 in
adamc@211	3200 case sgi1 of
adamc@211	3201 L'.SgiCon (x', n1, k1, c1) => found (x', n1, k1, c1)
adamc@711	3202 \| L'.SgiClass (x', n1, k1, c1) => found (x', n1, k1, c1)
adamc@211	3203 \| _ => NONE
adamc@211	3204 end)
adamc@31	3205
adamc@805	3206 \| L'.SgiDatatype dts2 =>
adamc@805	3207 let
adam@1591	3208 fun found' (sgi1All as (_, loc), (x1, n1, xs1, xncs1), (x2, n2, xs2, xncs2), env) =
adamc@805	3209 if x1 <> x2 then
adamc@805	3210 NONE
adamc@805	3211 else
adamc@805	3212 let
adamc@805	3213 fun mismatched ue =
adam@1591	3214 (sgnError env (SgiMismatchedDatatypes (loc, sgi1All, sgi2All, ue));
adamc@805	3215 SOME env)
adamc@805	3216
adamc@805	3217 val k = (L'.KType, loc)
adamc@805	3218 val k' = foldl (fn (_, k') => (L'.KArrow (k, k'), loc)) k xs1
adamc@805	3219
adamc@805	3220 fun good () =
adamc@805	3221 let
adamc@805	3222 val env = E.sgiBinds env sgi1All
adamc@805	3223 val env = if n1 = n2 then
adamc@805	3224 env
adamc@805	3225 else
adamc@838	3226 (cparts (n2, n1);
adamc@838	3227 E.pushCNamedAs env x1 n2 k'
adamc@838	3228 (SOME (L'.CNamed n1, loc)))
adamc@805	3229 in
adamc@805	3230 SOME env
adamc@805	3231 end
adamc@805	3232
adamc@805	3233 val env = E.pushCNamedAs env x1 n1 k' NONE
adamc@805	3234 val env = if n1 = n2 then
adamc@805	3235 env
adamc@805	3236 else
adamc@838	3237 (cparts (n2, n1);
adamc@838	3238 E.pushCNamedAs env x1 n2 k' (SOME (L'.CNamed n1, loc)))
adamc@805	3239 val env = foldl (fn (x, env) => E.pushCRel env x k) env xs1
adamc@805	3240 fun xncBad ((x1, _, t1), (x2, _, t2)) =
adamc@805	3241 String.compare (x1, x2) <> EQUAL
adamc@805	3242 orelse case (t1, t2) of
adamc@805	3243 (NONE, NONE) => false
adamc@805	3244 \| (SOME t1, SOME t2) =>
adamc@987	3245 (unifyCons env loc t1 (sub2 t2); false)
adamc@805	3246 \| _ => true
adamc@805	3247 in
adamc@805	3248 (if xs1 <> xs2
adamc@805	3249 orelse length xncs1 <> length xncs2
adamc@805	3250 orelse ListPair.exists xncBad (xncs1, xncs2) then
adamc@805	3251 mismatched NONE
adamc@160	3252 else
adamc@805	3253 good ())
adamc@805	3254 handle CUnify ue => mismatched (SOME ue)
adamc@805	3255 end
adamc@805	3256 in
adamc@805	3257 seek'
adamc@805	3258 (fn _ =>
adamc@805	3259 let
adamc@805	3260 fun seekOne (dt2, env) =
adamc@805	3261 seek (fn (env, sgi1All as (sgi1, _)) =>
adamc@805	3262 case sgi1 of
adamc@805	3263 L'.SgiDatatypeImp (x', n1, _, _, _, xs, xncs1) =>
adamc@805	3264 found' (sgi1All, (x', n1, xs, xncs1), dt2, env)
adamc@805	3265 \| _ => NONE)
adamc@805	3266
adamc@805	3267 fun seekAll (dts, env) =
adamc@805	3268 case dts of
adamc@805	3269 [] => env
adamc@805	3270 \| dt :: dts => seekAll (dts, seekOne (dt, env))
adamc@805	3271 in
adamc@805	3272 seekAll (dts2, env)
adamc@805	3273 end)
adamc@805	3274 (fn (env, sgi1All as (sgi1, _)) =>
adamc@805	3275 let
adamc@805	3276 fun found dts1 =
adamc@805	3277 let
adamc@805	3278 fun iter (dts1, dts2, env) =
adamc@805	3279 case (dts1, dts2) of
adamc@805	3280 ([], []) => SOME env
adamc@805	3281 \| (dt1 :: dts1, dt2 :: dts2) =>
adamc@805	3282 (case found' (sgi1All, dt1, dt2, env) of
adamc@805	3283 NONE => NONE
adamc@805	3284 \| SOME env => iter (dts1, dts2, env))
adamc@805	3285 \| _ => NONE
adamc@805	3286 in
adamc@805	3287 iter (dts1, dts2, env)
adamc@805	3288 end
adamc@805	3289 in
adamc@805	3290 case sgi1 of
adamc@805	3291 L'.SgiDatatype dts1 => found dts1
adamc@805	3292 \| _ => NONE
adamc@805	3293 end)
adamc@805	3294 end
adamc@156	3295
adamc@191	3296 \| L'.SgiDatatypeImp (x, n2, m12, ms2, s2, xs, _) =>
adam@1591	3297 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@158	3298 case sgi1 of
adamc@191	3299 L'.SgiDatatypeImp (x', n1, m11, ms1, s1, _, _) =>
adamc@158	3300 if x = x' then
adamc@158	3301 let
adamc@158	3302 val k = (L'.KType, loc)
adamc@191	3303 val k' = foldl (fn (_, k') => (L'.KArrow (k, k'), loc)) k xs
adamc@158	3304 val t1 = (L'.CModProj (m11, ms1, s1), loc)
adamc@158	3305 val t2 = (L'.CModProj (m12, ms2, s2), loc)
adamc@158	3306
adamc@158	3307 fun good () =
adamc@158	3308 let
adamc@191	3309 val env = E.pushCNamedAs env x n1 k' (SOME t1)
adamc@191	3310 val env = E.pushCNamedAs env x n2 k' (SOME t2)
adamc@158	3311 in
adamc@838	3312 cparts (n2, n1);
adamc@628	3313 SOME env
adamc@158	3314 end
adamc@158	3315 in
adamc@987	3316 (unifyCons env loc t1 t2;
adamc@628	3317 good ())
adam@1719	3318 handle CUnify (c1, c2, env', err) =>
adam@1719	3319 (sgnError env (SgiWrongCon (loc, sgi1All, c1, sgi2All, c2, env', err));
adamc@158	3320 good ())
adamc@158	3321 end
adamc@158	3322 else
adamc@158	3323 NONE
adamc@158	3324
adamc@158	3325 \| _ => NONE)
adamc@156	3326
adamc@32	3327 \| L'.SgiVal (x, n2, c2) =>
adam@1591	3328 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@32	3329 case sgi1 of
adamc@41	3330 L'.SgiVal (x', n1, c1) =>
adamc@41	3331 if x = x' then
adamc@838	3332 ((*prefaces "val" [("x", PD.string x),
adamc@838	3333 ("n1", PD.string (Int.toString n1)),
adamc@838	3334 ("c1", p_con env c1),
adamc@838	3335 ("c2", p_con env c2),
adamc@838	3336 ("c2'", p_con env (sub2 c2))];*)
adamc@987	3337 unifyCons env loc c1 (sub2 c2);
adamc@628	3338 SOME env)
adam@1719	3339 handle CUnify (c1, c2, env', err) =>
adam@1719	3340 (sgnError env (SgiWrongCon (loc, sgi1All, c1, sgi2All, c2, env', err));
adamc@628	3341 SOME env)
adamc@41	3342 else
adamc@41	3343 NONE
adamc@32	3344 \| _ => NONE)
adamc@32	3345
adamc@33	3346 \| L'.SgiStr (x, n2, sgn2) =>
adam@1591	3347 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@33	3348 case sgi1 of
adamc@41	3349 L'.SgiStr (x', n1, sgn1) =>
adamc@41	3350 if x = x' then
adamc@66	3351 let
adam@2099	3352 (* Don't forget to save & restore the
adam@2099	3353 * counterparts map around recursive calls!
adam@2099	3354 * Otherwise, all sorts of mayhem may result. *)
adam@2099	3355 val saved = !counterparts
adam@1591	3356 val () = subSgn' counterparts env loc sgn1 sgn2
adam@2099	3357 val () = counterparts := saved
adamc@66	3358 val env = E.pushStrNamedAs env x n1 sgn1
adamc@66	3359 val env = if n1 = n2 then
adamc@66	3360 env
adamc@66	3361 else
adamc@66	3362 E.pushStrNamedAs env x n2
adamc@66	3363 (selfifyAt env {str = (L'.StrVar n1, #2 sgn2),
adamc@66	3364 sgn = sgn2})
adamc@66	3365 in
adamc@628	3366 SOME env
adamc@66	3367 end
adamc@41	3368 else
adamc@41	3369 NONE
adamc@33	3370 \| _ => NONE)
adamc@59	3371
adamc@59	3372 \| L'.SgiSgn (x, n2, sgn2) =>
adam@1591	3373 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@59	3374 case sgi1 of
adamc@59	3375 L'.SgiSgn (x', n1, sgn1) =>
adamc@59	3376 if x = x' then
adamc@65	3377 let
adam@1591	3378 val () = subSgn' counterparts env loc sgn1 sgn2
adam@1591	3379 val () = subSgn' counterparts env loc sgn2 sgn1
adamc@65	3380
adamc@65	3381 val env = E.pushSgnNamedAs env x n2 sgn2
adamc@65	3382 val env = if n1 = n2 then
adamc@65	3383 env
adamc@65	3384 else
adamc@838	3385 (cparts (n2, n1);
adamc@838	3386 E.pushSgnNamedAs env x n1 sgn2)
adamc@65	3387 in
adamc@628	3388 SOME env
adamc@65	3389 end
adamc@59	3390 else
adamc@59	3391 NONE
adamc@59	3392 \| _ => NONE)
adamc@88	3393
adamc@88	3394 \| L'.SgiConstraint (c2, d2) =>
adam@1591	3395 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@88	3396 case sgi1 of
adamc@88	3397 L'.SgiConstraint (c1, d1) =>
adam@2092	3398 (* It's important to do only simple equality checking here,
adam@2092	3399 * with no unification, because constraints are unnamed.
adam@2092	3400 * It's too easy to pick the wrong pair to unify! *)
adam@2092	3401 if consEqSimple env (c1, c2)
adam@2092	3402 andalso consEqSimple env (d1, d2) then
adamc@628	3403 SOME env
adamc@88	3404 else
adamc@88	3405 NONE
adamc@88	3406 \| _ => NONE)
adamc@203	3407
adamc@563	3408 \| L'.SgiClassAbs (x, n2, k2) =>
adam@1591	3409 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@211	3410 let
adamc@563	3411 fun found (x', n1, k1, co) =
adamc@211	3412 if x = x' then
adamc@211	3413 let
adamc@623	3414 val () = unifyKinds env k1 k2
adam@1719	3415 handle KUnify (k1, k2, env', err) =>
adam@1591	3416 sgnError env (SgiWrongKind (loc, sgi1All, k1,
adam@1719	3417 sgi2All, k2, env', err))
adamc@563	3418
adamc@711	3419 val env = E.pushCNamedAs env x n1 k1 co
adamc@211	3420 in
adamc@211	3421 SOME (if n1 = n2 then
adamc@211	3422 env
adamc@211	3423 else
adamc@838	3424 (cparts (n2, n1);
adamc@838	3425 E.pushCNamedAs env x n2 k1 (SOME (L'.CNamed n1, loc2))))
adamc@211	3426 end
adamc@211	3427 else
adamc@211	3428 NONE
adamc@211	3429 in
adamc@211	3430 case sgi1 of
adamc@563	3431 L'.SgiClassAbs (x', n1, k1) => found (x', n1, k1, NONE)
adamc@563	3432 \| L'.SgiClass (x', n1, k1, c) => found (x', n1, k1, SOME c)
adam@1797	3433 \| L'.SgiConAbs (x', n1, k1) => found (x', n1, k1, NONE)
adam@1797	3434 \| L'.SgiCon (x', n1, k1, c) => found (x', n1, k1, SOME c)
adamc@211	3435 \| _ => NONE
adamc@211	3436 end)
adamc@563	3437 \| L'.SgiClass (x, n2, k2, c2) =>
adam@1591	3438 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@211	3439 let
adamc@563	3440 fun found (x', n1, k1, c1) =
adamc@211	3441 if x = x' then
adamc@211	3442 let
adamc@623	3443 val () = unifyKinds env k1 k2
adam@1719	3444 handle KUnify (k1, k2, env', err) =>
adam@1591	3445 sgnError env (SgiWrongKind (loc, sgi1All, k1,
adam@1719	3446 sgi2All, k2, env', err))
adamc@563	3447
adamc@838	3448 val c2 = sub2 c2
adamc@838	3449
adamc@218	3450 fun good () =
adamc@218	3451 let
adamc@711	3452 val env = E.pushCNamedAs env x n2 k2 (SOME c2)
adamc@218	3453 val env = if n1 = n2 then
adamc@218	3454 env
adamc@218	3455 else
adamc@839	3456 (cparts (n2, n1);
adamc@839	3457 E.pushCNamedAs env x n1 k2 (SOME c1))
adamc@218	3458 in
adamc@628	3459 SOME env
adamc@218	3460 end
adamc@211	3461 in
adamc@987	3462 (unifyCons env loc c1 c2;
adamc@628	3463 good ())
adam@1719	3464 handle CUnify (c1, c2, env', err) =>
adam@1591	3465 (sgnError env (SgiWrongCon (loc, sgi1All, c1,
adam@1719	3466 sgi2All, c2, env', err));
adamc@211	3467 good ())
adamc@211	3468 end
adamc@211	3469 else
adamc@211	3470 NONE
adamc@211	3471 in
adamc@211	3472 case sgi1 of
adamc@563	3473 L'.SgiClass (x', n1, k1, c1) => found (x', n1, k1, c1)
adam@1797	3474 \| L'.SgiCon (x', n1, k1, c1) => found (x', n1, k1, c1)
adamc@211	3475 \| _ => NONE
adamc@211	3476 end)
adamc@31	3477 end
adamc@31	3478 in
adamc@628	3479 ignore (foldl folder env sgis2)
adamc@31	3480 end
adamc@31	3481
adamc@41	3482 \| (L'.SgnFun (m1, n1, dom1, ran1), L'.SgnFun (m2, n2, dom2, ran2)) =>
adamc@43	3483 let
adamc@480	3484 val ran2 =
adamc@43	3485 if n1 = n2 then
adamc@480	3486 ran2
adamc@43	3487 else
adamc@480	3488 subStrInSgn (n2, n1) ran2
adamc@43	3489 in
adamc@1000	3490 subSgn' counterparts env strLoc dom2 dom1;
adamc@1000	3491 subSgn' counterparts (E.pushStrNamedAs env m1 n1 dom2) strLoc ran1 ran2
adamc@43	3492 end
adamc@41	3493
adamc@1000	3494 \| _ => sgnError env (SgnWrongForm (strLoc, sgn1, sgn2)))
adamc@41	3495
adam@1580	3496 and subSgn env x y z = subSgn' (ref IM.empty) env x y z
adam@1580	3497 handle e as E.UnboundNamed _ => if ErrorMsg.anyErrors () then () else raise e
adamc@61	3498
adamc@706	3499 and positive self =
adamc@312	3500 let
adamc@312	3501 open L
adamc@312	3502
adamc@312	3503 fun none (c, _) =
adamc@312	3504 case c of
adamc@312	3505 CAnnot (c, _) => none c
adamc@312	3506
adamc@312	3507 \| TFun (c1, c2) => none c1 andalso none c2
adamc@312	3508 \| TCFun (_, _, _, c) => none c
adamc@312	3509 \| TRecord c => none c
adamc@312	3510
adamc@312	3511 \| CVar ([], x) => x <> self
adamc@312	3512 \| CVar _ => true
adamc@312	3513 \| CApp (c1, c2) => none c1 andalso none c2
adamc@312	3514 \| CAbs _ => false
adamc@628	3515 \| TDisjoint (c1, c2, c3) => none c1 andalso none c2 andalso none c3
adamc@312	3516
adamc@623	3517 \| CKAbs _ => false
adamc@623	3518 \| TKFun _ => false
adamc@623	3519
adamc@312	3520 \| CName _ => true
adamc@312	3521
adamc@312	3522 \| CRecord xcs => List.all (fn (c1, c2) => none c1 andalso none c2) xcs
adamc@312	3523 \| CConcat (c1, c2) => none c1 andalso none c2
adamc@621	3524 \| CMap => true
adamc@312	3525
adamc@312	3526 \| CUnit => true
adamc@312	3527
adamc@312	3528 \| CTuple cs => List.all none cs
adamc@312	3529 \| CProj (c, _) => none c
adamc@312	3530
adamc@312	3531 \| CWild _ => false
adamc@312	3532
adamc@312	3533 fun pos (c, _) =
adamc@312	3534 case c of
adamc@312	3535 CAnnot (c, _) => pos c
adamc@312	3536
adamc@312	3537 \| TFun (c1, c2) => none c1 andalso pos c2
adamc@312	3538 \| TCFun (_, _, _, c) => pos c
adamc@312	3539 \| TRecord c => pos c
adamc@312	3540
adamc@312	3541 \| CVar _ => true
adamc@312	3542 \| CApp (c1, c2) => pos c1 andalso none c2
adamc@312	3543 \| CAbs _ => false
adamc@628	3544 \| TDisjoint (c1, c2, c3) => none c1 andalso none c2 andalso none c3
adamc@312	3545
adamc@623	3546 \| CKAbs _ => false
adamc@623	3547 \| TKFun _ => false
adamc@623	3548
adamc@312	3549 \| CName _ => true
adamc@312	3550
adamc@312	3551 \| CRecord xcs => List.all (fn (c1, c2) => none c1 andalso pos c2) xcs
adamc@312	3552 \| CConcat (c1, c2) => pos c1 andalso pos c2
adamc@621	3553 \| CMap => true
adamc@312	3554
adamc@312	3555 \| CUnit => true
adamc@312	3556
adamc@312	3557 \| CTuple cs => List.all pos cs
adamc@312	3558 \| CProj (c, _) => pos c
adamc@312	3559
adamc@312	3560 \| CWild _ => false
adamc@312	3561 in
adamc@312	3562 pos
adamc@312	3563 end
adamc@312	3564
adamc@706	3565 and wildifyStr env (str, sgn) =
adamc@325	3566 case #1 (hnormSgn env sgn) of
adamc@325	3567 L'.SgnConst sgis =>
adamc@325	3568 (case #1 str of
adamc@325	3569 L.StrConst ds =>
adamc@325	3570 let
adamc@1270	3571 fun cname d =
adamc@1270	3572 case d of
adamc@1270	3573 L'.SgiCon (x, _, _, _) => SOME x
adamc@1270	3574 \| L'.SgiConAbs (x, _, _) => SOME x
adamc@1270	3575 \| L'.SgiClass (x, _, _, _) => SOME x
adamc@1270	3576 \| L'.SgiClassAbs (x, _, _) => SOME x
adamc@1270	3577 \| _ => NONE
adamc@1270	3578
adamc@1270	3579 fun dname (d, _) =
adamc@1270	3580 case d of
adamc@1270	3581 L.DCon (x, _, _) => SOME x
adamc@1270	3582 \| _ => NONE
adamc@1270	3583
adamc@493	3584 fun decompileKind (k, loc) =
adamc@493	3585 case k of
adamc@493	3586 L'.KType => SOME (L.KType, loc)
adamc@493	3587 \| L'.KArrow (k1, k2) =>
adamc@493	3588 (case (decompileKind k1, decompileKind k2) of
adamc@493	3589 (SOME k1, SOME k2) => SOME (L.KArrow (k1, k2), loc)
adamc@493	3590 \| _ => NONE)
adamc@493	3591 \| L'.KName => SOME (L.KName, loc)
adamc@493	3592 \| L'.KRecord k =>
adamc@493	3593 (case decompileKind k of
adamc@493	3594 SOME k => SOME (L.KRecord k, loc)
adamc@493	3595 \| _ => NONE)
adamc@493	3596 \| L'.KUnit => SOME (L.KUnit, loc)
adamc@493	3597 \| L'.KTuple ks =>
adamc@493	3598 let
adamc@493	3599 val ks' = List.mapPartial decompileKind ks
adamc@493	3600 in
adamc@493	3601 if length ks' = length ks then
adamc@493	3602 SOME (L.KTuple ks', loc)
adamc@493	3603 else
adamc@493	3604 NONE
adamc@493	3605 end
adamc@493	3606
adamc@493	3607 \| L'.KError => NONE
adam@1639	3608 \| L'.KUnif (_, _, ref (L'.KKnown k)) => decompileKind k
adamc@493	3609 \| L'.KUnif _ => NONE
adam@1639	3610 \| L'.KTupleUnif (_, _, ref (L'.KKnown k)) => decompileKind k
adam@1302	3611 \| L'.KTupleUnif _ => NONE
adamc@493	3612
adamc@623	3613 \| L'.KRel _ => NONE
adamc@623	3614 \| L'.KFun _ => NONE
adamc@623	3615
adam@1529	3616 fun maybeHnorm env c =
adam@1865	3617 hnormCon env c
adam@1865	3618 handle E.UnboundNamed _ => c
adam@1865	3619
adam@1865	3620 fun decompileCon env c =
adam@1865	3621 case decompileCon' env c of
adam@1865	3622 SOME v => SOME v
adam@1865	3623 \| NONE => decompileCon' env (maybeHnorm env c)
adam@1865	3624
adam@1865	3625 and decompileCon' env (c as (_, loc)) =
adam@1865	3626 case #1 c of
adamc@325	3627 L'.CRel i =>
adamc@325	3628 let
adamc@325	3629 val (s, _) = E.lookupCRel env i
adamc@325	3630 in
adamc@325	3631 SOME (L.CVar ([], s), loc)
adamc@325	3632 end
adamc@325	3633 \| L'.CNamed i =>
adamc@325	3634 let
adamc@325	3635 val (s, _, _) = E.lookupCNamed env i
adamc@325	3636 in
adamc@325	3637 SOME (L.CVar ([], s), loc)
adamc@325	3638 end
adamc@325	3639 \| L'.CModProj (m1, ms, x) =>
adamc@325	3640 let
adamc@325	3641 val (s, _) = E.lookupStrNamed env m1
adamc@325	3642 in
adamc@325	3643 SOME (L.CVar (s :: ms, x), loc)
adamc@325	3644 end
adamc@325	3645 \| L'.CName s => SOME (L.CName s, loc)
adam@1886	3646 \| L'.CRecord (k, xcs) =>
adamc@325	3647 let
adamc@325	3648 fun fields xcs =
adamc@325	3649 case xcs of
adamc@325	3650 [] => SOME []
adamc@325	3651 \| (x, t) :: xcs =>
adamc@325	3652 case (decompileCon env x, decompileCon env t, fields xcs) of
adamc@325	3653 (SOME x, SOME t, SOME xcs) => SOME ((x, t) :: xcs)
adamc@325	3654 \| _ => NONE
adam@1886	3655
adam@1886	3656 val c' = Option.map (fn xcs => (L.CRecord xcs, loc))
adam@1886	3657 (fields xcs)
adamc@325	3658 in
adam@1886	3659 Option.map (fn c' =>
adam@1886	3660 case decompileKind k of
adam@1886	3661 NONE => c'
adam@1886	3662 \| SOME k' => (L.CAnnot (c', (L.KRecord k', loc)), loc)) c'
adamc@325	3663 end
adamc@325	3664 \| L'.CConcat (c1, c2) =>
adamc@325	3665 (case (decompileCon env c1, decompileCon env c2) of
adamc@325	3666 (SOME c1, SOME c2) => SOME (L.CConcat (c1, c2), loc)
adamc@325	3667 \| _ => NONE)
adamc@325	3668 \| L'.CUnit => SOME (L.CUnit, loc)
adam@1639	3669 \| L'.CUnif (nl, _, _, _, ref (L'.Known c)) => decompileCon env (E.mliftConInCon nl c)
adamc@325	3670
adam@1585	3671 \| L'.CApp (f, x) =>
adam@1585	3672 (case (decompileCon env f, decompileCon env x) of
adam@1585	3673 (SOME f, SOME x) => SOME (L.CApp (f, x), loc)
adam@1585	3674 \| _ => NONE)
adam@1585	3675
adam@1864	3676 \| L'.CTuple cs =>
adam@1864	3677 let
adam@1864	3678 val cs' = foldr (fn (c, cs') =>
adam@1864	3679 case cs' of
adam@1864	3680 NONE => NONE
adam@1864	3681 \| SOME cs' =>
adam@1864	3682 case decompileCon env c of
adam@1864	3683 NONE => NONE
adam@1864	3684 \| SOME c' => SOME (c' :: cs'))
adam@1864	3685 (SOME []) cs
adam@1864	3686 in
adam@1864	3687 case cs' of
adam@1864	3688 NONE => NONE
adam@1864	3689 \| SOME cs' => SOME (L.CTuple cs', loc)
adam@1864	3690 end
adam@1864	3691
adam@1864	3692 \| L'.CMap _ => SOME (L.CMap, loc)
adam@1865	3693 \| L'.TRecord c =>
adam@1865	3694 (case decompileCon env c of
adam@1865	3695 NONE => NONE
adam@1865	3696 \| SOME c' => SOME (L.TRecord c', loc))
adam@1864	3697
adam@1912	3698 \| c => ((Print.preface ("WTF?", p_con env (c, loc));) NONE)
adamc@325	3699
adam@2109	3700 fun isClassOrFolder' env (c : L'.con) =
adam@2109	3701 case #1 c of
adam@2109	3702 L'.CAbs (x, k, c) =>
adam@2109	3703 let
adam@2109	3704 val env = E.pushCRel env x k
adam@2109	3705
adam@2109	3706 fun toHead (c : L'.con) =
adam@2109	3707 case #1 c of
adam@2109	3708 L'.CApp (c, _) => toHead c
adam@2109	3709 \| _ => isClassOrFolder env c
adam@2109	3710 in
adam@2109	3711 toHead (hnormCon env c)
adam@2109	3712 end
adam@2109	3713 \| _ => isClassOrFolder env c
adam@2109	3714
adamc@1264	3715 fun buildNeeded env sgis =
adamc@1275	3716 #1 (foldl (fn ((sgi, loc), (nd, env')) =>
adamc@1264	3717 (case sgi of
adam@1570	3718 L'.SgiCon (x, _, k, _) => naddCon (nd, x, k)
adam@1570	3719 \| L'.SgiConAbs (x, _, k) => naddCon (nd, x, k)
adamc@1264	3720 \| L'.SgiConstraint cs => naddConstraint (nd, (env', cs, loc))
adamc@1264	3721 \| L'.SgiVal (x, _, t) =>
adamc@1264	3722 let
adamc@1277	3723 fun should t =
adamc@1277	3724 let
adamc@1277	3725 val t = normClassConstraint env' t
adam@2094	3726
adam@2094	3727 fun shouldR c =
adam@2094	3728 case hnormCon env' c of
adam@2094	3729 (L'.CApp (f, _), _) =>
adam@2094	3730 (case hnormCon env' f of
adam@2094	3731 (L'.CApp (f, cl), loc) =>
adam@2094	3732 (case hnormCon env' f of
adam@2109	3733 (L'.CMap _, _) => isClassOrFolder' env' cl
adam@2094	3734 \| _ => false)
adam@2094	3735 \| _ => false)
adam@2094	3736 \| (L'.CConcat (c1, c2), _) =>
adam@2094	3737 shouldR c1 orelse shouldR c2
adam@2094	3738 \| c => false
adamc@1277	3739 in
adamc@1277	3740 case #1 t of
adamc@1277	3741 L'.CApp (f, _) => isClassOrFolder env' f
adam@2094	3742 \| L'.TRecord t => shouldR t
adamc@1277	3743 \| _ => false
adamc@1277	3744 end
adamc@1270	3745 in
adamc@1277	3746 if should t then
adamc@1277	3747 naddVal (nd, x)
adamc@1277	3748 else
adamc@1277	3749 nd
adamc@1264	3750 end
adamc@1264	3751 \| L'.SgiStr (x, _, s) =>
adamc@1270	3752 (case #1 (hnormSgn env' s) of
adamc@1270	3753 L'.SgnConst sgis' => naddMod (nd, x, (env', buildNeeded env' sgis'))
adamc@1264	3754 \| _ => nd)
adamc@1264	3755 \| _ => nd,
adamc@1275	3756 E.sgiBinds env' (sgi, loc)))
adamc@1275	3757 (nempty, env) sgis)
adamc@1264	3758
adamc@1264	3759 val nd = buildNeeded env sgis
adamc@1264	3760
adamc@1264	3761 fun removeUsed (nd, ds) =
adamc@1264	3762 foldl (fn ((d, _), nd) =>
adamc@634	3763 case d of
adamc@1264	3764 L.DCon (x, _, _) => ndelCon (nd, x)
adamc@1264	3765 \| L.DVal (x, _, _) => ndelVal (nd, x)
adamc@1264	3766 \| L.DOpen _ => nempty
adam@1868	3767 \| L.DStr (x, _, _, (L.StrConst ds', _), _) =>
adamc@1264	3768 (case SM.find (nmods nd, x) of
adamc@1264	3769 NONE => nd
adamc@1270	3770 \| SOME (env, nd') => naddMod (nd, x, (env, removeUsed (nd', ds'))))
adamc@1264	3771 \| _ => nd)
adamc@1264	3772 nd ds
adamc@1264	3773
adamc@1264	3774 val nd = removeUsed (nd, ds)
adamc@1264	3775
adam@1662	3776 (* Among the declarations present explicitly in the program, find the last constructor or constraint declaration.
adam@1662	3777 * The new constructor/constraint declarations that we add may safely be put after that point. *)
adam@1662	3778 fun findLast (ds, acc) =
adam@1662	3779 case ds of
adam@1662	3780 [] => ([], acc)
adam@1662	3781 \| (d : L.decl) :: ds' =>
adam@1662	3782 let
adam@1662	3783 val isCony = case #1 d of
adam@1662	3784 L.DCon _ => true
adam@1662	3785 \| L.DDatatype _ => true
adam@1662	3786 \| L.DDatatypeImp _ => true
adam@1662	3787 \| L.DStr _ => true
adam@1662	3788 \| L.DConstraint _ => true
adam@1662	3789 \| _ => false
adam@1662	3790 in
adam@1662	3791 if isCony then
adam@1662	3792 (ds, acc)
adam@1662	3793 else
adam@1662	3794 findLast (ds', d :: acc)
adam@1662	3795 end
adam@1662	3796
adam@1662	3797 val (dPrefix, dSuffix) = findLast (rev ds, [])
adam@1662	3798
adamc@1270	3799 fun extend (env, nd, ds) =
adamc@1264	3800 let
adamc@1264	3801 val ds' = List.mapPartial (fn (env', (c1, c2), loc) =>
adamc@1264	3802 case (decompileCon env' c1, decompileCon env' c2) of
adamc@1264	3803 (SOME c1, SOME c2) =>
adamc@1264	3804 SOME (L.DConstraint (c1, c2), loc)
adam@1586	3805 \| _ => NONE) (nconstraints nd)
adamc@1264	3806
adamc@1264	3807 val ds' =
adamc@1264	3808 case SS.listItems (nvals nd) of
adamc@1264	3809 [] => ds'
adamc@1264	3810 \| xs =>
adamc@1264	3811 let
adamc@1264	3812 val ewild = (L.EWild, #2 str)
adamc@1264	3813 val ds'' = map (fn x => (L.DVal (x, NONE, ewild), #2 str)) xs
adamc@1264	3814 in
adamc@1264	3815 ds'' @ ds'
adamc@1264	3816 end
adamc@1264	3817
adamc@1275	3818 val ds' =
adam@1640	3819 case ncons nd of
adamc@1275	3820 [] => ds'
adamc@1264	3821 \| xs =>
adam@1570	3822 map (fn (x, k) =>
adamc@1270	3823 let
adamc@1270	3824 val k =
adamc@1270	3825 case decompileKind k of
adamc@1270	3826 NONE => (L.KWild, #2 str)
adamc@1270	3827 \| SOME k => k
adamc@1275	3828
adamc@1270	3829 val cwild = (L.CWild k, #2 str)
adamc@1270	3830 in
adam@1570	3831 (L.DCon (x, NONE, cwild), #2 str)
adamc@1275	3832 end) xs @ ds'
adamc@1275	3833
adamc@1275	3834 val ds = ds @ ds'
adamc@1264	3835 in
adam@1868	3836 map (fn d as (L.DStr (x, s, tm, (L.StrConst ds', loc'), r), loc) =>
adamc@1270	3837 (case SM.find (nmods nd, x) of
adamc@1270	3838 NONE => d
adamc@1270	3839 \| SOME (env, nd') =>
adam@1868	3840 (L.DStr (x, s, tm, (L.StrConst (extend (env, nd', ds')), loc'), r), loc))
adamc@1270	3841 \| d => d) ds
adamc@1264	3842 end
adamc@325	3843 in
adam@1662	3844 (L.StrConst (extend (env, nd, rev dPrefix) @ dSuffix), #2 str)
adamc@325	3845 end
adamc@325	3846 \| _ => str)
adamc@325	3847 \| _ => str
adamc@325	3848
adamc@706	3849 and elabDecl (dAll as (d, loc), (env, denv, gs)) =
adamc@255	3850 let
adamc@904	3851 (val () = preface ("elabDecl", SourcePrint.p_decl dAll))
adamc@514	3852 (val befor = Time.now ())
adamc@255	3853
adamc@255	3854 val r =
adamc@255	3855 case d of
adamc@255	3856 L.DCon (x, ko, c) =>
adamc@255	3857 let
adamc@255	3858 val k' = case ko of
adam@1639	3859 NONE => kunif env loc
adamc@623	3860 \| SOME k => elabKind env k
adamc@255	3861
adamc@255	3862 val (c', ck, gs') = elabCon (env, denv) c
adamc@255	3863 val (env', n) = E.pushCNamed env x k' (SOME c')
adamc@255	3864 in
adamc@255	3865 checkKind env c' ck k';
adamc@255	3866
adamc@255	3867 ([(L'.DCon (x, n, k', c'), loc)], (env', denv, enD gs' @ gs))
adamc@255	3868 end
adamc@805	3869 \| L.DDatatype dts =>
adamc@255	3870 let
adamc@255	3871 val k = (L'.KType, loc)
adamc@805	3872
adamc@805	3873 val (dts, env) = ListUtil.foldlMap
adamc@805	3874 (fn ((x, xs, xcs), env) =>
adamc@805	3875 let
adamc@805	3876 val k' = foldl (fn (_, k') => (L'.KArrow (k, k'), loc)) k xs
adamc@805	3877 val (env, n) = E.pushCNamed env x k' NONE
adamc@805	3878 in
adamc@805	3879 ((x, n, xs, xcs), env)
adamc@805	3880 end)
adamc@805	3881 env dts
adamc@805	3882
adamc@805	3883 val (dts, (env, gs')) = ListUtil.foldlMap
adamc@805	3884 (fn ((x, n, xs, xcs), (env, gs')) =>
adamc@805	3885 let
adamc@805	3886 val t = (L'.CNamed n, loc)
adamc@805	3887 val nxs = length xs - 1
adamc@805	3888 val t = ListUtil.foldli
adamc@805	3889 (fn (i, _, t) =>
adamc@805	3890 (L'.CApp (t, (L'.CRel (nxs - i), loc)), loc)) t xs
adamc@805	3891
adamc@805	3892 val (env', denv') = foldl (fn (x, (env', denv')) =>
adamc@805	3893 (E.pushCRel env' x k,
adamc@805	3894 D.enter denv')) (env, denv) xs
adamc@805	3895
adamc@805	3896 val (xcs, (used, env, gs')) =
adamc@805	3897 ListUtil.foldlMap
adamc@805	3898 (fn ((x, to), (used, env, gs)) =>
adamc@805	3899 let
adamc@805	3900 val (to, t, gs') = case to of
adamc@805	3901 NONE => (NONE, t, gs)
adamc@805	3902 \| SOME t' =>
adamc@805	3903 let
adamc@805	3904 val (t', tk, gs') = elabCon (env', denv') t'
adamc@805	3905 in
adamc@805	3906 checkKind env' t' tk k;
adamc@805	3907 (SOME t', (L'.TFun (t', t), loc), enD gs' @ gs)
adamc@805	3908 end
adamc@805	3909 val t = foldr (fn (x, t) => (L'.TCFun (L'.Implicit, x, k, t), loc)) t xs
adamc@805	3910
adamc@805	3911 val (env, n') = E.pushENamed env x t
adamc@805	3912 in
adamc@805	3913 if SS.member (used, x) then
adamc@805	3914 strError env (DuplicateConstructor (x, loc))
adamc@805	3915 else
adamc@805	3916 ();
adamc@805	3917 ((x, n', to), (SS.add (used, x), env, gs'))
adamc@805	3918 end)
adamc@805	3919 (SS.empty, env, gs') xcs
adamc@805	3920 in
adamc@805	3921 ((x, n, xs, xcs), (E.pushDatatype env n xs xcs, gs'))
adamc@805	3922 end)
adamc@805	3923 (env, []) dts
adamc@255	3924 in
adamc@805	3925 ([(L'.DDatatype dts, loc)], (env, denv, gs' @ gs))
adamc@255	3926 end
adamc@255	3927
adamc@255	3928 \| L.DDatatypeImp (_, [], _) => raise Fail "Empty DDatatypeImp"
adamc@255	3929
adamc@255	3930 \| L.DDatatypeImp (x, m1 :: ms, s) =>
adamc@255	3931 (case E.lookupStr env m1 of
adamc@255	3932 NONE => (expError env (UnboundStrInExp (loc, m1));
adamc@255	3933 ([], (env, denv, gs)))
adamc@255	3934 \| SOME (n, sgn) =>
adamc@255	3935 let
adamc@255	3936 val (str, sgn) = foldl (fn (m, (str, sgn)) =>
adamc@255	3937 case E.projectStr env {sgn = sgn, str = str, field = m} of
adamc@255	3938 NONE => (conError env (UnboundStrInCon (loc, m));
adamc@255	3939 (strerror, sgnerror))
adamc@255	3940 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adamc@255	3941 ((L'.StrVar n, loc), sgn) ms
adamc@255	3942 in
adamc@628	3943 case hnormCon env (L'.CModProj (n, ms, s), loc) of
adamc@628	3944 (L'.CModProj (n, ms, s), _) =>
adamc@255	3945 (case E.projectDatatype env {sgn = sgn, str = str, field = s} of
adamc@255	3946 NONE => (conError env (UnboundDatatype (loc, s));
adamc@255	3947 ([], (env, denv, gs)))
adamc@255	3948 \| SOME (xs, xncs) =>
adamc@255	3949 let
adamc@255	3950 val k = (L'.KType, loc)
adamc@255	3951 val k' = foldl (fn (_, k') => (L'.KArrow (k, k'), loc)) k xs
adamc@255	3952 val t = (L'.CModProj (n, ms, s), loc)
adamc@255	3953 val (env, n') = E.pushCNamed env x k' (SOME t)
adamc@255	3954 val env = E.pushDatatype env n' xs xncs
adamc@255	3955
adamc@255	3956 val t = (L'.CNamed n', loc)
adamc@844	3957 val nxs = length xs
adamc@844	3958 val t = ListUtil.foldli (fn (i, _, t) =>
adamc@844	3959 (L'.CApp (t, (L'.CRel (nxs - 1 - i), loc)), loc))
adamc@844	3960 t xs
adamc@255	3961 val env = foldl (fn ((x, n, to), env) =>
adamc@255	3962 let
adamc@255	3963 val t = case to of
adamc@255	3964 NONE => t
adamc@255	3965 \| SOME t' => (L'.TFun (t', t), loc)
adamc@255	3966
adamc@255	3967 val t = foldr (fn (x, t) =>
adamc@255	3968 (L'.TCFun (L'.Implicit, x, k, t), loc))
adamc@255	3969 t xs
adamc@255	3970 in
adamc@255	3971 E.pushENamedAs env x n t
adamc@255	3972 end) env xncs
adamc@255	3973 in
adamc@628	3974 ([(L'.DDatatypeImp (x, n', n, ms, s, xs, xncs), loc)], (env, denv, gs))
adamc@255	3975 end)
adamc@255	3976 \| _ => (strError env (NotDatatype loc);
adamc@255	3977 ([], (env, denv, [])))
adamc@255	3978 end)
adamc@255	3979
adamc@255	3980 \| L.DVal (x, co, e) =>
adamc@255	3981 let
adamc@255	3982 val (c', _, gs1) = case co of
adam@1639	3983 NONE => (cunif env (loc, ktype), ktype, [])
adamc@255	3984 \| SOME c => elabCon (env, denv) c
adamc@255	3985
adamc@255	3986 val (e', et, gs2) = elabExp (env, denv) e
adamc@629	3987
adamc@629	3988 val () = checkCon env e' et c'
adamc@629	3989
adamc@674	3990 val c' = normClassConstraint env c'
adamc@255	3991 val (env', n) = E.pushENamed env x c'
adamc@255	3992 in
adamc@255	3993 (*prefaces "DVal" [("x", Print.PD.string x),
adamc@362	3994 ("c'", p_con env c')];*)
adamc@628	3995 ([(L'.DVal (x, n, c', e'), loc)], (env', denv, enD gs1 @ gs2 @ gs))
adamc@255	3996 end
adamc@255	3997 \| L.DValRec vis =>
adamc@255	3998 let
adamc@255	3999 fun allowable (e, _) =
adamc@255	4000 case e of
adamc@255	4001 L.EAbs _ => true
adamc@255	4002 \| L.ECAbs (_, _, _, e) => allowable e
adamc@623	4003 \| L.EKAbs (_, e) => allowable e
adamc@255	4004 \| L.EDisjoint (_, _, e) => allowable e
adamc@255	4005 \| _ => false
adamc@255	4006
adamc@255	4007 val (vis, gs) = ListUtil.foldlMap
adamc@255	4008 (fn ((x, co, e), gs) =>
adamc@255	4009 let
adamc@255	4010 val (c', _, gs1) = case co of
adam@1639	4011 NONE => (cunif env (loc, ktype), ktype, [])
adamc@255	4012 \| SOME c => elabCon (env, denv) c
adamc@674	4013 val c' = normClassConstraint env c'
adamc@255	4014 in
adamc@255	4015 ((x, c', e), enD gs1 @ gs)
adamc@280	4016 end) gs vis
adamc@255	4017
adamc@255	4018 val (vis, env) = ListUtil.foldlMap (fn ((x, c', e), env) =>
adamc@255	4019 let
adamc@255	4020 val (env, n) = E.pushENamed env x c'
adamc@255	4021 in
adamc@255	4022 ((x, n, c', e), env)
adamc@255	4023 end) env vis
adamc@255	4024
adamc@255	4025 val (vis, gs) = ListUtil.foldlMap (fn ((x, n, c', e), gs) =>
adamc@255	4026 let
adamc@255	4027 val (e', et, gs1) = elabExp (env, denv) e
adamc@255	4028 in
adamc@628	4029 checkCon env e' et c';
adamc@255	4030 if allowable e then
adamc@255	4031 ()
adamc@255	4032 else
adamc@255	4033 expError env (IllegalRec (x, e'));
adamc@628	4034 ((x, n, c', e'), gs1 @ gs)
adamc@255	4035 end) gs vis
adam@1736	4036
adam@1736	4037 val vis = map (fn (x, n, t, e) => (x, n, normClassConstraint env t, e)) vis
adam@1736	4038 val d = (L'.DValRec vis, loc)
adamc@255	4039 in
adam@1736	4040 ([d], (E.declBinds env d, denv, gs))
adamc@255	4041 end
adamc@255	4042
adamc@255	4043 \| L.DSgn (x, sgn) =>
adamc@255	4044 let
adamc@255	4045 val (sgn', gs') = elabSgn (env, denv) sgn
adamc@255	4046 val (env', n) = E.pushSgnNamed env x sgn'
adamc@255	4047 in
adamc@255	4048 ([(L'.DSgn (x, n, sgn'), loc)], (env', denv, enD gs' @ gs))
adamc@255	4049 end
adamc@255	4050
adam@1868	4051 \| L.DStr (x, sgno, tmo, str, _) =>
adam@1732	4052 (case ModDb.lookup dAll of
adam@1732	4053 SOME d =>
adam@1732	4054 let
adam@1744	4055 val () = if !verbose then TextIO.print ("REUSE: " ^ x ^ "\n") else ()
adam@1732	4056 val env' = E.declBinds env d
adam@1732	4057 val denv' = dopenConstraints (loc, env', denv) {str = x, strs = []}
adam@1732	4058 in
adam@1738	4059 ([d], (env', denv', gs))
adam@1732	4060 end
adam@1732	4061 \| NONE =>
adam@1732	4062 let
adam@1744	4063 val () = if !verbose then TextIO.print ("CHECK: " ^ x ^ "\n") else ()
adam@1744	4064
adam@1732	4065 val () = if x = "Basis" then
adam@1732	4066 raise Fail "Not allowed to redefine structure 'Basis'"
adam@1732	4067 else
adam@1732	4068 ()
adam@1732	4069
adam@1732	4070 val formal = Option.map (elabSgn (env, denv)) sgno
adam@1732	4071
adam@1732	4072 val (str', sgn', gs') =
adam@1732	4073 case formal of
adam@1732	4074 NONE =>
adam@1732	4075 let
adam@1732	4076 val (str', actual, gs') = elabStr (env, denv) str
adam@1732	4077 in
adam@1732	4078 (str', selfifyAt env {str = str', sgn = actual}, gs')
adam@1732	4079 end
adam@1732	4080 \| SOME (formal, gs1) =>
adam@1732	4081 let
adam@1732	4082 val str = wildifyStr env (str, formal)
adam@1732	4083 val (str', actual, gs2) = elabStr (env, denv) str
adam@1732	4084 in
adam@1732	4085 subSgn env loc (selfifyAt env {str = str', sgn = actual}) formal;
adam@1732	4086 (str', formal, enD gs1 @ gs2)
adam@1732	4087 end
adam@1732	4088
adam@1732	4089 val (env', n) = E.pushStrNamed env x sgn'
adam@1883	4090
adam@1732	4091 val denv' =
adam@1732	4092 case #1 str' of
adam@1732	4093 L'.StrConst _ => dopenConstraints (loc, env', denv) {str = x, strs = []}
adam@1732	4094 \| L'.StrApp _ => dopenConstraints (loc, env', denv) {str = x, strs = []}
adam@1732	4095 \| _ => denv
adam@1732	4096
adam@1732	4097 val dNew = (L'.DStr (x, n, sgn', str'), loc)
adam@1732	4098 in
adam@1732	4099 case #1 (hnormSgn env sgn') of
adam@1732	4100 L'.SgnFun _ =>
adam@1732	4101 (case #1 str' of
adam@1732	4102 L'.StrFun _ => ()
adam@1732	4103 \| _ => strError env (FunctorRebind loc))
adam@1732	4104 \| _ => ();
adam@1732	4105 Option.map (fn tm => ModDb.insert (dNew, tm)) tmo;
adam@1732	4106 ([dNew], (env', denv', gs' @ gs))
adam@1732	4107 end)
adam@1732	4108
adam@1733	4109 \| L.DFfiStr (x, sgn, tmo) =>
adam@1732	4110 (case ModDb.lookup dAll of
adam@1732	4111 SOME d =>
adam@1732	4112 let
adam@1732	4113 val env' = E.declBinds env d
adam@1732	4114 val denv' = dopenConstraints (loc, env', denv) {str = x, strs = []}
adam@1732	4115 in
adam@1732	4116 ([d], (env', denv', []))
adam@1732	4117 end
adam@1732	4118 \| NONE =>
adam@1732	4119 let
adam@1732	4120 val (sgn', gs') = elabSgn (env, denv) sgn
adam@1732	4121
adam@1732	4122 val (env', n) = E.pushStrNamed env x sgn'
adam@1732	4123
adam@1732	4124 val dNew = (L'.DFfiStr (x, n, sgn'), loc)
adam@1732	4125 in
adam@1733	4126 Option.map (fn tm => ModDb.insert (dNew, tm)) tmo;
adam@1732	4127 ([dNew], (env', denv, enD gs' @ gs))
adam@1732	4128 end)
adamc@255	4129
adamc@255	4130 \| L.DOpen (m, ms) =>
adamc@255	4131 (case E.lookupStr env m of
adamc@255	4132 NONE => (strError env (UnboundStr (loc, m));
adamc@255	4133 ([], (env, denv, gs)))
adamc@255	4134 \| SOME (n, sgn) =>
adamc@255	4135 let
adamc@1030	4136 val (str, sgn) = foldl (fn (m, (str, sgn)) =>
adamc@1030	4137 case E.projectStr env {str = str, sgn = sgn, field = m} of
adamc@1030	4138 NONE => (strError env (UnboundStr (loc, m));
adamc@1030	4139 (strerror, sgnerror))
adamc@1030	4140 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adamc@1030	4141 ((L'.StrVar n, loc), sgn) ms
adamc@1030	4142
adamc@1030	4143 val sgn = selfifyAt env {str = str, sgn = sgn}
adamc@255	4144
adamc@628	4145 val (ds, env') = dopen env {str = n, strs = ms, sgn = sgn}
adamc@628	4146 val denv' = dopenConstraints (loc, env', denv) {str = m, strs = ms}
adamc@255	4147 in
adamc@255	4148 (ds, (env', denv', gs))
adamc@255	4149 end)
adamc@255	4150
adamc@255	4151 \| L.DConstraint (c1, c2) =>
adamc@255	4152 let
adamc@255	4153 val (c1', k1, gs1) = elabCon (env, denv) c1
adamc@255	4154 val (c2', k2, gs2) = elabCon (env, denv) c2
adamc@255	4155 val gs3 = D.prove env denv (c1', c2', loc)
adamc@255	4156
adamc@628	4157 val denv' = D.assert env denv (c1', c2')
adamc@255	4158 in
adam@1639	4159 checkKind env c1' k1 (L'.KRecord (kunif env loc), loc);
adam@1639	4160 checkKind env c2' k2 (L'.KRecord (kunif env loc), loc);
adamc@255	4161
adamc@628	4162 ([(L'.DConstraint (c1', c2'), loc)], (env, denv', enD gs1 @ enD gs2 @ enD gs3 @ gs))
adamc@255	4163 end
adamc@255	4164
adamc@255	4165 \| L.DOpenConstraints (m, ms) =>
adamc@255	4166 let
adamc@255	4167 val denv = dopenConstraints (loc, env, denv) {str = m, strs = ms}
adamc@255	4168 in
adamc@255	4169 ([], (env, denv, gs))
adamc@255	4170 end
adamc@255	4171
adamc@255	4172 \| L.DExport str =>
adamc@255	4173 let
adamc@255	4174 val (str', sgn, gs') = elabStr (env, denv) str
adamc@255	4175
adamc@255	4176 val sgn =
adamc@255	4177 case #1 (hnormSgn env sgn) of
adamc@255	4178 L'.SgnConst sgis =>
adamc@255	4179 let
adamc@255	4180 fun doOne (all as (sgi, _), env) =
adamc@255	4181 (case sgi of
adamc@255	4182 L'.SgiVal (x, n, t) =>
adamc@325	4183 let
adamc@325	4184 fun doPage (makeRes, ran) =
adamc@628	4185 case hnormCon env ran of
adamc@628	4186 (L'.CApp (tf, arg), _) =>
adamc@628	4187 (case (hnormCon env tf, hnormCon env arg) of
adamc@628	4188 ((L'.CModProj (basis, [], "transaction"), _),
adamc@720	4189 (L'.CApp (tf, arg3), _)) =>
adamc@325	4190 (case (basis = !basis_r,
adamc@720	4191 hnormCon env tf, hnormCon env arg3) of
adamc@325	4192 (true,
adamc@720	4193 (L'.CApp (tf, arg2), _),
adamc@628	4194 ((L'.CRecord (_, []), _))) =>
adamc@720	4195 (case (hnormCon env tf) of
adamc@720	4196 (L'.CApp (tf, arg1), _) =>
adamc@720	4197 (case (hnormCon env tf,
adamc@720	4198 hnormCon env arg1,
adamc@720	4199 hnormCon env arg2) of
adamc@720	4200 (tf, arg1,
adamc@720	4201 (L'.CRecord (_, []), _)) =>
adamc@720	4202 let
adamc@720	4203 val t = (L'.CApp (tf, arg1), loc)
adamc@720	4204 val t = (L'.CApp (t, arg2), loc)
adamc@720	4205 val t = (L'.CApp (t, arg3), loc)
adamc@720	4206 val t = (L'.CApp (
adamc@720	4207 (L'.CModProj
adamc@720	4208 (basis, [], "transaction"), loc),
adamc@325	4209 t), loc)
adam@1347	4210
adam@1347	4211 fun normArgs t =
adam@1347	4212 case hnormCon env t of
adam@1347	4213 (L'.TFun (dom, ran), loc) =>
adam@1347	4214 (L'.TFun (hnormCon env dom, normArgs ran), loc)
adam@1347	4215 \| t' => t'
adamc@720	4216 in
adam@1347	4217 (L'.SgiVal (x, n, normArgs (makeRes t)), loc)
adamc@720	4218 end
adamc@325	4219 \| _ => all)
adamc@325	4220 \| _ => all)
adamc@325	4221 \| _ => all)
adamc@325	4222 \| _ => all)
adamc@325	4223 \| _ => all
adamc@325	4224 in
adamc@628	4225 case hnormCon env t of
adamc@628	4226 (L'.TFun (dom, ran), _) =>
adamc@628	4227 (case hnormCon env dom of
adamc@628	4228 (L'.TRecord domR, _) =>
adamc@325	4229 doPage (fn t => (L'.TFun ((L'.TRecord domR,
adamc@325	4230 loc),
adamc@325	4231 t), loc), ran)
adamc@325	4232 \| _ => all)
adamc@325	4233 \| _ => doPage (fn t => t, t)
adamc@325	4234 end
adamc@255	4235 \| _ => all,
adamc@255	4236 E.sgiBinds env all)
adamc@255	4237 in
adamc@255	4238 (L'.SgnConst (#1 (ListUtil.foldlMap doOne env sgis)), loc)
adamc@255	4239 end
adamc@255	4240 \| _ => sgn
adamc@255	4241 in
adamc@255	4242 ([(L'.DExport (E.newNamed (), sgn, str'), loc)], (env, denv, gs' @ gs))
adamc@255	4243 end
adamc@255	4244
adamc@707	4245 \| L.DTable (x, c, pe, ce) =>
adamc@255	4246 let
adamc@707	4247 val cstK = (L'.KRecord (L'.KRecord (L'.KUnit, loc), loc), loc)
adamc@707	4248
adamc@255	4249 val (c', k, gs') = elabCon (env, denv) c
adam@1639	4250 val pkey = cunif env (loc, cstK)
adam@1639	4251 val uniques = cunif env (loc, cstK)
adamc@705	4252
adamc@705	4253 val ct = tableOf ()
adamc@705	4254 val ct = (L'.CApp (ct, c'), loc)
adamc@707	4255 val ct = (L'.CApp (ct, (L'.CConcat (pkey, uniques), loc)), loc)
adamc@705	4256
adamc@705	4257 val (env, n) = E.pushENamed env x ct
adamc@707	4258 val (pe', pet, gs'') = elabExp (env, denv) pe
adamc@707	4259 val (ce', cet, gs''') = elabExp (env, denv) ce
adamc@707	4260
adamc@707	4261 val pst = (L'.CModProj (!basis_r, [], "primary_key"), loc)
adamc@707	4262 val pst = (L'.CApp (pst, c'), loc)
adamc@707	4263 val pst = (L'.CApp (pst, pkey), loc)
adamc@704	4264
adamc@704	4265 val cst = (L'.CModProj (!basis_r, [], "sql_constraints"), loc)
adamc@704	4266 val cst = (L'.CApp (cst, c'), loc)
adamc@705	4267 val cst = (L'.CApp (cst, uniques), loc)
adamc@255	4268 in
adamc@255	4269 checkKind env c' k (L'.KRecord (L'.KType, loc), loc);
adamc@707	4270 checkCon env pe' pet pst;
adamc@707	4271 checkCon env ce' cet cst;
adamc@707	4272 ([(L'.DTable (!basis_r, x, n, c', pe', pkey, ce', uniques), loc)],
adamc@707	4273 (env, denv, gs''' @ gs'' @ enD gs' @ gs))
adamc@255	4274 end
adamc@338	4275 \| L.DSequence x =>
adamc@338	4276 let
adamc@338	4277 val (env, n) = E.pushENamed env x (sequenceOf ())
adamc@338	4278 in
adamc@338	4279 ([(L'.DSequence (!basis_r, x, n), loc)], (env, denv, gs))
adamc@338	4280 end
adamc@754	4281 \| L.DView (x, e) =>
adamc@754	4282 let
adamc@754	4283 val (e', t, gs') = elabExp (env, denv) e
adamc@754	4284
adamc@754	4285 val k = (L'.KRecord (L'.KType, loc), loc)
adam@1639	4286 val fs = cunif env (loc, k)
adam@1639	4287 val ts = cunif env (loc, (L'.KRecord k, loc))
adamc@754	4288 val tf = (L'.CApp ((L'.CMap (k, k), loc),
adamc@754	4289 (L'.CAbs ("_", k, (L'.CRecord ((L'.KType, loc), []), loc)), loc)), loc)
adamc@754	4290 val ts = (L'.CApp (tf, ts), loc)
adamc@754	4291
adamc@754	4292 val cv = viewOf ()
adamc@754	4293 val cv = (L'.CApp (cv, fs), loc)
adamc@754	4294 val (env', n) = E.pushENamed env x cv
adamc@754	4295
adamc@754	4296 val ct = queryOf ()
adamc@1191	4297 val ct = (L'.CApp (ct, (L'.CRecord ((L'.KRecord (L'.KType, loc), loc), []), loc)), loc)
adam@1395	4298 val ct = (L'.CApp (ct, (L'.CRecord ((L'.KRecord (L'.KType, loc), loc), []), loc)), loc)
adamc@754	4299 val ct = (L'.CApp (ct, ts), loc)
adamc@754	4300 val ct = (L'.CApp (ct, fs), loc)
adamc@754	4301 in
adamc@754	4302 checkCon env e' t ct;
adamc@754	4303 ([(L'.DView (!basis_r, x, n, e', fs), loc)],
adamc@754	4304 (env', denv, gs' @ gs))
adamc@754	4305 end
adamc@255	4306
adamc@280	4307 \| L.DDatabase s => ([(L'.DDatabase s, loc)], (env, denv, gs))
adamc@280	4308
adamc@459	4309 \| L.DCookie (x, c) =>
adamc@459	4310 let
adamc@459	4311 val (c', k, gs') = elabCon (env, denv) c
adamc@459	4312 val (env, n) = E.pushENamed env x (L'.CApp (cookieOf (), c'), loc)
adamc@459	4313 in
adamc@459	4314 checkKind env c' k (L'.KType, loc);
adamc@459	4315 ([(L'.DCookie (!basis_r, x, n, c'), loc)], (env, denv, enD gs' @ gs))
adamc@459	4316 end
adamc@720	4317 \| L.DStyle x =>
adamc@718	4318 let
adamc@720	4319 val (env, n) = E.pushENamed env x (styleOf ())
adamc@718	4320 in
adamc@720	4321 ([(L'.DStyle (!basis_r, x, n), loc)], (env, denv, gs))
adamc@718	4322 end
adamc@1075	4323 \| L.DTask (e1, e2) =>
adamc@1073	4324 let
adamc@1075	4325 val (e1', t1, gs1) = elabExp (env, denv) e1
adamc@1075	4326 val (e2', t2, gs2) = elabExp (env, denv) e2
adamc@1075	4327
adam@1639	4328 val targ = cunif env (loc, (L'.KType, loc))
adam@1348	4329
adamc@1075	4330 val t1' = (L'.CModProj (!basis_r, [], "task_kind"), loc)
adam@1348	4331 val t1' = (L'.CApp (t1', targ), loc)
adam@1348	4332
adamc@1075	4333 val t2' = (L'.CApp ((L'.CModProj (!basis_r, [], "transaction"), loc),
adamc@1075	4334 (L'.TRecord (L'.CRecord ((L'.KType, loc), []), loc), loc)), loc)
adam@1348	4335 val t2' = (L'.TFun (targ, t2'), loc)
adamc@1073	4336 in
adamc@1075	4337 checkCon env e1' t1 t1';
adamc@1075	4338 checkCon env e2' t2 t2';
adamc@1075	4339 ([(L'.DTask (e1', e2'), loc)], (env, denv, gs2 @ gs1 @ gs))
adamc@1073	4340 end
adamc@1199	4341 \| L.DPolicy e1 =>
adamc@1199	4342 let
adamc@1199	4343 val (e1', t1, gs1) = elabExp (env, denv) e1
adamc@1199	4344
adamc@1199	4345 val t1' = (L'.CModProj (!basis_r, [], "sql_policy"), loc)
adamc@1199	4346 in
adamc@1199	4347 checkCon env e1' t1 t1';
adamc@1199	4348 ([(L'.DPolicy e1', loc)], (env, denv, gs1 @ gs))
adamc@1199	4349 end
adamc@459	4350
adam@1294	4351 \| L.DOnError (m1, ms, s) =>
adam@1294	4352 (case E.lookupStr env m1 of
adam@1294	4353 NONE => (expError env (UnboundStrInExp (loc, m1));
adam@1294	4354 ([], (env, denv, [])))
adam@1294	4355 \| SOME (n, sgn) =>
adam@1294	4356 let
adam@1294	4357 val (str, sgn) = foldl (fn (m, (str, sgn)) =>
adam@1294	4358 case E.projectStr env {sgn = sgn, str = str, field = m} of
adam@1294	4359 NONE => (conError env (UnboundStrInCon (loc, m));
adam@1294	4360 (strerror, sgnerror))
adam@1294	4361 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adam@1294	4362 ((L'.StrVar n, loc), sgn) ms
adam@1294	4363
adam@1294	4364 val t = case E.projectVal env {sgn = sgn, str = str, field = s} of
adam@1294	4365 NONE => (expError env (UnboundExp (loc, s));
adam@1294	4366 cerror)
adam@1294	4367 \| SOME t => t
adam@1294	4368
adam@1294	4369 val page = (L'.CModProj (!basis_r, [], "page"), loc)
adam@1294	4370 val xpage = (L'.CApp ((L'.CModProj (!basis_r, [], "transaction"), loc), page), loc)
adam@1294	4371 val func = (L'.TFun ((L'.CModProj (!basis_r, [], "xbody"), loc), xpage), loc)
adam@1294	4372 in
adam@1407	4373 (unifyCons env loc t func
adam@1407	4374 handle CUnify _ => ErrorMsg.error "onError handler has wrong type.");
adam@1294	4375 ([(L'.DOnError (n, ms, s), loc)], (env, denv, gs))
adam@1294	4376 end)
adam@1294	4377
adam@2010	4378 \| L.DFfi (x, modes, t) =>
adam@2010	4379 let
adam@2010	4380 val () = if Settings.getLessSafeFfi () then
adam@2010	4381 ()
adam@2010	4382 else
adam@2010	4383 ErrorMsg.errorAt loc "To enable 'ffi' declarations, the .urp directive 'lessSafeFfi' is mandatory."
adam@2010	4384
adam@2010	4385 val (t', _, gs1) = elabCon (env, denv) t
adam@2010	4386 val t' = normClassConstraint env t'
adam@2010	4387 val (env', n) = E.pushENamed env x t'
adam@2010	4388 in
adam@2010	4389 ([(L'.DFfi (x, n, modes, t'), loc)], (env', denv, enD gs1 @ gs))
adam@2010	4390 end
adam@2010	4391
adamc@280	4392 (val tcs = List.filter (fn TypeClass _ => true \| _ => false) (#3 (#2 r)))
adamc@255	4393 in
adam@1989	4394 (*prefaces "/elabDecl" [("d", SourcePrint.p_decl dAll),
adam@1989	4395 ("d'", p_list_sep PD.newline (ElabPrint.p_decl env) (#1 r))];*)
adamc@255	4396 r
adamc@255	4397 end
adamc@211	4398
adamc@83	4399 and elabStr (env, denv) (str, loc) =
adamc@31	4400 case str of
adamc@31	4401 L.StrConst ds =>
adamc@31	4402 let
adamc@88	4403 val (ds', (_, _, gs)) = ListUtil.foldlMapConcat elabDecl (env, denv, []) ds
adamc@123	4404 val sgis = ListUtil.mapConcat sgiOfDecl ds'
adamc@63	4405
adamc@63	4406 val (sgis, _, _, _, _) =
adamc@64	4407 foldr (fn ((sgi, loc), (sgis, cons, vals, sgns, strs)) =>
adamc@63	4408 case sgi of
adamc@64	4409 L'.SgiConAbs (x, n, k) =>
adamc@64	4410 let
adamc@64	4411 val (cons, x) =
adamc@64	4412 if SS.member (cons, x) then
adamc@64	4413 (cons, "?" ^ x)
adamc@64	4414 else
adamc@64	4415 (SS.add (cons, x), x)
adamc@64	4416 in
adamc@64	4417 ((L'.SgiConAbs (x, n, k), loc) :: sgis, cons, vals, sgns, strs)
adamc@64	4418 end
adamc@64	4419 \| L'.SgiCon (x, n, k, c) =>
adamc@64	4420 let
adamc@64	4421 val (cons, x) =
adamc@64	4422 if SS.member (cons, x) then
adamc@64	4423 (cons, "?" ^ x)
adamc@64	4424 else
adamc@64	4425 (SS.add (cons, x), x)
adamc@64	4426 in
adamc@64	4427 ((L'.SgiCon (x, n, k, c), loc) :: sgis, cons, vals, sgns, strs)
adamc@64	4428 end
adamc@805	4429 \| L'.SgiDatatype dts =>
adamc@156	4430 let
adamc@805	4431 fun doOne ((x, n, xs, xncs), (cons, vals)) =
adamc@805	4432 let
adamc@805	4433 val (cons, x) =
adamc@805	4434 if SS.member (cons, x) then
adamc@805	4435 (cons, "?" ^ x)
adamc@156	4436 else
adamc@805	4437 (SS.add (cons, x), x)
adamc@805	4438
adamc@805	4439 val (xncs, vals) =
adamc@805	4440 ListUtil.foldlMap
adamc@805	4441 (fn ((x, n, t), vals) =>
adamc@805	4442 if SS.member (vals, x) then
adamc@805	4443 (("?" ^ x, n, t), vals)
adamc@805	4444 else
adamc@805	4445 ((x, n, t), SS.add (vals, x)))
adamc@805	4446 vals xncs
adamc@805	4447 in
adamc@805	4448 ((x, n, xs, xncs), (cons, vals))
adamc@805	4449 end
adamc@805	4450
adamc@805	4451 val (dts, (cons, vals)) = ListUtil.foldlMap doOne (cons, vals) dts
adamc@156	4452 in
adamc@805	4453 ((L'.SgiDatatype dts, loc) :: sgis, cons, vals, sgns, strs)
adamc@156	4454 end
adamc@191	4455 \| L'.SgiDatatypeImp (x, n, m1, ms, x', xs, xncs) =>
adamc@156	4456 let
adamc@156	4457 val (cons, x) =
adamc@156	4458 if SS.member (cons, x) then
adamc@156	4459 (cons, "?" ^ x)
adamc@156	4460 else
adamc@156	4461 (SS.add (cons, x), x)
adamc@156	4462 in
adamc@191	4463 ((L'.SgiDatatypeImp (x, n, m1, ms, x', xs, xncs), loc) :: sgis, cons, vals, sgns, strs)
adamc@156	4464 end
adamc@64	4465 \| L'.SgiVal (x, n, c) =>
adamc@64	4466 let
adamc@64	4467 val (vals, x) =
adamc@64	4468 if SS.member (vals, x) then
adamc@64	4469 (vals, "?" ^ x)
adamc@64	4470 else
adamc@64	4471 (SS.add (vals, x), x)
adamc@64	4472 in
adamc@64	4473 ((L'.SgiVal (x, n, c), loc) :: sgis, cons, vals, sgns, strs)
adamc@64	4474 end
adamc@64	4475 \| L'.SgiSgn (x, n, sgn) =>
adamc@64	4476 let
adamc@64	4477 val (sgns, x) =
adamc@64	4478 if SS.member (sgns, x) then
adamc@64	4479 (sgns, "?" ^ x)
adamc@64	4480 else
adamc@64	4481 (SS.add (sgns, x), x)
adamc@64	4482 in
adamc@64	4483 ((L'.SgiSgn (x, n, sgn), loc) :: sgis, cons, vals, sgns, strs)
adamc@64	4484 end
adamc@64	4485
adamc@64	4486 \| L'.SgiStr (x, n, sgn) =>
adamc@64	4487 let
adamc@64	4488 val (strs, x) =
adamc@64	4489 if SS.member (strs, x) then
adamc@64	4490 (strs, "?" ^ x)
adamc@64	4491 else
adamc@64	4492 (SS.add (strs, x), x)
adamc@64	4493 in
adamc@64	4494 ((L'.SgiStr (x, n, sgn), loc) :: sgis, cons, vals, sgns, strs)
adamc@88	4495 end
adamc@203	4496 \| L'.SgiConstraint _ => ((sgi, loc) :: sgis, cons, vals, sgns, strs)
adamc@563	4497 \| L'.SgiClassAbs (x, n, k) =>
adamc@211	4498 let
adamc@211	4499 val (cons, x) =
adamc@211	4500 if SS.member (cons, x) then
adamc@211	4501 (cons, "?" ^ x)
adamc@211	4502 else
adamc@211	4503 (SS.add (cons, x), x)
adamc@211	4504 in
adamc@563	4505 ((L'.SgiClassAbs (x, n, k), loc) :: sgis, cons, vals, sgns, strs)
adamc@211	4506 end
adamc@563	4507 \| L'.SgiClass (x, n, k, c) =>
adamc@211	4508 let
adamc@211	4509 val (cons, x) =
adamc@211	4510 if SS.member (cons, x) then
adamc@211	4511 (cons, "?" ^ x)
adamc@211	4512 else
adamc@211	4513 (SS.add (cons, x), x)
adamc@211	4514 in
adamc@563	4515 ((L'.SgiClass (x, n, k, c), loc) :: sgis, cons, vals, sgns, strs)
adamc@203	4516 end)
adamc@64	4517
adamc@63	4518 ([], SS.empty, SS.empty, SS.empty, SS.empty) sgis
adamc@31	4519 in
adamc@83	4520 ((L'.StrConst ds', loc), (L'.SgnConst sgis, loc), gs)
adamc@31	4521 end
adamc@31	4522 \| L.StrVar x =>
adamc@31	4523 (case E.lookupStr env x of
adamc@31	4524 NONE =>
adamc@31	4525 (strError env (UnboundStr (loc, x));
adamc@83	4526 (strerror, sgnerror, []))
adamc@83	4527 \| SOME (n, sgn) => ((L'.StrVar n, loc), sgn, []))
adamc@34	4528 \| L.StrProj (str, x) =>
adamc@34	4529 let
adamc@83	4530 val (str', sgn, gs) = elabStr (env, denv) str
adamc@34	4531 in
adamc@34	4532 case E.projectStr env {str = str', sgn = sgn, field = x} of
adamc@34	4533 NONE => (strError env (UnboundStr (loc, x));
adamc@83	4534 (strerror, sgnerror, []))
adamc@83	4535 \| SOME sgn => ((L'.StrProj (str', x), loc), sgn, gs)
adamc@34	4536 end
adamc@41	4537 \| L.StrFun (m, dom, ranO, str) =>
adamc@41	4538 let
adamc@83	4539 val (dom', gs1) = elabSgn (env, denv) dom
adamc@41	4540 val (env', n) = E.pushStrNamed env m dom'
adamc@834	4541 val denv' = dopenConstraints (loc, env', denv) {str = m, strs = []}
adamc@834	4542 val (str', actual, gs2) = elabStr (env', denv') str
adamc@41	4543
adamc@83	4544 val (formal, gs3) =
adamc@41	4545 case ranO of
adamc@83	4546 NONE => (actual, [])
adamc@41	4547 \| SOME ran =>
adamc@41	4548 let
adamc@834	4549 val (ran', gs) = elabSgn (env', denv') ran
adamc@41	4550 in
adamc@1000	4551 subSgn env' loc actual ran';
adamc@83	4552 (ran', gs)
adamc@41	4553 end
adamc@41	4554 in
adamc@41	4555 ((L'.StrFun (m, n, dom', formal, str'), loc),
adamc@83	4556 (L'.SgnFun (m, n, dom', formal), loc),
adamc@228	4557 enD gs1 @ gs2 @ enD gs3)
adamc@41	4558 end
adamc@44	4559 \| L.StrApp (str1, str2) =>
adamc@44	4560 let
adamc@83	4561 val (str1', sgn1, gs1) = elabStr (env, denv) str1
adamc@325	4562 val str2 =
adamc@325	4563 case sgn1 of
adamc@325	4564 (L'.SgnFun (_, _, dom, _), _) =>
adamc@1275	4565 let
adamc@1275	4566 val s = wildifyStr env (str2, dom)
adamc@1275	4567 in
adamc@1275	4568 (Print.preface ("Wild", SourcePrint.p_str s);)
adamc@1275	4569 s
adamc@1275	4570 end
adamc@325	4571 \| _ => str2
adamc@83	4572 val (str2', sgn2, gs2) = elabStr (env, denv) str2
adamc@1270	4573 in
adamc@44	4574 case #1 (hnormSgn env sgn1) of
adamc@83	4575 L'.SgnError => (strerror, sgnerror, [])
adamc@44	4576 \| L'.SgnFun (m, n, dom, ran) =>
adamc@1000	4577 (subSgn env loc sgn2 dom;
adamc@44	4578 case #1 (hnormSgn env ran) of
adamc@83	4579 L'.SgnError => (strerror, sgnerror, [])
adamc@44	4580 \| L'.SgnConst sgis =>
adam@1968	4581 let
adam@1968	4582 (* This code handles a tricky case that led to a very nasty bug.
adam@1968	4583 * An invariant about signatures of elaborated modules is that no
adam@1968	4584 * identifier that could appear directly in a program is defined
adam@1968	4585 * twice. We add "?" in front of identifiers where necessary to
adam@1968	4586 * maintain the invariant, but the code below, to extend a functor
adam@1968	4587 * body with a binding for the functor argument, wasn't written
adam@1968	4588 * with the invariant in mind. Luckily for us, references to
adam@1968	4589 * an identifier later within a signature work by globally
adam@1968	4590 * unique index, so we just need to change the string name in the
adam@1989	4591 * new declaration.
adam@1989	4592 *
adam@1989	4593 * ~~~ A few days later.... ~~~
adam@1989	4594 * This is trickier than I thought! We might need to add
adam@1989	4595 * arbitarily many question marks before the module name to
adam@1989	4596 * avoid a clash, since some other code might depend on
adam@1989	4597 * question-mark identifiers generated previously by this
adam@1989	4598 * very code fragment. *)
adam@1989	4599 fun mungeName m =
adam@1968	4600 if List.exists (fn (L'.SgiStr (x, _, _), _) => x = m
adam@1968	4601 \| _ => false) sgis then
adam@1989	4602 mungeName ("?" ^ m)
adam@1968	4603 else
adam@1968	4604 m
adam@1989	4605
adam@1989	4606 val m = mungeName m
adam@1968	4607 in
adam@1968	4608 ((L'.StrApp (str1', str2'), loc),
adam@1968	4609 (L'.SgnConst ((L'.SgiStr (m, n, selfifyAt env {str = str2', sgn = sgn2}), loc) :: sgis), loc),
adam@1968	4610 gs1 @ gs2)
adam@1968	4611 end
adamc@44	4612 \| _ => raise Fail "Unable to hnormSgn in functor application")
adamc@44	4613 \| _ => (strError env (NotFunctor sgn1);
adamc@83	4614 (strerror, sgnerror, []))
adamc@44	4615 end
adamc@31	4616
adamc@987	4617 fun resolveClass env = E.resolveClass (hnormCon env) (consEq env dummy) env
adamc@833	4618
adam@1732	4619 fun elabFile basis basis_tm topStr topSgn top_tm env file =
adamc@56	4620 let
adam@1737	4621 val () = ModDb.snapshot ()
adam@1737	4622
adamc@713	4623 val () = mayDelay := true
adamc@713	4624 val () = delayedUnifs := []
adamc@830	4625 val () = delayedExhaustives := []
adamc@713	4626
adam@1733	4627 val d = (L.DFfiStr ("Basis", (L.SgnConst basis, ErrorMsg.dummySpan), SOME basis_tm), ErrorMsg.dummySpan)
adam@1732	4628 val (basis_n, env', sgn) =
adam@1733	4629 case (if !incremental then ModDb.lookup d else NONE) of
adam@1732	4630 NONE =>
adam@1732	4631 let
adam@1732	4632 val (sgn, gs) = elabSgn (env, D.empty) (L.SgnConst basis, ErrorMsg.dummySpan)
adam@1732	4633 val () = case gs of
adam@1732	4634 [] => ()
adam@1732	4635 \| _ => (app (fn (_, env, _, c1, c2) =>
adam@1732	4636 prefaces "Unresolved"
adam@1732	4637 [("c1", p_con env c1),
adam@1732	4638 ("c2", p_con env c2)]) gs;
adam@1732	4639 raise Fail "Unresolved disjointness constraints in Basis")
adam@1732	4640
adam@1732	4641 val (env', basis_n) = E.pushStrNamed env "Basis" sgn
adam@1732	4642 in
adam@1732	4643 ModDb.insert ((L'.DFfiStr ("Basis", basis_n, sgn), ErrorMsg.dummySpan), basis_tm);
adam@1732	4644 (basis_n, env', sgn)
adam@1732	4645 end
adam@1732	4646 \| SOME (d' as (L'.DFfiStr (_, basis_n, sgn), _)) =>
adam@1732	4647 (basis_n, E.pushStrNamedAs env "Basis" basis_n sgn, sgn)
adam@1732	4648 \| _ => raise Fail "Elaborate: Basis impossible"
adam@1732	4649
adamc@210	4650 val () = basis_r := basis_n
adamc@628	4651 val (ds, env') = dopen env' {str = basis_n, strs = [], sgn = sgn}
adamc@56	4652
adamc@56	4653 fun discoverC r x =
adamc@56	4654 case E.lookupC env' x of
adamc@56	4655 E.NotBound => raise Fail ("Constructor " ^ x ^ " unbound in Basis")
adamc@56	4656 \| E.Rel _ => raise Fail ("Constructor " ^ x ^ " bound relatively in Basis")
adamc@56	4657 \| E.Named (n, (_, loc)) => r := (L'.CNamed n, loc)
adamc@56	4658
adamc@56	4659 val () = discoverC int "int"
adamc@56	4660 val () = discoverC float "float"
adamc@56	4661 val () = discoverC string "string"
adamc@821	4662 val () = discoverC char "char"
adamc@203	4663 val () = discoverC table "sql_table"
adamc@56	4664
adam@1732	4665 val d = (L.DStr ("Top", SOME (L.SgnConst topSgn, ErrorMsg.dummySpan),
adam@1732	4666 SOME (if Time.< (top_tm, basis_tm) then basis_tm else top_tm),
adam@1868	4667 (L.StrConst topStr, ErrorMsg.dummySpan), false), ErrorMsg.dummySpan)
adam@1732	4668 val (top_n, env', topSgn, topStr) =
adam@1733	4669 case (if !incremental then ModDb.lookup d else NONE) of
adam@1732	4670 NONE =>
adam@1732	4671 let
adam@1732	4672 val (topSgn, gs) = elabSgn (env', D.empty) (L.SgnConst topSgn, ErrorMsg.dummySpan)
adam@1732	4673 val () = case gs of
adam@1732	4674 [] => ()
adam@1732	4675 \| _ => raise Fail "Unresolved disjointness constraints in top.urs"
adam@1732	4676 val (topStr, topSgn', gs) = elabStr (env', D.empty) (L.StrConst topStr, ErrorMsg.dummySpan)
adam@1732	4677
adam@1732	4678 val () = case gs of
adam@1732	4679 [] => ()
adam@1732	4680 \| _ => app (fn Disjoint (loc, env, denv, c1, c2) =>
adam@1732	4681 (case D.prove env denv (c1, c2, loc) of
adam@1732	4682 [] => ()
adam@1732	4683 \| _ =>
adam@1732	4684 (prefaces "Unresolved constraint in top.ur"
adam@1732	4685 [("loc", PD.string (ErrorMsg.spanToString loc)),
adam@1732	4686 ("c1", p_con env c1),
adam@1732	4687 ("c2", p_con env c2)];
adam@1732	4688 raise Fail "Unresolved constraint in top.ur"))
adam@1732	4689 \| TypeClass (env, c, r, loc) =>
adam@1732	4690 let
adam@1732	4691 val c = normClassKey env c
adam@1732	4692 in
adam@1732	4693 case resolveClass env c of
adam@1732	4694 SOME e => r := SOME e
adam@1732	4695 \| NONE => expError env (Unresolvable (loc, c))
adam@1732	4696 end) gs
adam@1732	4697
adam@1732	4698 val () = subSgn env' ErrorMsg.dummySpan topSgn' topSgn
adam@1732	4699
adam@1732	4700 val (env', top_n) = E.pushStrNamed env' "Top" topSgn
adam@1732	4701 in
adam@1732	4702 ModDb.insert ((L'.DStr ("Top", top_n, topSgn, topStr), ErrorMsg.dummySpan), top_tm);
adam@1732	4703 (top_n, env', topSgn, topStr)
adam@1732	4704 end
adam@1732	4705 \| SOME (d' as (L'.DStr (_, top_n, topSgn, topStr), _)) =>
adam@1732	4706 (top_n, E.declBinds env' d', topSgn, topStr)
adam@1732	4707 \| _ => raise Fail "Elaborate: Top impossible"
adam@1732	4708
adamc@633	4709 val () = top_r := top_n
adamc@325	4710
adamc@628	4711 val (ds', env') = dopen env' {str = top_n, strs = [], sgn = topSgn}
adamc@325	4712
adam@1883	4713 fun elabDecl' x =
adam@1883	4714 (resetKunif ();
adam@1883	4715 resetCunif ();
adam@1883	4716 elabDecl x)
adam@1883	4717
adam@1883	4718 val (file, (env'', _, gs)) = ListUtil.foldlMapConcat elabDecl' (env', D.empty, []) file
adamc@753	4719
adamc@777	4720 fun oneSummaryRound () =
adamc@777	4721 if ErrorMsg.anyErrors () then
adamc@777	4722 ()
adamc@777	4723 else
adamc@777	4724 let
adamc@777	4725 val delayed = !delayedUnifs
adamc@777	4726 in
adamc@777	4727 delayedUnifs := [];
adamc@777	4728 app (fn (loc, env, k, s1, s2) =>
adamc@777	4729 unifySummaries env (loc, k, normalizeRecordSummary env s1, normalizeRecordSummary env s2))
adamc@777	4730 delayed
adamc@777	4731 end
adam@1576	4732
adam@1576	4733 val checkConstraintErrors = ref (fn () => ())
adam@1723	4734 fun stopHere () = not (!unifyMore) andalso ErrorMsg.anyErrors ()
adamc@56	4735 in
adamc@777	4736 oneSummaryRound ();
adamc@753	4737
adam@1723	4738 if stopHere () then
adamc@753	4739 ()
adamc@753	4740 else
adamc@753	4741 let
adam@1767	4742 fun solver (gs : constraint list) =
adamc@753	4743 let
adamc@753	4744 val (gs, solved) =
adamc@753	4745 ListUtil.foldlMapPartial
adam@1767	4746 (fn (g : constraint, solved) =>
adamc@753	4747 case g of
adamc@753	4748 Disjoint (loc, env, denv, c1, c2) =>
adamc@753	4749 (case D.prove env denv (c1, c2, loc) of
adamc@753	4750 [] => (NONE, true)
adamc@753	4751 \| _ => (SOME g, solved))
adamc@753	4752 \| TypeClass (env, c, r, loc) =>
adamc@753	4753 let
adamc@753	4754 fun default () = (SOME g, solved)
adam@1767	4755
adam@1767	4756 fun resolver r c =
adam@1767	4757 let
adam@1767	4758 val c = normClassKey env c
adam@1767	4759 in
adam@1767	4760 case resolveClass env c of
adam@1767	4761 SOME e => (r := SOME e;
adam@1767	4762 (NONE, true))
adam@1767	4763 \| NONE =>
adam@1767	4764 case #1 (hnormCon env c) of
adam@1767	4765 L'.CApp (f, x) =>
adam@1767	4766 (case (#1 (hnormCon env f), #1 (hnormCon env x)) of
adam@1767	4767 (L'.CKApp (f, _), L'.CRecord (k, xcs)) =>
adam@1767	4768 (case #1 (hnormCon env f) of
adam@1767	4769 L'.CModProj (top_n', [], "folder") =>
adam@1767	4770 if top_n' = top_n then
adam@1767	4771 let
adam@1767	4772 val e = (L'.EModProj (top_n, ["Folder"], "nil"), loc)
adam@1767	4773 val e = (L'.EKApp (e, k), loc)
adam@1767	4774
adam@1767	4775 val (folder, _) = foldr (fn ((x, c), (folder, xcs)) =>
adam@1767	4776 let
adam@1767	4777 val e = (L'.EModProj (top_n, ["Folder"],
adam@1767	4778 "cons"), loc)
adam@1767	4779 val e = (L'.EKApp (e, k), loc)
adam@1767	4780 val e = (L'.ECApp (e,
adam@1767	4781 (L'.CRecord (k, xcs),
adam@1767	4782 loc)), loc)
adam@1767	4783 val e = (L'.ECApp (e, x), loc)
adam@1767	4784 val e = (L'.ECApp (e, c), loc)
adam@1767	4785 val e = (L'.EApp (e, folder), loc)
adam@1767	4786 in
adam@1767	4787 (e, (x, c) :: xcs)
adam@1767	4788 end)
adam@1767	4789 (e, []) xcs
adam@1767	4790 in
adam@1767	4791 (r := SOME folder;
adam@1767	4792 (NONE, true))
adam@1767	4793 end
adam@1767	4794 else
adam@1767	4795 default ()
adam@1767	4796 \| _ => default ())
adam@1767	4797 \| _ => default ())
adam@1767	4798
adam@1767	4799 \| L'.TRecord c' =>
adam@1767	4800 (case #1 (hnormCon env c') of
adam@1767	4801 L'.CRecord (_, xts) =>
adam@1767	4802 let
adam@1767	4803 val witnesses = map (fn (x, t) =>
adam@1767	4804 let
adam@1767	4805 val r = ref NONE
adam@1767	4806 val (opt, _) = resolver r t
adam@1767	4807 in
adam@1767	4808 case opt of
adam@1767	4809 SOME _ => NONE
adam@1767	4810 \| NONE =>
adam@1767	4811 case !r of
adam@1767	4812 NONE => NONE
adam@1767	4813 \| SOME e =>
adam@1767	4814 SOME (x, e, t)
adam@1767	4815 end) xts
adam@1767	4816 in
adam@1767	4817 if List.all Option.isSome witnesses then
adam@1767	4818 (r := SOME (L'.ERecord (map valOf witnesses), loc);
adam@1767	4819 (NONE, true))
adam@1767	4820 else
adam@1767	4821 (SOME g, solved)
adam@1767	4822 end
adam@1767	4823 \| _ => (SOME g, solved))
adam@1767	4824
adam@1767	4825 \| _ => default ()
adam@1767	4826 end
adamc@753	4827 in
adam@1767	4828 resolver r c
adamc@753	4829 end)
adamc@753	4830 false gs
adamc@753	4831 in
adamc@753	4832 case (gs, solved) of
adamc@753	4833 ([], _) => ()
adamc@777	4834 \| (_, true) => (oneSummaryRound (); solver gs)
adamc@753	4835 \| _ =>
adam@1576	4836 checkConstraintErrors :=
adam@1576	4837 (fn () => app (fn Disjoint (loc, env, denv, c1, c2) =>
adam@1576	4838 let
adam@1576	4839 val c1' = ElabOps.hnormCon env c1
adam@1576	4840 val c2' = ElabOps.hnormCon env c2
adam@1576	4841
adam@1576	4842 fun isUnif (c, _) =
adam@1576	4843 case c of
adam@1576	4844 L'.CUnif _ => true
adam@1576	4845 \| _ => false
adam@1576	4846
adam@1576	4847 fun maybeAttr (c, _) =
adam@1576	4848 case c of
adam@1576	4849 L'.CRecord ((L'.KType, _), xts) => true
adam@1576	4850 \| _ => false
adam@1576	4851 in
adam@1576	4852 ErrorMsg.errorAt loc "Couldn't prove field name disjointness";
adam@1576	4853 eprefaces' [("Con 1", p_con env c1),
adam@1576	4854 ("Con 2", p_con env c2),
adam@1576	4855 ("Hnormed 1", p_con env c1'),
adam@1576	4856 ("Hnormed 2", p_con env c2')]
adam@1576	4857
adam@1576	4858 (*app (fn (loc, env, k, s1, s2) =>
adam@1576	4859 eprefaces' [("s1", p_summary env (normalizeRecordSummary env s1)),
adam@1576	4860 ("s2", p_summary env (normalizeRecordSummary env s2))])
adam@1576	4861 (!delayedUnifs);*)
adam@1576	4862 end
adam@1576	4863 \| TypeClass (env, c, r, loc) =>
adam@1742	4864 let
adam@1742	4865 val c = normClassKey env c
adam@1742	4866 in
adam@1742	4867 case resolveClass env c of
adam@1767	4868 SOME e => r := SOME e
adam@1742	4869 \| NONE => expError env (Unresolvable (loc, c))
adam@1742	4870 end)
adam@1576	4871 gs)
adamc@753	4872 end
adamc@753	4873 in
adamc@753	4874 solver gs
adamc@753	4875 end;
adamc@753	4876
adamc@713	4877 mayDelay := false;
adamc@713	4878
adam@1723	4879 if stopHere () then
adamc@777	4880 ()
adamc@777	4881 else
adamc@777	4882 (app (fn (loc, env, k, s1, s2) =>
adamc@777	4883 unifySummaries env (loc, k, normalizeRecordSummary env s1, normalizeRecordSummary env s2)
adam@1719	4884 handle CUnify' (env', err) => (ErrorMsg.errorAt loc "Error in final record unification";
adam@1719	4885 cunifyError env' err;
adam@1719	4886 case !reducedSummaries of
adam@1719	4887 NONE => ()
adam@1719	4888 \| SOME (s1, s2) =>
adam@1719	4889 (ErrorMsg.errorAt loc "Stuck unifying these records after canceling matching pieces:";
adam@1719	4890 eprefaces' [("Have", s1),
adam@1719	4891 ("Need", s2)])))
adamc@777	4892 (!delayedUnifs);
adamc@777	4893 delayedUnifs := []);
adamc@713	4894
adam@1723	4895 if stopHere () then
adam@1346	4896 ()
adam@1346	4897 else
adam@1584	4898 if List.exists kunifsInDecl file then
adam@1584	4899 case U.File.findDecl kunifsInDecl file of
adam@1584	4900 NONE => ()
adam@1584	4901 \| SOME d => declError env'' (KunifsRemain [d])
adam@1584	4902 else
adam@1584	4903 ();
adam@1345	4904
adam@1723	4905 if stopHere () then
adam@1346	4906 ()
adam@1346	4907 else
adam@1584	4908 if List.exists cunifsInDecl file then
adam@1584	4909 case U.File.findDecl cunifsInDecl file of
adam@1584	4910 NONE => ()
adam@1584	4911 \| SOME d => declError env'' (CunifsRemain [d])
adam@1584	4912 else
adam@1584	4913 ();
adamc@750	4914
adam@1723	4915 if stopHere () then
adamc@830	4916 ()
adamc@830	4917 else
adamc@837	4918 app (fn all as (env, _, _, loc) =>
adamc@830	4919 case exhaustive all of
adamc@830	4920 NONE => ()
adamc@830	4921 \| SOME p => expError env (Inexhaustive (loc, p)))
adamc@830	4922 (!delayedExhaustives);
adamc@830	4923
adam@1723	4924 if stopHere () then
adam@1576	4925 ()
adam@1576	4926 else
adam@1576	4927 !checkConstraintErrors ();
adam@1576	4928
adamc@799	4929 (preface ("file", p_file env' file);)
adam@1531	4930
adam@1745	4931 if !dumpTypes orelse (!dumpTypesOnError andalso ErrorMsg.anyErrors ()) then
adam@1531	4932 let
adam@1531	4933 open L'
adam@1531	4934 open Print.PD
adam@1531	4935 open Print
adam@1531	4936
adam@1715	4937 fun p_con env c = ElabPrint.p_con env (ElabOps.reduceCon env c)
adam@1715	4938
adam@1531	4939 fun dumpDecl (d, env) =
adam@1531	4940 case #1 d of
adam@1531	4941 DCon (x, _, k, _) => (print (box [string x,
adam@1531	4942 space,
adam@1531	4943 string "::",
adam@1531	4944 space,
adam@1531	4945 p_kind env k,
adam@1531	4946 newline,
adam@1531	4947 newline]);
adam@1531	4948 E.declBinds env d)
adam@1531	4949 \| DVal (x, _, t, _) => (print (box [string x,
adam@1531	4950 space,
adam@1531	4951 string ":",
adam@1531	4952 space,
adam@1531	4953 p_con env t,
adam@1531	4954 newline,
adam@1531	4955 newline]);
adam@1531	4956 E.declBinds env d)
adam@1531	4957 \| DValRec vis => (app (fn (x, _, t, _) => print (box [string x,
adam@1531	4958 space,
adam@1531	4959 string ":",
adam@1531	4960 space,
adam@1531	4961 p_con env t,
adam@1531	4962 newline,
adam@1531	4963 newline])) vis;
adam@1531	4964 E.declBinds env d)
adam@1531	4965 \| DStr (x, _, _, str) => (print (box [string ("<" ^ x ^ ">"),
adam@1531	4966 newline,
adam@1531	4967 newline]);
adam@1531	4968 dumpStr (str, env);
adam@1531	4969 print (box [string ("</" ^ x ^ ">"),
adam@1531	4970 newline,
adam@1531	4971 newline]);
adam@1531	4972 E.declBinds env d)
adam@1531	4973 \| _ => E.declBinds env d
adam@1531	4974
adam@1531	4975 and dumpStr (str, env) =
adam@1531	4976 case #1 str of
adam@1531	4977 StrConst ds => ignore (foldl dumpDecl env ds)
adam@1531	4978 \| _ => ()
adam@1531	4979 in
adam@1531	4980 ignore (foldl dumpDecl env' file)
adam@1531	4981 end
adam@1531	4982 else
adam@1531	4983 ();
adam@1737	4984
adam@1737	4985 if ErrorMsg.anyErrors () then
adam@1737	4986 ModDb.revert ()
adam@1737	4987 else
adam@1737	4988 ();
adam@1912	4989
adam@1912	4990 (Print.preface("File", ElabPrint.p_file env file);)
adam@1345	4991
adamc@325	4992 (L'.DFfiStr ("Basis", basis_n, sgn), ErrorMsg.dummySpan)
adamc@325	4993 :: ds
adamc@325	4994 @ (L'.DStr ("Top", top_n, topSgn, topStr), ErrorMsg.dummySpan)
adamc@325	4995 :: ds' @ file
adamc@56	4996 end
adamc@2	4997
adamc@2	4998 end

Mercurial > urweb

annotate src/elaborate.sml @ 2248:e09c3dc102ef