Ur/Web: src/elaborate.sml annotate

annotate src/elaborate.sml @ 1986:b2254554542f

Add Datetime JavaScript support.

author	Patrick Hurst <phurst@mit.edu>
date	Mon, 17 Feb 2014 19:21:46 -0500
parents	2c075e875a47
children	210fb3dfc483

rev	line source
adam@1864	1 (* Copyright (c) 2008-2013, 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' ()
adamc@706	1194 in
adam@1668	1195 (*eprefaces "unifyCons''" [("c1", p_con env c1All),
adam@1668	1196 ("c2", p_con env c2All)];*)
adam@1668	1197
adam@1668	1198 (case (c1, c2) of
adamc@706	1199 (L'.CError, _) => ()
adamc@706	1200 \| (_, L'.CError) => ()
adamc@403	1201
adam@1639	1202 \| (L'.CUnif (nl1, loc1, k1, _, r1 as ref (L'.Unknown f1)), L'.CUnif (nl2, loc2, k2, _, r2 as ref (L'.Unknown f2))) =>
adam@1668	1203 if r1 = r2 then
adam@1668	1204 if nl1 = nl2 then
adam@1668	1205 ()
adam@1668	1206 else
adam@1668	1207 err (fn _ => TooLifty (loc1, loc2))
adam@1303	1208 else if nl1 = 0 then
adamc@705	1209 (unifyKinds env k1 k2;
adam@1639	1210 if f1 c2All then
adam@1639	1211 r1 := L'.Known c2All
adam@1639	1212 else
adam@1639	1213 err CScope)
adam@1303	1214 else if nl2 = 0 then
adam@1303	1215 (unifyKinds env k1 k2;
adam@1639	1216 if f2 c1All then
adam@1639	1217 r2 := L'.Known c1All
adam@1639	1218 else
adam@1639	1219 err CScope)
adam@1303	1220 else
adam@1303	1221 err (fn _ => TooLifty (loc1, loc2))
adam@1303	1222
adam@1639	1223 \| (L'.CUnif (0, _, _, _, r as ref (L'.Unknown f)), _) =>
adam@1639	1224 if occursCon r c2All then
adam@1639	1225 err COccursCheckFailed
adam@1639	1226 else if f c2All then
adam@1639	1227 r := L'.Known c2All
adam@1639	1228 else
adam@1639	1229 err CScope
adam@1639	1230 \| (_, L'.CUnif (0, _, _, _, r as ref (L'.Unknown f))) =>
adam@1639	1231 if occursCon r c1All then
adam@1639	1232 err COccursCheckFailed
adam@1639	1233 else if f c1All then
adam@1639	1234 r := L'.Known c1All
adam@1639	1235 else
adam@1639	1236 err CScope
adam@1639	1237
adam@1639	1238 \| (L'.CUnif (nl, _, _, _, r as ref (L'.Unknown f)), _) =>
adamc@705	1239 if occursCon r c2All then
adamc@705	1240 err COccursCheckFailed
adamc@705	1241 else
adam@1639	1242 (let
adam@1639	1243 val sq = squish nl c2All
adam@1639	1244 in
adam@1639	1245 if f sq then
adam@1639	1246 r := L'.Known sq
adam@1639	1247 else
adam@1639	1248 err CScope
adam@1639	1249 end
adam@1639	1250 handle CantSquish => err (fn _ => TooDeep))
adam@1639	1251 \| (_, L'.CUnif (nl, _, _, _, r as ref (L'.Unknown f))) =>
adamc@705	1252 if occursCon r c1All then
adamc@705	1253 err COccursCheckFailed
adamc@705	1254 else
adam@1639	1255 (let
adam@1639	1256 val sq = squish nl c1All
adam@1639	1257 in
adam@1639	1258 if f sq then
adam@1639	1259 r := L'.Known sq
adam@1639	1260 else
adam@1639	1261 err CScope
adam@1639	1262 end
adam@1306	1263 handle CantSquish => err (fn _ => TooDeep))
adam@1304	1264
adam@1341	1265 \| (L'.CRecord _, _) => isRecord ()
adam@1341	1266 \| (_, L'.CRecord _) => isRecord ()
adam@1341	1267 \| (L'.CConcat _, _) => isRecord ()
adam@1341	1268 \| (_, L'.CConcat _) => isRecord ()
adam@1341	1269
adam@1341	1270
adamc@705	1271 \| (L'.CUnit, L'.CUnit) => ()
adamc@705	1272
adamc@705	1273 \| (L'.TFun (d1, r1), L'.TFun (d2, r2)) =>
adamc@987	1274 (unifyCons' env loc d1 d2;
adam@1639	1275 unifyCons' env loc r1 r2)
adamc@705	1276 \| (L'.TCFun (expl1, x1, d1, r1), L'.TCFun (expl2, _, d2, r2)) =>
adamc@705	1277 if expl1 <> expl2 then
adamc@705	1278 err CExplicitness
adamc@705	1279 else
adamc@705	1280 (unifyKinds env d1 d2;
adamc@705	1281 let
adamc@705	1282 (val befor = Time.now ())
adamc@705	1283 val env' = E.pushCRel env x1 d1
adamc@705	1284 in
adamc@705	1285 (*TextIO.print ("E.pushCRel: "
adamc@705	1286 ^ LargeReal.toString (Time.toReal (Time.- (Time.now (), befor)))
adamc@705	1287 ^ "\n");*)
adamc@987	1288 unifyCons' env' loc r1 r2
adamc@705	1289 end)
adamc@987	1290 \| (L'.TRecord r1, L'.TRecord r2) => unifyCons' env loc r1 r2
adamc@705	1291 \| (L'.TDisjoint (c1, d1, e1), L'.TDisjoint (c2, d2, e2)) =>
adamc@987	1292 (unifyCons' env loc c1 c2;
adamc@987	1293 unifyCons' env loc d1 d2;
adamc@987	1294 unifyCons' env loc e1 e2)
adamc@705	1295
adamc@705	1296 \| (L'.CRel n1, L'.CRel n2) =>
adamc@705	1297 if n1 = n2 then
adamc@705	1298 ()
adamc@705	1299 else
adamc@705	1300 err CIncompatible
adamc@705	1301 \| (L'.CNamed n1, L'.CNamed n2) =>
adamc@705	1302 if n1 = n2 then
adamc@705	1303 ()
adamc@705	1304 else
adamc@705	1305 err CIncompatible
adamc@705	1306
adamc@705	1307 \| (L'.CApp (d1, r1), L'.CApp (d2, r2)) =>
adamc@987	1308 (unifyCons' env loc d1 d2;
adamc@987	1309 unifyCons' env loc r1 r2)
adamc@705	1310 \| (L'.CAbs (x1, k1, c1), L'.CAbs (_, k2, c2)) =>
adamc@705	1311 (unifyKinds env k1 k2;
adamc@987	1312 unifyCons' (E.pushCRel env x1 k1) loc c1 c2)
adamc@705	1313
adamc@705	1314 \| (L'.CName n1, L'.CName n2) =>
adamc@705	1315 if n1 = n2 then
adamc@705	1316 ()
adamc@705	1317 else
adamc@705	1318 err CIncompatible
adamc@705	1319
adamc@705	1320 \| (L'.CModProj (n1, ms1, x1), L'.CModProj (n2, ms2, x2)) =>
adamc@705	1321 if n1 = n2 andalso ms1 = ms2 andalso x1 = x2 then
adamc@705	1322 ()
adamc@705	1323 else
adamc@705	1324 err CIncompatible
adamc@705	1325
adamc@705	1326 \| (L'.CTuple cs1, L'.CTuple cs2) =>
adamc@987	1327 ((ListPair.appEq (fn (c1, c2) => unifyCons' env loc c1 c2) (cs1, cs2))
adamc@705	1328 handle ListPair.UnequalLengths => err CIncompatible)
adamc@705	1329
adamc@706	1330 \| (L'.CProj (c1, n1), _) => projSpecial1 (c1, n1, fn () => err CIncompatible)
adamc@706	1331 \| (_, L'.CProj (c2, n2)) => projSpecial2 (c2, n2, fn () => err CIncompatible)
adamc@706	1332
adamc@623	1333 \| (L'.CMap (dom1, ran1), L'.CMap (dom2, ran2)) =>
adamc@623	1334 (unifyKinds env dom1 dom2;
adamc@628	1335 unifyKinds env ran1 ran2)
adamc@623	1336
adamc@623	1337 \| (L'.CKAbs (x, c1), L'.CKAbs (_, c2)) =>
adamc@987	1338 unifyCons' (E.pushKRel env x) loc c1 c2
adamc@623	1339 \| (L'.CKApp (c1, k1), L'.CKApp (c2, k2)) =>
adamc@623	1340 (unifyKinds env k1 k2;
adamc@987	1341 unifyCons' env loc c1 c2)
adamc@623	1342 \| (L'.TKFun (x, c1), L'.TKFun (_, c2)) =>
adamc@987	1343 unifyCons' (E.pushKRel env x) loc c1 c2
adamc@628	1344
adam@1668	1345 \| _ => err CIncompatible)(*;
adam@1668	1346 eprefaces "/unifyCons''" [("c1", p_con env c1All),
adam@1668	1347 ("c2", p_con env c2All)]*)
adamc@403	1348 end
adamc@403	1349
adamc@987	1350 and unifyCons env loc c1 c2 =
adamc@987	1351 unifyCons' env loc c1 c2
adam@1719	1352 handle CUnify' (env', err) => raise CUnify (c1, c2, env', err)
adam@1719	1353 \| KUnify (arg as {3 = env', ...}) => raise CUnify (c1, c2, env', CKind arg)
adamc@403	1354
adamc@628	1355 fun checkCon env e c1 c2 =
adamc@987	1356 unifyCons env (#2 e) c1 c2
adam@1719	1357 handle CUnify (c1, c2, env', err) =>
adam@1719	1358 expError env (Unify (e, c1, c2, env', err))
adamc@628	1359
adamc@628	1360 fun checkPatCon env p c1 c2 =
adamc@987	1361 unifyCons env (#2 p) c1 c2
adam@1719	1362 handle CUnify (c1, c2, env', err) =>
adam@1719	1363 expError env (PatUnify (p, c1, c2, env', err))
adamc@71	1364
adamc@403	1365 fun primType env p =
adamc@403	1366 case p of
adamc@403	1367 P.Int _ => !int
adamc@403	1368 \| P.Float _ => !float
adamc@403	1369 \| P.String _ => !string
adamc@821	1370 \| P.Char _ => !char
adamc@623	1371
adamc@403	1372 datatype constraint =
adamc@403	1373 Disjoint of D.goal
adamc@403	1374 \| TypeClass of E.env * L'.con * L'.exp option ref * ErrorMsg.span
adamc@403	1375
adam@1591	1376 fun relocConstraint loc c =
adam@1591	1377 case c of
adam@1591	1378 Disjoint (_, a, b, c, d) => Disjoint (loc, a, b, c, d)
adam@1591	1379 \| TypeClass (a, b, c, _) => TypeClass (a, b, c, loc)
adam@1591	1380
adamc@403	1381 val enD = map Disjoint
adamc@403	1382
adamc@634	1383 fun isClassOrFolder env cl =
adamc@634	1384 E.isClass env cl
adamc@634	1385 orelse case hnormCon env cl of
adamc@634	1386 (L'.CKApp (cl, _), _) =>
adamc@634	1387 (case hnormCon env cl of
adamc@634	1388 (L'.CModProj (top_n, [], "folder"), _) => top_n = !top_r
adamc@634	1389 \| _ => false)
adamc@634	1390 \| _ => false
adamc@634	1391
adam@1303	1392 fun subConInCon env x y =
adam@1303	1393 ElabOps.subConInCon x y
adam@1303	1394 handle SubUnif => (cunifyError env (TooUnify (#2 x, y));
adam@1303	1395 cerror)
adam@1303	1396
adamc@629	1397 fun elabHead (env, denv) infer (e as (_, loc)) t =
adamc@403	1398 let
adamc@898	1399 fun unravelKind (t, e) =
adamc@898	1400 case hnormCon env t of
adamc@898	1401 (L'.TKFun (x, t'), _) =>
adamc@898	1402 let
adam@1639	1403 val u = kunif env loc
adamc@898	1404
adamc@898	1405 val t'' = subKindInCon (0, u) t'
adamc@898	1406 in
adamc@898	1407 unravelKind (t'', (L'.EKApp (e, u), loc))
adamc@898	1408 end
adamc@898	1409 \| t => (e, t, [])
adamc@898	1410
adamc@403	1411 fun unravel (t, e) =
adamc@628	1412 case hnormCon env t of
adamc@628	1413 (L'.TKFun (x, t'), _) =>
adamc@628	1414 let
adam@1639	1415 val u = kunif env loc
adamc@628	1416
adamc@628	1417 val t'' = subKindInCon (0, u) t'
adamc@628	1418 in
adamc@628	1419 unravel (t'', (L'.EKApp (e, u), loc))
adamc@628	1420 end
adamc@628	1421 \| (L'.TCFun (L'.Implicit, x, k, t'), _) =>
adamc@628	1422 let
adam@1639	1423 val u = cunif env (loc, k)
adamc@628	1424
adam@1303	1425 val t'' = subConInCon env (0, u) t'
adamc@628	1426 in
adamc@628	1427 unravel (t'', (L'.ECApp (e, u), loc))
adamc@628	1428 end
adamc@633	1429 \| (L'.TFun (dom, ran), _) =>
adamc@628	1430 let
adamc@633	1431 fun default () = (e, t, [])
adamc@750	1432
adamc@750	1433 fun isInstance () =
adamc@750	1434 if infer <> L.TypesOnly then
adamc@750	1435 let
adamc@750	1436 val r = ref NONE
adamc@750	1437 val (e, t, gs) = unravel (ran, (L'.EApp (e, (L'.EUnif r, loc)), loc))
adamc@750	1438 in
adamc@750	1439 (e, t, TypeClass (env, dom, r, loc) :: gs)
adamc@750	1440 end
adamc@750	1441 else
adamc@750	1442 default ()
adamc@750	1443
adamc@750	1444 fun hasInstance c =
adamc@753	1445 case hnormCon env c of
adamc@753	1446 (L'.TRecord c, _) => U.Con.exists {kind = fn _ => false,
adamc@753	1447 con = fn c =>
adam@1767	1448 isClassOrFolder env (hnormCon env (c, loc))} c
adamc@753	1449 \| c =>
adamc@750	1450 let
adamc@753	1451 fun findHead c =
adamc@753	1452 case #1 c of
adamc@753	1453 L'.CApp (f, _) => findHead f
adamc@753	1454 \| _ => c
adamc@753	1455
adamc@753	1456 val cl = hnormCon env (findHead c)
adamc@750	1457 in
adamc@750	1458 isClassOrFolder env cl
adamc@750	1459 end
adamc@628	1460 in
adamc@750	1461 if hasInstance dom then
adamc@750	1462 isInstance ()
adamc@750	1463 else
adamc@750	1464 default ()
adamc@628	1465 end
adamc@629	1466 \| (L'.TDisjoint (r1, r2, t'), loc) =>
adamc@629	1467 if infer <> L.TypesOnly then
adamc@629	1468 let
adamc@792	1469 val gs = D.prove env denv (r1, r2, #2 e)
adamc@629	1470 val (e, t, gs') = unravel (t', e)
adamc@629	1471 in
adamc@629	1472 (e, t, enD gs @ gs')
adamc@629	1473 end
adamc@629	1474 else
adamc@629	1475 (e, t, [])
adamc@628	1476 \| t => (e, t, [])
adam@1591	1477
adam@1591	1478 val (e, t, gs) = case infer of
adam@1591	1479 L.DontInfer => unravelKind (t, e)
adam@1591	1480 \| _ => unravel (t, e)
adamc@704	1481 in
adam@1591	1482 ((#1 e, loc), (#1 t, loc), map (relocConstraint loc) gs)
adamc@704	1483 end
adamc@15	1484
adamc@628	1485 fun elabPat (pAll as (p, loc), (env, bound)) =
adamc@171	1486 let
adamc@171	1487 val perror = (L'.PWild, loc)
adamc@171	1488 val terror = (L'.CError, loc)
adamc@171	1489 val pterror = (perror, terror)
adamc@171	1490 val rerror = (pterror, (env, bound))
adamc@171	1491
adamc@191	1492 fun pcon (pc, po, xs, to, dn, dk) =
adamc@188	1493 case (po, to) of
adamc@188	1494 (NONE, SOME _) => (expError env (PatHasNoArg loc);
adamc@188	1495 rerror)
adamc@188	1496 \| (SOME _, NONE) => (expError env (PatHasArg loc);
adamc@188	1497 rerror)
adamc@191	1498 \| (NONE, NONE) =>
adamc@191	1499 let
adamc@191	1500 val k = (L'.KType, loc)
adam@1639	1501 val unifs = map (fn _ => cunif env (loc, k)) xs
adamc@191	1502 val dn = foldl (fn (u, dn) => (L'.CApp (dn, u), loc)) dn unifs
adamc@191	1503 in
adamc@191	1504 (((L'.PCon (dk, pc, unifs, NONE), loc), dn),
adamc@191	1505 (env, bound))
adamc@191	1506 end
adamc@188	1507 \| (SOME p, SOME t) =>
adamc@188	1508 let
adamc@628	1509 val ((p', pt), (env, bound)) = elabPat (p, (env, bound))
adamc@191	1510
adamc@191	1511 val k = (L'.KType, loc)
adam@1639	1512 val unifs = map (fn _ => cunif env (loc, k)) xs
adamc@194	1513 val nxs = length unifs - 1
adam@1304	1514 val t = ListUtil.foldli (fn (i, u, t) => subConInCon env (nxs - i,
adam@1304	1515 E.mliftConInCon (nxs - i) u) t) t unifs
adamc@191	1516 val dn = foldl (fn (u, dn) => (L'.CApp (dn, u), loc)) dn unifs
adamc@188	1517 in
adamc@628	1518 ignore (checkPatCon env p' pt t);
adamc@191	1519 (((L'.PCon (dk, pc, unifs, SOME p'), loc), dn),
adamc@188	1520 (env, bound))
adamc@188	1521 end
adamc@171	1522 in
adamc@171	1523 case p of
adam@1639	1524 L.PWild => (((L'.PWild, loc), cunif env (loc, (L'.KType, loc))),
adamc@171	1525 (env, bound))
adamc@171	1526 \| L.PVar x =>
adamc@171	1527 let
adamc@171	1528 val t = if SS.member (bound, x) then
adamc@171	1529 (expError env (DuplicatePatternVariable (loc, x));
adamc@171	1530 terror)
adamc@171	1531 else
adam@1639	1532 cunif env (loc, (L'.KType, loc))
adamc@171	1533 in
adamc@182	1534 (((L'.PVar (x, t), loc), t),
adamc@171	1535 (E.pushERel env x t, SS.add (bound, x)))
adamc@171	1536 end
adamc@173	1537 \| L.PPrim p => (((L'.PPrim p, loc), primType env p),
adamc@173	1538 (env, bound))
adamc@171	1539 \| L.PCon ([], x, po) =>
adamc@171	1540 (case E.lookupConstructor env x of
adamc@174	1541 NONE => (expError env (UnboundConstructor (loc, [], x));
adamc@171	1542 rerror)
adamc@191	1543 \| SOME (dk, n, xs, to, dn) => pcon (L'.PConVar n, po, xs, to, (L'.CNamed dn, loc), dk))
adamc@174	1544 \| L.PCon (m1 :: ms, x, po) =>
adamc@174	1545 (case E.lookupStr env m1 of
adamc@174	1546 NONE => (expError env (UnboundStrInExp (loc, m1));
adamc@174	1547 rerror)
adamc@174	1548 \| SOME (n, sgn) =>
adamc@174	1549 let
adamc@174	1550 val (str, sgn) = foldl (fn (m, (str, sgn)) =>
adamc@174	1551 case E.projectStr env {sgn = sgn, str = str, field = m} of
adamc@182	1552 NONE => raise Fail "elabPat: Unknown substructure"
adamc@174	1553 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adamc@174	1554 ((L'.StrVar n, loc), sgn) ms
adamc@174	1555 in
adamc@174	1556 case E.projectConstructor env {str = str, sgn = sgn, field = x} of
adamc@174	1557 NONE => (expError env (UnboundConstructor (loc, m1 :: ms, x));
adamc@174	1558 rerror)
adamc@191	1559 \| SOME (dk, _, xs, to, dn) => pcon (L'.PConProj (n, ms, x), po, xs, to, dn, dk)
adamc@174	1560 end)
adamc@174	1561
adamc@175	1562 \| L.PRecord (xps, flex) =>
adamc@175	1563 let
adamc@175	1564 val (xpts, (env, bound, _)) =
adamc@175	1565 ListUtil.foldlMap (fn ((x, p), (env, bound, fbound)) =>
adamc@175	1566 let
adamc@628	1567 val ((p', t), (env, bound)) = elabPat (p, (env, bound))
adamc@175	1568 in
adamc@175	1569 if SS.member (fbound, x) then
adamc@175	1570 expError env (DuplicatePatField (loc, x))
adamc@175	1571 else
adamc@175	1572 ();
adamc@175	1573 ((x, p', t), (env, bound, SS.add (fbound, x)))
adamc@175	1574 end)
adamc@175	1575 (env, bound, SS.empty) xps
adamc@175	1576
adamc@175	1577 val k = (L'.KType, loc)
adamc@175	1578 val c = (L'.CRecord (k, map (fn (x, _, t) => ((L'.CName x, loc), t)) xpts), loc)
adamc@176	1579 val c =
adamc@175	1580 if flex then
adam@1639	1581 (L'.CConcat (c, cunif env (loc, (L'.KRecord k, loc))), loc)
adamc@175	1582 else
adamc@176	1583 c
adamc@175	1584 in
adamc@182	1585 (((L'.PRecord xpts, loc),
adamc@175	1586 (L'.TRecord c, loc)),
adamc@175	1587 (env, bound))
adamc@175	1588 end
adamc@822	1589
adamc@822	1590 \| L.PAnnot (p, t) =>
adamc@822	1591 let
adamc@822	1592 val ((p', pt), (env, bound)) = elabPat (p, (env, bound))
adamc@822	1593 val (t', k, _) = elabCon (env, D.empty) t
adamc@822	1594 in
adamc@822	1595 checkPatCon env p' pt t';
adamc@822	1596 ((p', t'), (env, bound))
adamc@822	1597 end
adamc@171	1598 end
adamc@171	1599
adamc@819	1600 (* This exhaustiveness checking follows Luc Maranget's paper "Warnings for pattern matching." *)
adamc@819	1601 fun exhaustive (env, t, ps, loc) =
adamc@819	1602 let
adamc@819	1603 fun fail n = raise Fail ("Elaborate.exhaustive: Impossible " ^ Int.toString n)
adamc@819	1604
adamc@819	1605 fun patConNum pc =
adamc@819	1606 case pc of
adamc@819	1607 L'.PConVar n => n
adamc@819	1608 \| L'.PConProj (m1, ms, x) =>
adamc@819	1609 let
adamc@819	1610 val (str, sgn) = E.chaseMpath env (m1, ms)
adamc@819	1611 in
adamc@819	1612 case E.projectConstructor env {str = str, sgn = sgn, field = x} of
adamc@819	1613 NONE => raise Fail "exhaustive: Can't project datatype"
adamc@819	1614 \| SOME (_, n, _, _, _) => n
adamc@819	1615 end
adamc@819	1616
adamc@819	1617 fun nameOfNum (t, n) =
adamc@819	1618 case t of
adamc@819	1619 L'.CModProj (m1, ms, x) =>
adamc@819	1620 let
adamc@819	1621 val (str, sgn) = E.chaseMpath env (m1, ms)
adamc@819	1622 in
adamc@819	1623 case E.projectDatatype env {str = str, sgn = sgn, field = x} of
adamc@819	1624 NONE => raise Fail "exhaustive: Can't project datatype"
adamc@819	1625 \| SOME (_, cons) =>
adamc@819	1626 case ListUtil.search (fn (name, n', _) =>
adamc@819	1627 if n' = n then
adamc@819	1628 SOME name
adamc@819	1629 else
adamc@819	1630 NONE) cons of
adamc@819	1631 NONE => fail 9
adamc@819	1632 \| SOME name => L'.PConProj (m1, ms, name)
adamc@819	1633 end
adamc@819	1634 \| _ => L'.PConVar n
adamc@819	1635
adamc@819	1636 fun S (args, c, P) =
adamc@819	1637 List.mapPartial
adamc@819	1638 (fn [] => fail 1
adamc@819	1639 \| p1 :: ps =>
adamc@819	1640 let
adamc@819	1641 val loc = #2 p1
adamc@819	1642
adamc@819	1643 fun wild () =
adamc@819	1644 SOME (map (fn _ => (L'.PWild, loc)) args @ ps)
adamc@819	1645 in
adamc@819	1646 case #1 p1 of
adamc@819	1647 L'.PPrim _ => NONE
adamc@819	1648 \| L'.PCon (_, c', _, NONE) =>
adamc@819	1649 if patConNum c' = c then
adamc@819	1650 SOME ps
adamc@819	1651 else
adamc@819	1652 NONE
adamc@819	1653 \| L'.PCon (_, c', _, SOME p) =>
adamc@819	1654 if patConNum c' = c then
adamc@819	1655 SOME (p :: ps)
adamc@819	1656 else
adamc@819	1657 NONE
adamc@819	1658 \| L'.PRecord xpts =>
adamc@819	1659 SOME (map (fn x =>
adamc@819	1660 case ListUtil.search (fn (x', p, _) =>
adamc@819	1661 if x = x' then
adamc@819	1662 SOME p
adamc@819	1663 else
adamc@819	1664 NONE) xpts of
adamc@819	1665 NONE => (L'.PWild, loc)
adamc@819	1666 \| SOME p => p) args @ ps)
adamc@819	1667 \| L'.PWild => wild ()
adamc@819	1668 \| L'.PVar _ => wild ()
adamc@819	1669 end)
adamc@819	1670 P
adamc@819	1671
adamc@819	1672 fun D P =
adamc@819	1673 List.mapPartial
adamc@819	1674 (fn [] => fail 2
adamc@819	1675 \| (p1, _) :: ps =>
adamc@819	1676 case p1 of
adamc@819	1677 L'.PWild => SOME ps
adamc@819	1678 \| L'.PVar _ => SOME ps
adamc@819	1679 \| L'.PPrim _ => NONE
adamc@819	1680 \| L'.PCon _ => NONE
adamc@819	1681 \| L'.PRecord _ => NONE)
adamc@819	1682 P
adamc@819	1683
adamc@819	1684 fun I (P, q) =
adamc@819	1685 (*(prefaces "I" [("P", p_list (fn P' => box [PD.string "[", p_list (p_pat env) P', PD.string "]"]) P),
adamc@819	1686 ("q", p_list (p_con env) q)];*)
adamc@819	1687 case q of
adamc@819	1688 [] => (case P of
adamc@819	1689 [] => SOME []
adamc@819	1690 \| _ => NONE)
adamc@819	1691 \| q1 :: qs =>
adamc@819	1692 let
adamc@819	1693 val loc = #2 q1
adamc@819	1694
adamc@819	1695 fun unapp (t, acc) =
adamc@830	1696 case #1 t of
adamc@830	1697 L'.CApp (t, arg) => unapp (t, arg :: acc)
adamc@819	1698 \| _ => (t, rev acc)
adamc@819	1699
adamc@830	1700 val (t1, args) = unapp (hnormCon env q1, [])
adamc@830	1701 val t1 = hnormCon env t1
adam@1303	1702 fun doSub t = foldl (fn (arg, t) => subConInCon env (0, arg) t) t args
adamc@819	1703
adamc@819	1704 fun dtype (dtO, names) =
adamc@819	1705 let
adamc@819	1706 val nameSet = IS.addList (IS.empty, names)
adamc@819	1707 val nameSet = foldl (fn (ps, nameSet) =>
adamc@819	1708 case ps of
adamc@819	1709 [] => fail 4
adamc@819	1710 \| (L'.PCon (_, pc, _, _), _) :: _ =>
adamc@819	1711 (IS.delete (nameSet, patConNum pc)
adamc@819	1712 handle NotFound => nameSet)
adamc@819	1713 \| _ => nameSet)
adamc@819	1714 nameSet P
adamc@819	1715 in
adamc@819	1716 nameSet
adamc@819	1717 end
adamc@819	1718
adamc@819	1719 fun default () = (NONE, IS.singleton 0, [])
adamc@819	1720
adamc@819	1721 val (dtO, unused, cons) =
adamc@830	1722 case #1 t1 of
adamc@819	1723 L'.CNamed n =>
adamc@819	1724 let
adamc@819	1725 val dt = E.lookupDatatype env n
adamc@819	1726 val cons = E.constructors dt
adamc@819	1727 in
adamc@819	1728 (SOME dt,
adamc@819	1729 dtype (SOME dt, map #2 cons),
adamc@819	1730 map (fn (_, n, co) =>
adamc@819	1731 (n,
adamc@819	1732 case co of
adamc@819	1733 NONE => []
adamc@819	1734 \| SOME t => [("", doSub t)])) cons)
adamc@819	1735 end
adamc@819	1736 \| L'.CModProj (m1, ms, x) =>
adamc@819	1737 let
adamc@819	1738 val (str, sgn) = E.chaseMpath env (m1, ms)
adamc@819	1739 in
adamc@819	1740 case E.projectDatatype env {str = str, sgn = sgn, field = x} of
adamc@819	1741 NONE => default ()
adamc@819	1742 \| SOME (_, cons) =>
adamc@819	1743 (NONE,
adamc@819	1744 dtype (NONE, map #2 cons),
adamc@819	1745 map (fn (s, _, co) =>
adamc@819	1746 (patConNum (L'.PConProj (m1, ms, s)),
adamc@819	1747 case co of
adamc@819	1748 NONE => []
adamc@819	1749 \| SOME t => [("", doSub t)])) cons)
adamc@819	1750 end
adamc@830	1751 \| L'.TRecord t =>
adamc@830	1752 (case #1 (hnormCon env t) of
adamc@830	1753 L'.CRecord (_, xts) =>
adamc@830	1754 let
adamc@830	1755 val xts = map (fn ((L'.CName x, _), co) => SOME (x, co)
adamc@830	1756 \| _ => NONE) xts
adamc@830	1757 in
adamc@830	1758 if List.all Option.isSome xts then
adamc@830	1759 let
adamc@830	1760 val xts = List.mapPartial (fn x => x) xts
adamc@830	1761 val xts = ListMergeSort.sort (fn ((x1, _), (x2, _)) =>
adamc@830	1762 String.compare (x1, x2) = GREATER) xts
adamc@830	1763 in
adamc@830	1764 (NONE, IS.empty, [(0, xts)])
adamc@830	1765 end
adamc@830	1766 else
adamc@830	1767 default ()
adamc@830	1768 end
adamc@830	1769 \| _ => default ())
adamc@819	1770 \| _ => default ()
adamc@819	1771 in
adamc@819	1772 if IS.isEmpty unused then
adamc@819	1773 let
adamc@819	1774 fun recurse cons =
adamc@819	1775 case cons of
adamc@819	1776 [] => NONE
adamc@819	1777 \| (name, args) :: cons =>
adamc@819	1778 case I (S (map #1 args, name, P),
adamc@819	1779 map #2 args @ qs) of
adamc@819	1780 NONE => recurse cons
adamc@819	1781 \| SOME ps =>
adamc@819	1782 let
adamc@819	1783 val nargs = length args
adamc@819	1784 val argPs = List.take (ps, nargs)
adamc@819	1785 val restPs = List.drop (ps, nargs)
adamc@819	1786
adamc@819	1787 val p = case name of
adamc@819	1788 0 => L'.PRecord (ListPair.map
adamc@819	1789 (fn ((name, t), p) => (name, p, t))
adamc@819	1790 (args, argPs))
adamc@830	1791 \| _ => L'.PCon (L'.Default, nameOfNum (#1 t1, name), [],
adamc@819	1792 case argPs of
adamc@819	1793 [] => NONE
adamc@819	1794 \| [p] => SOME p
adamc@819	1795 \| _ => fail 3)
adamc@819	1796 in
adamc@819	1797 SOME ((p, loc) :: restPs)
adamc@819	1798 end
adamc@819	1799 in
adamc@819	1800 recurse cons
adamc@819	1801 end
adamc@819	1802 else
adamc@819	1803 case I (D P, qs) of
adamc@819	1804 NONE => NONE
adamc@819	1805 \| SOME ps =>
adamc@819	1806 let
adamc@819	1807 val p = case cons of
adamc@819	1808 [] => L'.PWild
adamc@819	1809 \| (0, _) :: _ => L'.PWild
adamc@819	1810 \| _ =>
adamc@819	1811 case IS.find (fn _ => true) unused of
adamc@819	1812 NONE => fail 6
adamc@819	1813 \| SOME name =>
adamc@819	1814 case ListUtil.search (fn (name', args) =>
adamc@819	1815 if name = name' then
adamc@819	1816 SOME (name', args)
adamc@819	1817 else
adamc@819	1818 NONE) cons of
adamc@819	1819 SOME (n, []) =>
adamc@830	1820 L'.PCon (L'.Default, nameOfNum (#1 t1, n), [], NONE)
adamc@819	1821 \| SOME (n, [_]) =>
adamc@830	1822 L'.PCon (L'.Default, nameOfNum (#1 t1, n), [], SOME (L'.PWild, loc))
adamc@819	1823 \| _ => fail 7
adamc@819	1824 in
adamc@819	1825 SOME ((p, loc) :: ps)
adamc@819	1826 end
adamc@819	1827 end
adamc@819	1828 in
adamc@819	1829 case I (map (fn x => [x]) ps, [t]) of
adamc@819	1830 NONE => NONE
adamc@819	1831 \| SOME [p] => SOME p
adamc@819	1832 \| _ => fail 7
adamc@819	1833 end
adamc@819	1834
adamc@217	1835 fun unmodCon env (c, loc) =
adamc@217	1836 case c of
adamc@217	1837 L'.CNamed n =>
adamc@217	1838 (case E.lookupCNamed env n of
adamc@217	1839 (_, _, SOME (c as (L'.CModProj _, _))) => unmodCon env c
adamc@217	1840 \| _ => (c, loc))
adamc@217	1841 \| L'.CModProj (m1, ms, x) =>
adamc@217	1842 let
adamc@217	1843 val (str, sgn) = E.chaseMpath env (m1, ms)
adamc@217	1844 in
adamc@217	1845 case E.projectCon env {str = str, sgn = sgn, field = x} of
adamc@217	1846 NONE => raise Fail "unmodCon: Can't projectCon"
adamc@217	1847 \| SOME (_, SOME (c as (L'.CModProj _, _))) => unmodCon env c
adamc@217	1848 \| _ => (c, loc)
adamc@217	1849 end
adamc@217	1850 \| _ => (c, loc)
adamc@217	1851
adamc@721	1852 fun normClassKey env c =
adamc@467	1853 let
adamc@721	1854 val c = hnormCon env c
adamc@467	1855 in
adamc@467	1856 case #1 c of
adamc@467	1857 L'.CApp (c1, c2) =>
adamc@467	1858 let
adamc@721	1859 val c1 = normClassKey env c1
adamc@721	1860 val c2 = normClassKey env c2
adamc@467	1861 in
adamc@467	1862 (L'.CApp (c1, c2), #2 c)
adamc@467	1863 end
adamc@721	1864 \| L'.CRecord (k, xcs) => (L'.CRecord (k, map (fn (x, c) => (normClassKey env x,
adamc@721	1865 normClassKey env c)) xcs), #2 c)
adamc@721	1866 \| _ => unmodCon env c
adamc@467	1867 end
adamc@467	1868
adamc@467	1869 fun normClassConstraint env (c, loc) =
adamc@217	1870 case c of
adamc@217	1871 L'.CApp (f, x) =>
adamc@217	1872 let
adamc@721	1873 val f = normClassKey env f
adamc@467	1874 val x = normClassKey env x
adamc@217	1875 in
adamc@467	1876 (L'.CApp (f, x), loc)
adamc@217	1877 end
adamc@674	1878 \| L'.TFun (c1, c2) =>
adamc@674	1879 let
adamc@674	1880 val c1 = normClassConstraint env c1
adamc@674	1881 val c2 = normClassConstraint env c2
adamc@674	1882 in
adamc@674	1883 (L'.TFun (c1, c2), loc)
adamc@674	1884 end
adamc@674	1885 \| L'.TCFun (expl, x, k, c1) => (L'.TCFun (expl, x, k, normClassConstraint env c1), loc)
adam@1639	1886 \| L'.CUnif (nl, _, _, _, ref (L'.Known c)) => normClassConstraint env (E.mliftConInCon nl c)
adamc@721	1887 \| _ => unmodCon env (c, loc)
adamc@216	1888
adamc@1093	1889 fun findHead e e' =
adamc@1093	1890 let
adamc@1093	1891 fun findHead (e, _) =
adamc@1093	1892 case e of
adamc@1093	1893 L.EVar (_, _, infer) =>
adamc@1093	1894 let
adamc@1093	1895 fun findHead' (e, _) =
adamc@1093	1896 case e of
adamc@1093	1897 L'.ENamed _ => true
adamc@1093	1898 \| L'.EModProj _ => true
adam@1472	1899 \| L'.ERel _ => true
adamc@1093	1900 \| L'.EApp (e, _) => findHead' e
adamc@1093	1901 \| L'.ECApp (e, _) => findHead' e
adamc@1093	1902 \| L'.EKApp (e, _) => findHead' e
adamc@1093	1903 \| _ => false
adamc@1093	1904 in
adamc@1093	1905 if findHead' e' then
adamc@1093	1906 SOME infer
adamc@1093	1907 else
adamc@1093	1908 NONE
adamc@1093	1909 end
adamc@1093	1910 \| L.EApp (e, _) => findHead e
adamc@1093	1911 \| L.ECApp (e, _) => findHead e
adamc@1093	1912 \| L.EDisjointApp e => findHead e
adamc@1093	1913 \| _ => NONE
adamc@1093	1914 in
adamc@1093	1915 findHead e
adamc@1093	1916 end
adamc@1093	1917
adam@1640	1918 datatype needed = Needed of {Cons : (L'.kind * int) SM.map,
adam@1640	1919 NextCon : int,
adamc@1264	1920 Constraints : (E.env * (L'.con * L'.con) * ErrorMsg.span) list,
adamc@1264	1921 Vals : SS.set,
adamc@1270	1922 Mods : (E.env * needed) SM.map}
adamc@1264	1923
adam@1640	1924 fun ncons (Needed r) = map (fn (k, (v, _)) => (k, v))
adam@1640	1925 (ListMergeSort.sort (fn ((_, (_, n1)), (_, (_, n2))) => n1 > n2)
adam@1640	1926 (SM.listItemsi (#Cons r)))
adamc@1264	1927 fun nconstraints (Needed r) = #Constraints r
adamc@1264	1928 fun nvals (Needed r) = #Vals r
adamc@1264	1929 fun nmods (Needed r) = #Mods r
adamc@1264	1930
adamc@1264	1931 val nempty = Needed {Cons = SM.empty,
adam@1640	1932 NextCon = 0,
adamc@1264	1933 Constraints = nil,
adamc@1264	1934 Vals = SS.empty,
adamc@1264	1935 Mods = SM.empty}
adamc@1264	1936
adamc@1264	1937 fun naddCon (r : needed, k, v) =
adamc@1264	1938 let
adamc@1264	1939 val Needed r = r
adamc@1264	1940 in
adam@1640	1941 Needed {Cons = SM.insert (#Cons r, k, (v, #NextCon r)),
adam@1640	1942 NextCon = #NextCon r + 1,
adamc@1264	1943 Constraints = #Constraints r,
adamc@1264	1944 Vals = #Vals r,
adamc@1264	1945 Mods = #Mods r}
adamc@1264	1946 end
adamc@1264	1947
adamc@1264	1948 fun naddConstraint (r : needed, v) =
adamc@1264	1949 let
adamc@1264	1950 val Needed r = r
adamc@1264	1951 in
adamc@1264	1952 Needed {Cons = #Cons r,
adam@1640	1953 NextCon = #NextCon r,
adamc@1264	1954 Constraints = v :: #Constraints r,
adamc@1264	1955 Vals = #Vals r,
adamc@1264	1956 Mods = #Mods r}
adamc@1264	1957 end
adamc@1264	1958
adamc@1264	1959 fun naddVal (r : needed, k) =
adamc@1264	1960 let
adamc@1264	1961 val Needed r = r
adamc@1264	1962 in
adamc@1264	1963 Needed {Cons = #Cons r,
adam@1640	1964 NextCon = #NextCon r,
adamc@1264	1965 Constraints = #Constraints r,
adamc@1264	1966 Vals = SS.add (#Vals r, k),
adamc@1264	1967 Mods = #Mods r}
adamc@1264	1968 end
adamc@1264	1969
adamc@1264	1970 fun naddMod (r : needed, k, v) =
adamc@1264	1971 let
adamc@1264	1972 val Needed r = r
adamc@1264	1973 in
adamc@1264	1974 Needed {Cons = #Cons r,
adam@1640	1975 NextCon = #NextCon r,
adamc@1264	1976 Constraints = #Constraints r,
adamc@1264	1977 Vals = #Vals r,
adamc@1264	1978 Mods = SM.insert (#Mods r, k, v)}
adamc@1264	1979 end
adamc@1264	1980
adamc@1264	1981 fun ndelCon (r : needed, k) =
adamc@1264	1982 let
adamc@1264	1983 val Needed r = r
adamc@1264	1984 in
adamc@1264	1985 Needed {Cons = #1 (SM.remove (#Cons r, k)) handle NotFound => #Cons r,
adam@1640	1986 NextCon = #NextCon r,
adamc@1264	1987 Constraints = #Constraints r,
adamc@1264	1988 Vals = #Vals r,
adamc@1264	1989 Mods = #Mods r}
adamc@1264	1990 end
adamc@1264	1991
adamc@1264	1992 fun ndelVal (r : needed, k) =
adamc@1264	1993 let
adamc@1264	1994 val Needed r = r
adamc@1264	1995 in
adamc@1264	1996 Needed {Cons = #Cons r,
adam@1640	1997 NextCon = #NextCon r,
adamc@1264	1998 Constraints = #Constraints r,
adamc@1264	1999 Vals = SS.delete (#Vals r, k) handle NotFound => #Vals r,
adamc@1264	2000 Mods = #Mods r}
adamc@1264	2001 end
adamc@1264	2002
adam@1591	2003 fun chaseUnifs c =
adam@1591	2004 case #1 c of
adam@1639	2005 L'.CUnif (_, _, _, _, ref (L'.Known c)) => chaseUnifs c
adam@1591	2006 \| _ => c
adam@1591	2007
adamc@92	2008 fun elabExp (env, denv) (eAll as (e, loc)) =
adamc@91	2009 let
adamc@848	2010 (val () = eprefaces "elabExp" [("eAll", SourcePrint.p_exp eAll)])
adamc@514	2011 (val befor = Time.now ())
adamc@280	2012
adamc@280	2013 val r = case e of
adamc@91	2014 L.EAnnot (e, t) =>
adamc@91	2015 let
adamc@91	2016 val (e', et, gs1) = elabExp (env, denv) e
adamc@91	2017 val (t', _, gs2) = elabCon (env, denv) t
adamc@91	2018 in
adamc@628	2019 checkCon env e' et t';
adamc@628	2020 (e', t', gs1 @ enD gs2)
adamc@91	2021 end
adamc@34	2022
adamc@91	2023 \| L.EPrim p => ((L'.EPrim p, loc), primType env p, [])
adamc@403	2024 \| L.EVar ([], s, infer) =>
adamc@91	2025 (case E.lookupE env s of
adamc@91	2026 E.NotBound =>
adamc@91	2027 (expError env (UnboundExp (loc, s));
adamc@91	2028 (eerror, cerror, []))
adamc@629	2029 \| E.Rel (n, t) => elabHead (env, denv) infer (L'.ERel n, loc) t
adamc@629	2030 \| E.Named (n, t) => elabHead (env, denv) infer (L'.ENamed n, loc) t)
adamc@403	2031 \| L.EVar (m1 :: ms, s, infer) =>
adamc@91	2032 (case E.lookupStr env m1 of
adamc@91	2033 NONE => (expError env (UnboundStrInExp (loc, m1));
adamc@91	2034 (eerror, cerror, []))
adamc@91	2035 \| SOME (n, sgn) =>
adamc@91	2036 let
adamc@91	2037 val (str, sgn) = foldl (fn (m, (str, sgn)) =>
adamc@91	2038 case E.projectStr env {sgn = sgn, str = str, field = m} of
adamc@91	2039 NONE => (conError env (UnboundStrInCon (loc, m));
adamc@91	2040 (strerror, sgnerror))
adamc@91	2041 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adamc@91	2042 ((L'.StrVar n, loc), sgn) ms
adamc@10	2043
adamc@91	2044 val t = case E.projectVal env {sgn = sgn, str = str, field = s} of
adamc@91	2045 NONE => (expError env (UnboundExp (loc, s));
adamc@91	2046 cerror)
adamc@91	2047 \| SOME t => t
adamc@91	2048 in
adamc@629	2049 elabHead (env, denv) infer (L'.EModProj (n, ms, s), loc) t
adamc@91	2050 end)
adamc@86	2051
adamc@349	2052 \| L.EWild =>
adamc@210	2053 let
adamc@349	2054 val r = ref NONE
adam@1639	2055 val c = cunif env (loc, (L'.KType, loc))
adamc@210	2056 in
adamc@349	2057 ((L'.EUnif r, loc), c, [TypeClass (env, c, r, loc)])
adamc@210	2058 end
adamc@210	2059
adamc@91	2060 \| L.EApp (e1, e2) =>
adamc@91	2061 let
adamc@91	2062 val (e1', t1, gs1) = elabExp (env, denv) e1
adamc@1093	2063
adamc@403	2064 val (e2', t2, gs2) = elabExp (env, denv) e2
adamc@71	2065
adam@1639	2066 val dom = cunif env (loc, ktype)
adam@1639	2067 val ran = cunif env (loc, ktype)
adamc@838	2068 val t = (L'.TFun (dom, ran), loc)
adamc@1093	2069
adamc@1093	2070 val () = checkCon env e1' t1 t
adamc@1093	2071 val () = checkCon env e2' t2 dom
adamc@1093	2072
adamc@1093	2073 val ef = (L'.EApp (e1', e2'), loc)
adamc@1093	2074 val (ef, et, gs3) =
adamc@1093	2075 case findHead e1 e1' of
adam@1591	2076 NONE => (ef, (#1 (chaseUnifs ran), loc), [])
adamc@1093	2077 \| SOME infer => elabHead (env, denv) infer ef ran
adamc@91	2078 in
adamc@1093	2079 (ef, et, gs1 @ gs2 @ gs3)
adamc@91	2080 end
adamc@91	2081 \| L.EAbs (x, to, e) =>
adamc@91	2082 let
adamc@91	2083 val (t', gs1) = case to of
adam@1639	2084 NONE => (cunif env (loc, ktype), [])
adamc@91	2085 \| SOME t =>
adamc@91	2086 let
adamc@91	2087 val (t', tk, gs) = elabCon (env, denv) t
adamc@91	2088 in
adamc@91	2089 checkKind env t' tk ktype;
adamc@91	2090 (t', gs)
adamc@91	2091 end
adamc@467	2092 val dom = normClassConstraint env t'
adamc@467	2093 val (e', et, gs2) = elabExp (E.pushERel env x dom, denv) e
adamc@91	2094 in
adamc@91	2095 ((L'.EAbs (x, t', et, e'), loc),
adamc@91	2096 (L'.TFun (t', et), loc),
adamc@467	2097 enD gs1 @ gs2)
adamc@91	2098 end
adamc@91	2099 \| L.ECApp (e, c) =>
adamc@91	2100 let
adamc@91	2101 val (e', et, gs1) = elabExp (env, denv) e
adamc@1093	2102
adamc@328	2103 val oldEt = et
adamc@403	2104 val (c', ck, gs2) = elabCon (env, denv) c
adamc@628	2105 val (et', _) = hnormCon env et
adamc@91	2106 in
adamc@91	2107 case et' of
adamc@91	2108 L'.CError => (eerror, cerror, [])
adamc@328	2109 \| L'.TCFun (_, x, k, eb) =>
adamc@91	2110 let
adamc@91	2111 val () = checkKind env c' ck k
adam@1303	2112 val eb' = subConInCon env (0, c') eb
adamc@1093	2113
adamc@1093	2114 val ef = (L'.ECApp (e', c'), loc)
adamc@1093	2115 val (ef, eb', gs3) =
adamc@1093	2116 case findHead e e' of
adamc@1093	2117 NONE => (ef, eb', [])
adamc@1093	2118 \| SOME infer => elabHead (env, denv) infer ef eb'
adamc@91	2119 in
adamc@328	2120 (*prefaces "Elab ECApp" [("e", SourcePrint.p_exp eAll),
adamc@328	2121 ("et", p_con env oldEt),
adamc@328	2122 ("x", PD.string x),
adamc@328	2123 ("eb", p_con (E.pushCRel env x k) eb),
adamc@328	2124 ("c", p_con env c'),
adamc@328	2125 ("eb'", p_con env eb')];*)
adam@1591	2126 (ef, (#1 eb', loc), gs1 @ enD gs2 @ gs3)
adamc@91	2127 end
adamc@91	2128
adamc@91	2129 \| _ =>
adamc@91	2130 (expError env (WrongForm ("constructor function", e', et));
adamc@91	2131 (eerror, cerror, []))
adamc@91	2132 end
adamc@91	2133 \| L.ECAbs (expl, x, k, e) =>
adamc@91	2134 let
adamc@91	2135 val expl' = elabExplicitness expl
adamc@623	2136 val k' = elabKind env k
adamc@328	2137
adamc@328	2138 val env' = E.pushCRel env x k'
adamc@328	2139 val (e', et, gs) = elabExp (env', D.enter denv) e
adamc@91	2140 in
adamc@91	2141 ((L'.ECAbs (expl', x, k', e'), loc),
adamc@91	2142 (L'.TCFun (expl', x, k', et), loc),
adamc@91	2143 gs)
adamc@91	2144 end
adamc@623	2145 \| L.EKAbs (x, e) =>
adamc@623	2146 let
adamc@623	2147 val env' = E.pushKRel env x
adamc@623	2148 val (e', et, gs) = elabExp (env', denv) e
adamc@623	2149 in
adamc@623	2150 ((L'.EKAbs (x, e'), loc),
adamc@623	2151 (L'.TKFun (x, et), loc),
adamc@623	2152 gs)
adamc@623	2153 end
adamc@91	2154
adamc@91	2155 \| L.EDisjoint (c1, c2, e) =>
adamc@91	2156 let
adamc@91	2157 val (c1', k1, gs1) = elabCon (env, denv) c1
adamc@91	2158 val (c2', k2, gs2) = elabCon (env, denv) c2
adamc@91	2159
adam@1639	2160 val ku1 = kunif env loc
adam@1639	2161 val ku2 = kunif env loc
adamc@91	2162
adamc@628	2163 val denv' = D.assert env denv (c1', c2')
adamc@628	2164 val (e', t, gs3) = elabExp (env, denv') e
adamc@91	2165 in
adamc@91	2166 checkKind env c1' k1 (L'.KRecord ku1, loc);
adamc@91	2167 checkKind env c2' k2 (L'.KRecord ku2, loc);
adamc@91	2168
adamc@628	2169 (e', (L'.TDisjoint (c1', c2', t), loc), enD gs1 @ enD gs2 @ gs3)
adamc@91	2170 end
adamc@629	2171 \| L.EDisjointApp e =>
adamc@629	2172 let
adamc@629	2173 val (e', t, gs1) = elabExp (env, denv) e
adamc@629	2174
adam@1639	2175 val k1 = kunif env loc
adam@1639	2176 val c1 = cunif env (loc, (L'.KRecord k1, loc))
adam@1639	2177 val k2 = kunif env loc
adam@1639	2178 val c2 = cunif env (loc, (L'.KRecord k2, loc))
adam@1639	2179 val t' = cunif env (loc, ktype)
adamc@629	2180 val () = checkCon env e' t (L'.TDisjoint (c1, c2, t'), loc)
adamc@629	2181 val gs2 = D.prove env denv (c1, c2, loc)
adamc@629	2182 in
adam@1591	2183 (e', (#1 (chaseUnifs t'), loc), enD gs2 @ gs1)
adamc@629	2184 end
adamc@91	2185
adamc@91	2186 \| L.ERecord xes =>
adamc@91	2187 let
adamc@91	2188 val (xes', gs) = ListUtil.foldlMap (fn ((x, e), gs) =>
adamc@91	2189 let
adamc@91	2190 val (x', xk, gs1) = elabCon (env, denv) x
adamc@91	2191 val (e', et, gs2) = elabExp (env, denv) e
adamc@91	2192 in
adamc@91	2193 checkKind env x' xk kname;
adamc@228	2194 ((x', e', et), enD gs1 @ gs2 @ gs)
adamc@91	2195 end)
adamc@91	2196 [] xes
adamc@91	2197
adamc@91	2198 val k = (L'.KType, loc)
adamc@91	2199
adamc@91	2200 fun prove (xets, gs) =
adamc@91	2201 case xets of
adamc@91	2202 [] => gs
adamc@91	2203 \| (x, _, t) :: rest =>
adamc@91	2204 let
adamc@91	2205 val xc = (x, t)
adamc@91	2206 val r1 = (L'.CRecord (k, [xc]), loc)
adamc@91	2207 val gs = foldl (fn ((x', _, t'), gs) =>
adamc@91	2208 let
adamc@91	2209 val xc' = (x', t')
adamc@91	2210 val r2 = (L'.CRecord (k, [xc']), loc)
adamc@91	2211 in
adamc@91	2212 D.prove env denv (r1, r2, loc) @ gs
adamc@91	2213 end)
adamc@91	2214 gs rest
adamc@91	2215 in
adamc@91	2216 prove (rest, gs)
adamc@91	2217 end
adamc@228	2218
adamc@228	2219 val gsD = List.mapPartial (fn Disjoint d => SOME d \| _ => NONE) gs
adamc@228	2220 val gsO = List.filter (fn Disjoint _ => false \| _ => true) gs
adamc@91	2221 in
adamc@255	2222 (TextIO.print ("\|gsO\| = " ^ Int.toString (length gsO) ^ "\n");)
adamc@91	2223 ((L'.ERecord xes', loc),
adamc@91	2224 (L'.TRecord (L'.CRecord (ktype, map (fn (x', _, et) => (x', et)) xes'), loc), loc),
adamc@228	2225 enD (prove (xes', gsD)) @ gsO)
adamc@91	2226 end
adamc@91	2227
adamc@91	2228 \| L.EField (e, c) =>
adamc@91	2229 let
adamc@91	2230 val (e', et, gs1) = elabExp (env, denv) e
adamc@91	2231 val (c', ck, gs2) = elabCon (env, denv) c
adamc@91	2232
adam@1639	2233 val ft = cunif env (loc, ktype)
adam@1639	2234 val rest = cunif env (loc, ktype_record)
adamc@91	2235 val first = (L'.CRecord (ktype, [(c', ft)]), loc)
adamc@629	2236 val () = checkCon env e' et
adamc@629	2237 (L'.TRecord (L'.CConcat (first, rest), loc), loc);
adamc@628	2238 val gs3 = D.prove env denv (first, rest, loc)
adamc@91	2239 in
adamc@628	2240 ((L'.EField (e', c', {field = ft, rest = rest}), loc), ft, gs1 @ enD gs2 @ enD gs3)
adamc@91	2241 end
adamc@91	2242
adamc@445	2243 \| L.EConcat (e1, e2) =>
adamc@339	2244 let
adamc@339	2245 val (e1', e1t, gs1) = elabExp (env, denv) e1
adamc@445	2246 val (e2', e2t, gs2) = elabExp (env, denv) e2
adamc@445	2247
adam@1639	2248 val r1 = cunif env (loc, ktype_record)
adam@1639	2249 val r2 = cunif env (loc, ktype_record)
adamc@445	2250
adamc@629	2251 val () = checkCon env e1' e1t (L'.TRecord r1, loc)
adamc@629	2252 val () = checkCon env e2' e2t (L'.TRecord r2, loc)
adamc@629	2253
adamc@628	2254 val gs3 = D.prove env denv (r1, r2, loc)
adamc@339	2255 in
adamc@445	2256 ((L'.EConcat (e1', r1, e2', r2), loc),
adamc@445	2257 (L'.TRecord ((L'.CConcat (r1, r2), loc)), loc),
adamc@628	2258 gs1 @ gs2 @ enD gs3)
adamc@339	2259 end
adamc@149	2260 \| L.ECut (e, c) =>
adamc@149	2261 let
adamc@149	2262 val (e', et, gs1) = elabExp (env, denv) e
adamc@149	2263 val (c', ck, gs2) = elabCon (env, denv) c
adamc@149	2264
adam@1639	2265 val ft = cunif env (loc, ktype)
adam@1639	2266 val rest = cunif env (loc, ktype_record)
adamc@149	2267 val first = (L'.CRecord (ktype, [(c', ft)]), loc)
adamc@629	2268
adamc@629	2269 val () = checkCon env e' et
adamc@629	2270 (L'.TRecord (L'.CConcat (first, rest), loc), loc)
adamc@149	2271
adamc@628	2272 val gs3 = D.prove env denv (first, rest, loc)
adamc@149	2273 in
adam@1299	2274 checkKind env c' ck kname;
adamc@228	2275 ((L'.ECut (e', c', {field = ft, rest = rest}), loc), (L'.TRecord rest, loc),
adamc@628	2276 gs1 @ enD gs2 @ enD gs3)
adamc@149	2277 end
adamc@493	2278 \| L.ECutMulti (e, c) =>
adamc@493	2279 let
adamc@493	2280 val (e', et, gs1) = elabExp (env, denv) e
adamc@493	2281 val (c', ck, gs2) = elabCon (env, denv) c
adamc@493	2282
adam@1639	2283 val rest = cunif env (loc, ktype_record)
adamc@629	2284
adamc@629	2285 val () = checkCon env e' et
adamc@629	2286 (L'.TRecord (L'.CConcat (c', rest), loc), loc)
adamc@493	2287
adamc@628	2288 val gs3 = D.prove env denv (c', rest, loc)
adamc@493	2289 in
adam@1299	2290 checkKind env c' ck (L'.KRecord ktype, loc);
adamc@493	2291 ((L'.ECutMulti (e', c', {rest = rest}), loc), (L'.TRecord rest, loc),
adamc@628	2292 gs1 @ enD gs2 @ enD gs3)
adamc@493	2293 end
adamc@149	2294
adamc@171	2295 \| L.ECase (e, pes) =>
adamc@171	2296 let
adamc@171	2297 val (e', et, gs1) = elabExp (env, denv) e
adam@1639	2298 val result = cunif env (loc, (L'.KType, loc))
adamc@171	2299 val (pes', gs) = ListUtil.foldlMap
adamc@171	2300 (fn ((p, e), gs) =>
adamc@171	2301 let
adamc@628	2302 val ((p', pt), (env, _)) = elabPat (p, (env, SS.empty))
adamc@628	2303
adamc@629	2304 val (e', et', gs1) = elabExp (env, denv) e
adamc@171	2305 in
adamc@628	2306 checkPatCon env p' pt et;
adamc@629	2307 checkCon env e' et' result;
adamc@628	2308 ((p', e'), gs1 @ gs)
adamc@171	2309 end)
adamc@171	2310 gs1 pes
adamc@171	2311 in
adamc@819	2312 case exhaustive (env, et, map #1 pes', loc) of
adamc@819	2313 NONE => ()
adamc@830	2314 \| SOME p => if !mayDelay then
adamc@830	2315 delayedExhaustives := (env, et, map #1 pes', loc) :: !delayedExhaustives
adamc@830	2316 else
adamc@830	2317 expError env (Inexhaustive (loc, p));
adamc@172	2318
adamc@628	2319 ((L'.ECase (e', pes', {disc = et, result = result}), loc), result, gs)
adamc@171	2320 end
adamc@447	2321
adamc@447	2322 \| L.ELet (eds, e) =>
adamc@447	2323 let
adamc@447	2324 val (eds, (env, gs1)) = ListUtil.foldlMap (elabEdecl denv) (env, []) eds
adamc@447	2325 val (e, t, gs2) = elabExp (env, denv) e
adamc@447	2326 in
adamc@825	2327 ((L'.ELet (eds, e, t), loc), t, gs1 @ gs2)
adamc@447	2328 end
adamc@280	2329 in
adamc@819	2330 (prefaces "/elabExp" [("e", SourcePrint.p_exp eAll)];)
adamc@280	2331 r
adamc@91	2332 end
adamc@31	2333
adamc@628	2334 and elabEdecl denv (dAll as (d, loc), (env, gs)) =
adamc@447	2335 let
adamc@447	2336 val r =
adamc@447	2337 case d of
adamc@825	2338 L.EDVal (p, e) =>
adamc@447	2339 let
adamc@825	2340 val ((p', pt), (env', _)) = elabPat (p, (env, SS.empty))
adamc@825	2341 val (e', et, gs1) = elabExp (env, denv) e
adamc@825	2342
adamc@825	2343 val () = checkCon env e' et pt
adamc@825	2344
adam@1554	2345 val env' = E.patBinds env p'
adam@1554	2346 (* Redo to get proper detection of type class witnesses *)
adam@1554	2347
adamc@825	2348 val pt = normClassConstraint env pt
adamc@447	2349 in
adamc@830	2350 case exhaustive (env, et, [p'], loc) of
adamc@830	2351 NONE => ()
adamc@830	2352 \| SOME p => if !mayDelay then
adamc@830	2353 delayedExhaustives := (env, et, [p'], loc) :: !delayedExhaustives
adamc@830	2354 else
adamc@830	2355 expError env (Inexhaustive (loc, p));
adamc@830	2356
adamc@825	2357 ((L'.EDVal (p', pt, e'), loc), (env', gs1 @ gs))
adamc@447	2358 end
adamc@447	2359 \| L.EDValRec vis =>
adamc@447	2360 let
adamc@447	2361 fun allowable (e, _) =
adamc@447	2362 case e of
adamc@447	2363 L.EAbs _ => true
adamc@447	2364 \| L.ECAbs (_, _, _, e) => allowable e
adamc@623	2365 \| L.EKAbs (_, e) => allowable e
adamc@447	2366 \| L.EDisjoint (_, _, e) => allowable e
adamc@447	2367 \| _ => false
adamc@447	2368
adamc@447	2369 val (vis, gs) = ListUtil.foldlMap
adamc@447	2370 (fn ((x, co, e), gs) =>
adamc@447	2371 let
adamc@447	2372 val (c', _, gs1) = case co of
adam@1639	2373 NONE => (cunif env (loc, ktype), ktype, [])
adamc@447	2374 \| SOME c => elabCon (env, denv) c
adamc@447	2375 in
adamc@447	2376 ((x, c', e), enD gs1 @ gs)
adamc@447	2377 end) gs vis
adamc@447	2378
adamc@447	2379 val env = foldl (fn ((x, c', _), env) => E.pushERel env x c') env vis
adamc@447	2380
adamc@447	2381 val (vis, gs) = ListUtil.foldlMap (fn ((x, c', e), gs) =>
adamc@447	2382 let
adamc@447	2383 val (e', et, gs1) = elabExp (env, denv) e
adamc@447	2384 in
adamc@628	2385 checkCon env e' et c';
adamc@447	2386 if allowable e then
adamc@447	2387 ()
adamc@447	2388 else
adamc@447	2389 expError env (IllegalRec (x, e'));
adamc@628	2390 ((x, c', e'), gs1 @ gs)
adamc@447	2391 end) gs vis
adamc@447	2392 in
adamc@447	2393 ((L'.EDValRec vis, loc), (env, gs))
adamc@447	2394 end
adamc@447	2395 in
adamc@447	2396 r
adamc@447	2397 end
adamc@447	2398
adamc@42	2399 val hnormSgn = E.hnormSgn
adamc@31	2400
adamc@210	2401 fun tableOf () = (L'.CModProj (!basis_r, [], "sql_table"), ErrorMsg.dummySpan)
adamc@338	2402 fun sequenceOf () = (L'.CModProj (!basis_r, [], "sql_sequence"), ErrorMsg.dummySpan)
adamc@754	2403 fun viewOf () = (L'.CModProj (!basis_r, [], "sql_view"), ErrorMsg.dummySpan)
adamc@754	2404 fun queryOf () = (L'.CModProj (!basis_r, [], "sql_query"), ErrorMsg.dummySpan)
adamc@459	2405 fun cookieOf () = (L'.CModProj (!basis_r, [], "http_cookie"), ErrorMsg.dummySpan)
adamc@718	2406 fun styleOf () = (L'.CModProj (!basis_r, [], "css_class"), ErrorMsg.dummySpan)
adamc@205	2407
adamc@469	2408 fun dopenConstraints (loc, env, denv) {str, strs} =
adamc@469	2409 case E.lookupStr env str of
adamc@469	2410 NONE => (strError env (UnboundStr (loc, str));
adamc@469	2411 denv)
adamc@469	2412 \| SOME (n, sgn) =>
adamc@469	2413 let
adamc@469	2414 val (st, sgn) = foldl (fn (m, (str, sgn)) =>
adamc@469	2415 case E.projectStr env {str = str, sgn = sgn, field = m} of
adamc@469	2416 NONE => (strError env (UnboundStr (loc, m));
adamc@469	2417 (strerror, sgnerror))
adamc@469	2418 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adamc@469	2419 ((L'.StrVar n, loc), sgn) strs
adamc@1030	2420
adamc@1030	2421 fun collect first (st, sgn) =
adamc@1030	2422 case E.projectConstraints env {sgn = sgn, str = st} of
adamc@1182	2423 NONE => []
adamc@1030	2424 \| SOME cs =>
adamc@1030	2425 case #1 (hnormSgn env sgn) of
adamc@1030	2426 L'.SgnConst sgis =>
adamc@1030	2427 foldl (fn (sgi, cs) =>
adamc@1030	2428 case #1 sgi of
adamc@1030	2429 L'.SgiStr (x, _, _) =>
adamc@1030	2430 (case E.projectStr env {sgn = sgn, str = st, field = x} of
adamc@1030	2431 NONE => raise Fail "Elaborate: projectStr in collect"
adamc@1030	2432 \| SOME sgn' =>
adamc@1030	2433 List.revAppend (collect false ((L'.StrProj (st, x), loc), sgn'),
adamc@1030	2434 cs))
adamc@1030	2435 \| _ => cs) cs sgis
adamc@1030	2436 \| _ => cs
adamc@469	2437 in
adamc@1030	2438 foldl (fn ((c1, c2), denv) =>
adamc@1030	2439 D.assert env denv (c1, c2)) denv (collect true (st, sgn))
adamc@469	2440 end
adamc@469	2441
adamc@88	2442 fun elabSgn_item ((sgi, loc), (env, denv, gs)) =
adamc@1270	2443 ((Print.preface ("elabSgi", SourcePrint.p_sgn_item (sgi, loc));)
adamc@1270	2444 case sgi of
adamc@1270	2445 L.SgiConAbs (x, k) =>
adamc@1270	2446 let
adamc@1270	2447 val k' = elabKind env k
adamc@1270	2448
adamc@1270	2449 val (env', n) = E.pushCNamed env x k' NONE
adamc@1270	2450 in
adamc@1270	2451 ([(L'.SgiConAbs (x, n, k'), loc)], (env', denv, gs))
adamc@1270	2452 end
adamc@1270	2453
adamc@1270	2454 \| L.SgiCon (x, ko, c) =>
adamc@1270	2455 let
adamc@1270	2456 val k' = case ko of
adam@1639	2457 NONE => kunif env loc
adamc@1270	2458 \| SOME k => elabKind env k
adamc@1270	2459
adamc@1270	2460 val (c', ck, gs') = elabCon (env, denv) c
adamc@1270	2461 val (env', n) = E.pushCNamed env x k' (SOME c')
adamc@1270	2462 in
adamc@1270	2463 checkKind env c' ck k';
adamc@1270	2464
adamc@1270	2465 ([(L'.SgiCon (x, n, k', c'), loc)], (env', denv, gs' @ gs))
adamc@1270	2466 end
adamc@1270	2467
adamc@1270	2468 \| L.SgiDatatype dts =>
adamc@1270	2469 let
adamc@1270	2470 val k = (L'.KType, loc)
adamc@1270	2471
adamc@1270	2472 val (dts, env) = ListUtil.foldlMap (fn ((x, xs, xcs), env) =>
adamc@1270	2473 let
adamc@1270	2474 val k' = foldl (fn (_, k') => (L'.KArrow (k, k'), loc)) k xs
adamc@1270	2475 val (env, n) = E.pushCNamed env x k' NONE
adamc@1270	2476 in
adamc@1270	2477 ((x, n, xs, xcs), env)
adamc@1270	2478 end)
adamc@1270	2479 env dts
adamc@1270	2480
adamc@1270	2481 val (dts, env) = ListUtil.foldlMap
adamc@1270	2482 (fn ((x, n, xs, xcs), env) =>
adamc@1270	2483 let
adamc@1270	2484 val t = (L'.CNamed n, loc)
adamc@1270	2485 val nxs = length xs - 1
adamc@1270	2486 val t = ListUtil.foldli (fn (i, _, t) =>
adamc@1270	2487 (L'.CApp (t, (L'.CRel (nxs - i), loc)), loc)) t xs
adamc@1270	2488
adamc@1270	2489 val (env', denv') = foldl (fn (x, (env', denv')) =>
adamc@1270	2490 (E.pushCRel env' x k,
adamc@1270	2491 D.enter denv')) (env, denv) xs
adamc@1270	2492
adamc@1270	2493 val (xcs, (used, env, gs)) =
adamc@1270	2494 ListUtil.foldlMap
adamc@1270	2495 (fn ((x, to), (used, env, gs)) =>
adamc@1270	2496 let
adamc@1270	2497 val (to, t, gs') = case to of
adamc@1270	2498 NONE => (NONE, t, gs)
adamc@1270	2499 \| SOME t' =>
adamc@1270	2500 let
adamc@1270	2501 val (t', tk, gs') =
adamc@1270	2502 elabCon (env', denv') t'
adamc@1270	2503 in
adamc@1270	2504 checkKind env' t' tk k;
adamc@1270	2505 (SOME t',
adamc@1270	2506 (L'.TFun (t', t), loc),
adamc@1270	2507 gs' @ gs)
adamc@1270	2508 end
adamc@1270	2509 val t = foldl (fn (x, t) => (L'.TCFun (L'.Implicit, x, k, t), loc))
adamc@1270	2510 t xs
adamc@1270	2511
adamc@1270	2512 val (env, n') = E.pushENamed env x t
adamc@1270	2513 in
adamc@1270	2514 if SS.member (used, x) then
adamc@1270	2515 strError env (DuplicateConstructor (x, loc))
adamc@1270	2516 else
adamc@1270	2517 ();
adamc@1270	2518 ((x, n', to), (SS.add (used, x), env, gs'))
adamc@1270	2519 end)
adamc@1270	2520 (SS.empty, env, []) xcs
adamc@1270	2521 in
adamc@1270	2522 ((x, n, xs, xcs), E.pushDatatype env n xs xcs)
adamc@1270	2523 end)
adamc@1270	2524 env dts
adamc@1270	2525 in
adamc@1270	2526 ([(L'.SgiDatatype dts, loc)], (env, denv, gs))
adamc@1270	2527 end
adamc@1270	2528
adamc@1270	2529 \| L.SgiDatatypeImp (_, [], _) => raise Fail "Empty SgiDatatypeImp"
adamc@1270	2530
adamc@1270	2531 \| L.SgiDatatypeImp (x, m1 :: ms, s) =>
adamc@1270	2532 (case E.lookupStr env m1 of
adamc@1270	2533 NONE => (strError env (UnboundStr (loc, m1));
adamc@1270	2534 ([], (env, denv, gs)))
adamc@1270	2535 \| SOME (n, sgn) =>
adamc@1270	2536 let
adamc@1270	2537 val (str, sgn) = foldl (fn (m, (str, sgn)) =>
adamc@1270	2538 case E.projectStr env {sgn = sgn, str = str, field = m} of
adamc@1270	2539 NONE => (conError env (UnboundStrInCon (loc, m));
adamc@1270	2540 (strerror, sgnerror))
adamc@1270	2541 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adamc@1270	2542 ((L'.StrVar n, loc), sgn) ms
adamc@1270	2543 in
adamc@1270	2544 case hnormCon env (L'.CModProj (n, ms, s), loc) of
adamc@1270	2545 (L'.CModProj (n, ms, s), _) =>
adamc@1270	2546 (case E.projectDatatype env {sgn = sgn, str = str, field = s} of
adamc@1270	2547 NONE => (conError env (UnboundDatatype (loc, s));
adamc@1270	2548 ([], (env, denv, [])))
adamc@1270	2549 \| SOME (xs, xncs) =>
adamc@1270	2550 let
adamc@1270	2551 val k = (L'.KType, loc)
adamc@1270	2552 val k' = foldl (fn (_, k') => (L'.KArrow (k, k'), loc)) k xs
adamc@1270	2553
adamc@1270	2554 val t = (L'.CModProj (n, ms, s), loc)
adamc@1270	2555 val (env, n') = E.pushCNamed env x k' (SOME t)
adamc@1270	2556 val env = E.pushDatatype env n' xs xncs
adamc@1270	2557
adamc@1270	2558 val t = (L'.CNamed n', loc)
adamc@1270	2559 val env = foldl (fn ((x, n, to), env) =>
adamc@805	2560 let
adamc@1270	2561 val t = case to of
adamc@1270	2562 NONE => t
adamc@1270	2563 \| SOME t' => (L'.TFun (t', t), loc)
adamc@1270	2564
adamc@1270	2565 val t = foldr (fn (x, t) =>
adamc@1270	2566 (L'.TCFun (L'.Implicit, x, k, t), loc))
adamc@1270	2567 t xs
adamc@805	2568 in
adamc@1270	2569 E.pushENamedAs env x n t
adamc@1270	2570 end) env xncs
adamc@1270	2571 in
adamc@1270	2572 ([(L'.SgiDatatypeImp (x, n', n, ms, s, xs, xncs), loc)], (env, denv, []))
adamc@1270	2573 end)
adamc@1270	2574 \| _ => (strError env (NotDatatype loc);
adamc@1270	2575 ([], (env, denv, [])))
adamc@1270	2576 end)
adamc@1270	2577
adamc@1270	2578 \| L.SgiVal (x, c) =>
adamc@1270	2579 let
adamc@1270	2580 val (c', ck, gs') = elabCon (env, denv) c
adamc@1270	2581
adamc@1270	2582 val old = c'
adamc@1270	2583 val c' = normClassConstraint env c'
adamc@1270	2584 val (env', n) = E.pushENamed env x c'
adamc@1270	2585 in
adamc@1270	2586 (unifyKinds env ck ktype
adam@1719	2587 handle KUnify arg => strError env (NotType (loc, ck, arg)));
adamc@1270	2588
adamc@1270	2589 ([(L'.SgiVal (x, n, c'), loc)], (env', denv, gs' @ gs))
adamc@1270	2590 end
adamc@1270	2591
adamc@1270	2592 \| L.SgiTable (x, c, pe, ce) =>
adamc@1270	2593 let
adamc@1270	2594 val cstK = (L'.KRecord (L'.KRecord (L'.KUnit, loc), loc), loc)
adamc@1270	2595
adamc@1270	2596 val (c', ck, gs') = elabCon (env, denv) c
adam@1639	2597 val pkey = cunif env (loc, cstK)
adam@1639	2598 val visible = cunif env (loc, cstK)
adam@1886	2599
adam@1886	2600 val x' = x ^ "_hidden_constraints"
adam@1886	2601 val (env', hidden_n) = E.pushCNamed env x' cstK NONE
adam@1886	2602 val hidden = (L'.CNamed hidden_n, loc)
adam@1886	2603
adam@1886	2604 val uniques = (L'.CConcat (visible, hidden), loc)
adamc@1270	2605
adamc@1270	2606 val ct = tableOf ()
adamc@1270	2607 val ct = (L'.CApp (ct, c'), loc)
adamc@1270	2608 val ct = (L'.CApp (ct, (L'.CConcat (pkey, uniques), loc)), loc)
adamc@1270	2609
adamc@1270	2610 val (pe', pet, gs'') = elabExp (env', denv) pe
adamc@1270	2611 val gs'' = List.mapPartial (fn Disjoint x => SOME x
adamc@707	2612 \| _ => NONE) gs''
adamc@707	2613
adamc@1270	2614 val pst = (L'.CModProj (!basis_r, [], "primary_key"), loc)
adamc@1270	2615 val pst = (L'.CApp (pst, c'), loc)
adamc@1270	2616 val pst = (L'.CApp (pst, pkey), loc)
adamc@1270	2617
adamc@1270	2618 val (ce', cet, gs''') = elabExp (env', denv) ce
adamc@1270	2619 val gs''' = List.mapPartial (fn Disjoint x => SOME x
adamc@1270	2620 \| _ => NONE) gs'''
adamc@1270	2621
adamc@1270	2622 val cst = (L'.CModProj (!basis_r, [], "sql_constraints"), loc)
adamc@1270	2623 val cst = (L'.CApp (cst, c'), loc)
adamc@1270	2624 val cst = (L'.CApp (cst, visible), loc)
adam@1886	2625
adam@1886	2626 val (env', n) = E.pushENamed env' x ct
adamc@1270	2627 in
adamc@1270	2628 checkKind env c' ck (L'.KRecord (L'.KType, loc), loc);
adamc@1270	2629 checkCon env' pe' pet pst;
adamc@1270	2630 checkCon env' ce' cet cst;
adamc@1270	2631
adam@1886	2632 ([(L'.SgiConAbs (x', hidden_n, cstK), loc),
adam@1912	2633 (L'.SgiConstraint ((L'.CConcat (pkey, visible), loc), hidden), loc),
adam@1886	2634 (L'.SgiVal (x, n, ct), loc)], (env', denv, gs''' @ gs'' @ gs' @ gs))
adamc@1270	2635 end
adamc@1270	2636
adamc@1270	2637 \| L.SgiStr (x, sgn) =>
adamc@1270	2638 let
adamc@1270	2639 val (sgn', gs') = elabSgn (env, denv) sgn
adamc@1270	2640 val (env', n) = E.pushStrNamed env x sgn'
adam@1864	2641 val denv' = dopenConstraints (loc, env', denv) {str = x, strs = []}
adamc@1270	2642 in
adam@1864	2643 ([(L'.SgiStr (x, n, sgn'), loc)], (env', denv', gs' @ gs))
adamc@1270	2644 end
adamc@1270	2645
adamc@1270	2646 \| L.SgiSgn (x, sgn) =>
adamc@1270	2647 let
adamc@1270	2648 val (sgn', gs') = elabSgn (env, denv) sgn
adamc@1270	2649 val (env', n) = E.pushSgnNamed env x sgn'
adamc@1270	2650 in
adamc@1270	2651 ([(L'.SgiSgn (x, n, sgn'), loc)], (env', denv, gs' @ gs))
adamc@1270	2652 end
adamc@1270	2653
adamc@1270	2654 \| L.SgiInclude sgn =>
adamc@1270	2655 let
adamc@1270	2656 val (sgn', gs') = elabSgn (env, denv) sgn
adamc@1270	2657 in
adamc@1270	2658 case #1 (hnormSgn env sgn') of
adamc@1270	2659 L'.SgnConst sgis =>
adamc@1270	2660 (sgis, (foldl (fn (sgi, env) => E.sgiBinds env sgi) env sgis, denv, gs' @ gs))
adamc@1270	2661 \| _ => (sgnError env (NotIncludable sgn');
adamc@1270	2662 ([], (env, denv, [])))
adamc@1270	2663 end
adamc@1270	2664
adamc@1270	2665 \| L.SgiConstraint (c1, c2) =>
adamc@1270	2666 let
adamc@1270	2667 val (c1', k1, gs1) = elabCon (env, denv) c1
adamc@1270	2668 val (c2', k2, gs2) = elabCon (env, denv) c2
adamc@1270	2669
adamc@1270	2670 val denv = D.assert env denv (c1', c2')
adamc@1270	2671 in
adam@1639	2672 checkKind env c1' k1 (L'.KRecord (kunif env loc), loc);
adam@1639	2673 checkKind env c2' k2 (L'.KRecord (kunif env loc), loc);
adamc@1270	2674
adamc@1270	2675 ([(L'.SgiConstraint (c1', c2'), loc)], (env, denv, gs1 @ gs2))
adamc@1270	2676 end
adamc@1270	2677
adamc@1270	2678 \| L.SgiClassAbs (x, k) =>
adamc@1270	2679 let
adamc@1270	2680 val k = elabKind env k
adamc@1270	2681 val (env, n) = E.pushCNamed env x k NONE
adamc@1270	2682 val env = E.pushClass env n
adamc@1270	2683 in
adamc@1270	2684 ([(L'.SgiClassAbs (x, n, k), loc)], (env, denv, []))
adamc@1270	2685 end
adamc@1270	2686
adamc@1270	2687 \| L.SgiClass (x, k, c) =>
adamc@1270	2688 let
adamc@1270	2689 val k = elabKind env k
adamc@1270	2690 val (c', ck, gs) = elabCon (env, denv) c
adamc@1270	2691 val (env, n) = E.pushCNamed env x k (SOME c')
adamc@1270	2692 val env = E.pushClass env n
adamc@1270	2693 in
adamc@1270	2694 checkKind env c' ck k;
adamc@1270	2695 ([(L'.SgiClass (x, n, k, c'), loc)], (env, denv, []))
adamc@1270	2696 end)
adamc@211	2697
adamc@83	2698 and elabSgn (env, denv) (sgn, loc) =
adamc@31	2699 case sgn of
adamc@31	2700 L.SgnConst sgis =>
adamc@31	2701 let
adamc@88	2702 val (sgis', (_, _, gs)) = ListUtil.foldlMapConcat elabSgn_item (env, denv, []) sgis
adamc@62	2703
adamc@62	2704 val _ = foldl (fn ((sgi, loc), (cons, vals, sgns, strs)) =>
adamc@62	2705 case sgi of
adamc@62	2706 L'.SgiConAbs (x, _, _) =>
adamc@62	2707 (if SS.member (cons, x) then
adamc@62	2708 sgnError env (DuplicateCon (loc, x))
adamc@62	2709 else
adamc@62	2710 ();
adamc@62	2711 (SS.add (cons, x), vals, sgns, strs))
adamc@62	2712 \| L'.SgiCon (x, _, _, _) =>
adamc@62	2713 (if SS.member (cons, x) then
adamc@62	2714 sgnError env (DuplicateCon (loc, x))
adamc@62	2715 else
adamc@62	2716 ();
adamc@62	2717 (SS.add (cons, x), vals, sgns, strs))
adamc@805	2718 \| L'.SgiDatatype dts =>
adamc@156	2719 let
adamc@805	2720 val (cons, vals) =
adamc@805	2721 let
adamc@805	2722 fun doOne ((x, _, _, xncs), (cons, vals)) =
adamc@805	2723 let
adamc@805	2724 val vals = foldl (fn ((x, _, _), vals) =>
adamc@805	2725 (if SS.member (vals, x) then
adamc@805	2726 sgnError env (DuplicateVal (loc, x))
adamc@805	2727 else
adamc@805	2728 ();
adamc@805	2729 SS.add (vals, x)))
adamc@805	2730 vals xncs
adamc@805	2731 in
adamc@805	2732 if SS.member (cons, x) then
adamc@805	2733 sgnError env (DuplicateCon (loc, x))
adamc@805	2734 else
adamc@805	2735 ();
adamc@805	2736 (SS.add (cons, x), vals)
adamc@805	2737 end
adamc@805	2738 in
adamc@805	2739 foldl doOne (cons, vals) dts
adamc@805	2740 end
adamc@156	2741 in
adamc@805	2742 (cons, vals, sgns, strs)
adamc@156	2743 end
adamc@191	2744 \| L'.SgiDatatypeImp (x, _, _, _, _, _, _) =>
adamc@156	2745 (if SS.member (cons, x) then
adamc@156	2746 sgnError env (DuplicateCon (loc, x))
adamc@156	2747 else
adamc@156	2748 ();
adamc@156	2749 (SS.add (cons, x), vals, sgns, strs))
adamc@62	2750 \| L'.SgiVal (x, _, _) =>
adamc@62	2751 (if SS.member (vals, x) then
adamc@62	2752 sgnError env (DuplicateVal (loc, x))
adamc@62	2753 else
adamc@62	2754 ();
adamc@62	2755 (cons, SS.add (vals, x), sgns, strs))
adamc@62	2756 \| L'.SgiSgn (x, _, _) =>
adamc@62	2757 (if SS.member (sgns, x) then
adamc@62	2758 sgnError env (DuplicateSgn (loc, x))
adamc@62	2759 else
adamc@62	2760 ();
adamc@62	2761 (cons, vals, SS.add (sgns, x), strs))
adamc@62	2762 \| L'.SgiStr (x, _, _) =>
adamc@62	2763 (if SS.member (strs, x) then
adamc@62	2764 sgnError env (DuplicateStr (loc, x))
adamc@62	2765 else
adamc@62	2766 ();
adamc@88	2767 (cons, vals, sgns, SS.add (strs, x)))
adamc@203	2768 \| L'.SgiConstraint _ => (cons, vals, sgns, strs)
adamc@563	2769 \| L'.SgiClassAbs (x, _, _) =>
adamc@211	2770 (if SS.member (cons, x) then
adamc@211	2771 sgnError env (DuplicateCon (loc, x))
adamc@211	2772 else
adamc@211	2773 ();
adamc@211	2774 (SS.add (cons, x), vals, sgns, strs))
adamc@563	2775 \| L'.SgiClass (x, _, _, _) =>
adamc@211	2776 (if SS.member (cons, x) then
adamc@211	2777 sgnError env (DuplicateCon (loc, x))
adamc@211	2778 else
adamc@211	2779 ();
adamc@460	2780 (SS.add (cons, x), vals, sgns, strs)))
adamc@62	2781 (SS.empty, SS.empty, SS.empty, SS.empty) sgis'
adamc@31	2782 in
adamc@83	2783 ((L'.SgnConst sgis', loc), gs)
adamc@31	2784 end
adamc@31	2785 \| L.SgnVar x =>
adamc@31	2786 (case E.lookupSgn env x of
adamc@31	2787 NONE =>
adamc@31	2788 (sgnError env (UnboundSgn (loc, x));
adamc@83	2789 ((L'.SgnError, loc), []))
adamc@83	2790 \| SOME (n, sgis) => ((L'.SgnVar n, loc), []))
adamc@41	2791 \| L.SgnFun (m, dom, ran) =>
adamc@41	2792 let
adamc@83	2793 val (dom', gs1) = elabSgn (env, denv) dom
adamc@41	2794 val (env', n) = E.pushStrNamed env m dom'
adamc@469	2795 val denv' = dopenConstraints (loc, env', denv) {str = m, strs = []}
adamc@469	2796 val (ran', gs2) = elabSgn (env', denv') ran
adamc@41	2797 in
adamc@83	2798 ((L'.SgnFun (m, n, dom', ran'), loc), gs1 @ gs2)
adamc@41	2799 end
adam@1864	2800 \| L.SgnWhere (sgn, ms, x, c) =>
adamc@42	2801 let
adamc@83	2802 val (sgn', ds1) = elabSgn (env, denv) sgn
adamc@83	2803 val (c', ck, ds2) = elabCon (env, denv) c
adam@1864	2804
adam@1864	2805 fun checkPath (ms, sgn') =
adam@1864	2806 case #1 (hnormSgn env sgn') of
adam@1864	2807 L'.SgnConst sgis =>
adam@1864	2808 List.exists (fn (L'.SgiConAbs (x', _, k), _) =>
adam@1864	2809 List.null ms andalso x' = x andalso
adam@1864	2810 (unifyKinds env k ck
adam@1864	2811 handle KUnify x => sgnError env (WhereWrongKind x);
adam@1864	2812 true)
adam@1864	2813 \| (L'.SgiStr (x', _, sgn''), _) =>
adam@1864	2814 (case ms of
adam@1864	2815 [] => false
adam@1864	2816 \| m :: ms' =>
adam@1864	2817 m = x' andalso
adam@1864	2818 checkPath (ms', sgn''))
adam@1864	2819 \| _ => false) sgis
adam@1864	2820 \| _ => false
adam@1864	2821 in
adam@1864	2822 if checkPath (ms, sgn') then
adam@1864	2823 ((L'.SgnWhere (sgn', ms, x, c'), loc), ds1 @ ds2)
adam@1864	2824 else
adam@1864	2825 (sgnError env (UnWhereable (sgn', x));
adam@1864	2826 (sgnerror, []))
adamc@42	2827 end
adamc@59	2828 \| L.SgnProj (m, ms, x) =>
adamc@59	2829 (case E.lookupStr env m of
adamc@59	2830 NONE => (strError env (UnboundStr (loc, m));
adamc@83	2831 (sgnerror, []))
adamc@59	2832 \| SOME (n, sgn) =>
adamc@59	2833 let
adamc@59	2834 val (str, sgn) = foldl (fn (m, (str, sgn)) =>
adamc@59	2835 case E.projectStr env {sgn = sgn, str = str, field = m} of
adamc@59	2836 NONE => (strError env (UnboundStr (loc, m));
adamc@59	2837 (strerror, sgnerror))
adamc@59	2838 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adamc@59	2839 ((L'.StrVar n, loc), sgn) ms
adamc@59	2840 in
adamc@59	2841 case E.projectSgn env {sgn = sgn, str = str, field = x} of
adamc@59	2842 NONE => (sgnError env (UnboundSgn (loc, x));
adamc@83	2843 (sgnerror, []))
adamc@83	2844 \| SOME _ => ((L'.SgnProj (n, ms, x), loc), [])
adamc@59	2845 end)
adamc@59	2846
adamc@31	2847
adamc@706	2848 and selfify env {str, strs, sgn} =
adamc@66	2849 case #1 (hnormSgn env sgn) of
adamc@66	2850 L'.SgnError => sgn
adamc@66	2851 \| L'.SgnVar _ => sgn
adamc@66	2852
adamc@66	2853 \| L'.SgnConst sgis =>
adam@1387	2854 (L'.SgnConst (#1 (ListUtil.foldlMapConcat
adam@1387	2855 (fn (sgi, env) =>
adam@1387	2856 (case sgi of (L'.SgiConAbs (x, n, k), loc) =>
adam@1387	2857 [(L'.SgiCon (x, n, k, (L'.CModProj (str, strs, x), loc)), loc)]
adam@1387	2858 \| (L'.SgiDatatype dts, loc) =>
adam@1387	2859 map (fn (x, n, xs, xncs) => (L'.SgiDatatypeImp (x, n, str, strs, x, xs, xncs), loc)) dts
adam@1387	2860 \| (L'.SgiClassAbs (x, n, k), loc) =>
adam@1387	2861 [(L'.SgiClass (x, n, k, (L'.CModProj (str, strs, x), loc)), loc)]
adam@1387	2862 \| (L'.SgiStr (x, n, sgn), loc) =>
adam@1387	2863 [(L'.SgiStr (x, n, selfify env {str = str, strs = strs @ [x], sgn = sgn}), loc)]
adam@1387	2864 \| x => [x],
adam@1387	2865 E.sgiBinds env sgi)) env sgis)), #2 sgn)
adamc@66	2866 \| L'.SgnFun _ => sgn
adamc@66	2867 \| L'.SgnWhere _ => sgn
adamc@66	2868 \| L'.SgnProj (m, ms, x) =>
adamc@66	2869 case E.projectSgn env {str = foldl (fn (m, str) => (L'.StrProj (str, m), #2 sgn))
adamc@66	2870 (L'.StrVar m, #2 sgn) ms,
adamc@66	2871 sgn = #2 (E.lookupStrNamed env m),
adamc@66	2872 field = x} of
adamc@66	2873 NONE => raise Fail "Elaborate.selfify: projectSgn returns NONE"
adamc@66	2874 \| SOME sgn => selfify env {str = str, strs = strs, sgn = sgn}
adamc@66	2875
adamc@706	2876 and selfifyAt env {str, sgn} =
adamc@66	2877 let
adamc@66	2878 fun self (str, _) =
adamc@66	2879 case str of
adamc@66	2880 L'.StrVar x => SOME (x, [])
adamc@66	2881 \| L'.StrProj (str, x) =>
adamc@66	2882 (case self str of
adamc@66	2883 NONE => NONE
adamc@66	2884 \| SOME (m, ms) => SOME (m, ms @ [x]))
adamc@66	2885 \| _ => NONE
adamc@66	2886 in
adamc@66	2887 case self str of
adamc@66	2888 NONE => sgn
adamc@66	2889 \| SOME (str, strs) => selfify env {sgn = sgn, str = str, strs = strs}
adamc@66	2890 end
adamc@66	2891
adamc@706	2892 and dopen env {str, strs, sgn} =
adamc@66	2893 let
adam@1527	2894 fun isVisible x = x <> "" andalso String.sub (x, 0) <> #"?"
adam@1527	2895
adamc@66	2896 val m = foldl (fn (m, str) => (L'.StrProj (str, m), #2 sgn))
adamc@66	2897 (L'.StrVar str, #2 sgn) strs
adamc@66	2898 in
adamc@66	2899 case #1 (hnormSgn env sgn) of
adamc@66	2900 L'.SgnConst sgis =>
adamc@805	2901 ListUtil.foldlMapConcat
adamc@805	2902 (fn ((sgi, loc), env') =>
adamc@805	2903 let
adamc@805	2904 val d =
adamc@805	2905 case sgi of
adamc@805	2906 L'.SgiConAbs (x, n, k) =>
adam@1527	2907 if isVisible x then
adam@1527	2908 let
adam@1527	2909 val c = (L'.CModProj (str, strs, x), loc)
adam@1527	2910 in
adam@1527	2911 [(L'.DCon (x, n, k, c), loc)]
adam@1527	2912 end
adam@1527	2913 else
adam@1527	2914 []
adamc@805	2915 \| L'.SgiCon (x, n, k, c) =>
adam@1527	2916 if isVisible x then
adam@1527	2917 [(L'.DCon (x, n, k, (L'.CModProj (str, strs, x), loc)), loc)]
adam@1527	2918 else
adam@1527	2919 []
adamc@805	2920 \| L'.SgiDatatype dts =>
adam@1527	2921 List.mapPartial (fn (x, n, xs, xncs) => if isVisible x then
adam@1527	2922 SOME (L'.DDatatypeImp (x, n, str, strs, x, xs, xncs), loc)
adam@1527	2923 else
adam@1527	2924 NONE) dts
adamc@805	2925 \| L'.SgiDatatypeImp (x, n, m1, ms, x', xs, xncs) =>
adam@1527	2926 if isVisible x then
adam@1527	2927 [(L'.DDatatypeImp (x, n, m1, ms, x', xs, xncs), loc)]
adam@1527	2928 else
adam@1527	2929 []
adamc@805	2930 \| L'.SgiVal (x, n, t) =>
adam@1527	2931 if isVisible x then
adam@1527	2932 [(L'.DVal (x, n, t, (L'.EModProj (str, strs, x), loc)), loc)]
adam@1527	2933 else
adam@1527	2934 []
adamc@805	2935 \| L'.SgiStr (x, n, sgn) =>
adam@1527	2936 if isVisible x then
adam@1527	2937 [(L'.DStr (x, n, sgn, (L'.StrProj (m, x), loc)), loc)]
adam@1527	2938 else
adam@1527	2939 []
adamc@805	2940 \| L'.SgiSgn (x, n, sgn) =>
adam@1527	2941 if isVisible x then
adam@1527	2942 [(L'.DSgn (x, n, (L'.SgnProj (str, strs, x), loc)), loc)]
adam@1527	2943 else
adam@1527	2944 []
adamc@805	2945 \| L'.SgiConstraint (c1, c2) =>
adamc@805	2946 [(L'.DConstraint (c1, c2), loc)]
adamc@805	2947 \| L'.SgiClassAbs (x, n, k) =>
adam@1527	2948 if isVisible x then
adam@1527	2949 let
adam@1527	2950 val c = (L'.CModProj (str, strs, x), loc)
adam@1527	2951 in
adam@1527	2952 [(L'.DCon (x, n, k, c), loc)]
adam@1527	2953 end
adam@1527	2954 else
adam@1527	2955 []
adamc@805	2956 \| L'.SgiClass (x, n, k, _) =>
adam@1527	2957 if isVisible x then
adam@1527	2958 let
adam@1527	2959 val c = (L'.CModProj (str, strs, x), loc)
adam@1527	2960 in
adam@1527	2961 [(L'.DCon (x, n, k, c), loc)]
adam@1527	2962 end
adam@1527	2963 else
adam@1527	2964 []
adamc@805	2965 in
adamc@805	2966 (d, foldl (fn (d, env') => E.declBinds env' d) env' d)
adamc@805	2967 end)
adamc@805	2968 env sgis
adamc@66	2969 \| _ => (strError env (UnOpenable sgn);
adamc@628	2970 ([], env))
adamc@66	2971 end
adamc@66	2972
adamc@706	2973 and sgiOfDecl (d, loc) =
adamc@31	2974 case d of
adamc@123	2975 L'.DCon (x, n, k, c) => [(L'.SgiCon (x, n, k, c), loc)]
adamc@156	2976 \| L'.DDatatype x => [(L'.SgiDatatype x, loc)]
adamc@156	2977 \| L'.DDatatypeImp x => [(L'.SgiDatatypeImp x, loc)]
adamc@123	2978 \| L'.DVal (x, n, t, _) => [(L'.SgiVal (x, n, t), loc)]
adamc@123	2979 \| L'.DValRec vis => map (fn (x, n, t, _) => (L'.SgiVal (x, n, t), loc)) vis
adamc@123	2980 \| L'.DSgn (x, n, sgn) => [(L'.SgiSgn (x, n, sgn), loc)]
adamc@123	2981 \| L'.DStr (x, n, sgn, _) => [(L'.SgiStr (x, n, sgn), loc)]
adamc@123	2982 \| L'.DFfiStr (x, n, sgn) => [(L'.SgiStr (x, n, sgn), loc)]
adamc@123	2983 \| L'.DConstraint cs => [(L'.SgiConstraint cs, loc)]
adamc@123	2984 \| L'.DExport _ => []
adamc@707	2985 \| L'.DTable (tn, x, n, c, _, pc, _, cc) =>
adamc@707	2986 [(L'.SgiVal (x, n, (L'.CApp ((L'.CApp (tableOf (), c), loc),
adamc@707	2987 (L'.CConcat (pc, cc), loc)), loc)), loc)]
adamc@460	2988 \| L'.DSequence (tn, x, n) => [(L'.SgiVal (x, n, sequenceOf ()), loc)]
adamc@754	2989 \| L'.DView (tn, x, n, _, c) =>
adamc@754	2990 [(L'.SgiVal (x, n, (L'.CApp (viewOf (), c), loc)), loc)]
adamc@271	2991 \| L'.DDatabase _ => []
adamc@460	2992 \| L'.DCookie (tn, x, n, c) => [(L'.SgiVal (x, n, (L'.CApp (cookieOf (), c), loc)), loc)]
adamc@720	2993 \| L'.DStyle (tn, x, n) => [(L'.SgiVal (x, n, styleOf ()), loc)]
adamc@1075	2994 \| L'.DTask _ => []
adamc@1199	2995 \| L'.DPolicy _ => []
adam@1294	2996 \| L'.DOnError _ => []
adamc@88	2997
adamc@1000	2998 and subSgn' counterparts env strLoc sgn1 (sgn2 as (_, loc2)) =
adamc@469	2999 ((*prefaces "subSgn" [("sgn1", p_sgn env sgn1),
adamc@469	3000 ("sgn2", p_sgn env sgn2)];*)
adamc@35	3001 case (#1 (hnormSgn env sgn1), #1 (hnormSgn env sgn2)) of
adamc@31	3002 (L'.SgnError, _) => ()
adamc@31	3003 \| (_, L'.SgnError) => ()
adamc@31	3004
adamc@31	3005 \| (L'.SgnConst sgis1, L'.SgnConst sgis2) =>
adamc@31	3006 let
adamc@362	3007 (*val () = prefaces "subSgn" [("sgn1", p_sgn env sgn1),
adamc@362	3008 ("sgn2", p_sgn env sgn2),
adamc@362	3009 ("sgis1", p_sgn env (L'.SgnConst sgis1, loc2)),
adamc@362	3010 ("sgis2", p_sgn env (L'.SgnConst sgis2, loc2))]*)
adamc@362	3011
adamc@838	3012 fun cpart n = IM.find (!counterparts, n)
adamc@838	3013 fun cparts (n2, n1) = counterparts := IM.insert (!counterparts, n2, n1)
adamc@838	3014
adamc@838	3015 val sub2 = U.Con.map {kind = fn k => k,
adamc@838	3016 con = fn c =>
adamc@838	3017 case c of
adamc@838	3018 L'.CNamed n2 =>
adamc@838	3019 (case cpart n2 of
adamc@838	3020 NONE => c
adamc@838	3021 \| SOME n1 => L'.CNamed n1)
adamc@838	3022 \| _ => c}
adamc@838	3023
adamc@628	3024 fun folder (sgi2All as (sgi, loc), env) =
adamc@31	3025 let
adam@1668	3026 (val () = prefaces "folder" [("sgi2", p_sgn_item env sgi2All)])
adamc@362	3027
adamc@805	3028 fun seek' f p =
adamc@31	3029 let
adamc@628	3030 fun seek env ls =
adamc@31	3031 case ls of
adamc@805	3032 [] => f env
adamc@31	3033 \| h :: t =>
adamc@469	3034 case p (env, h) of
adamc@469	3035 NONE =>
adamc@469	3036 let
adamc@469	3037 val env = case #1 h of
adamc@469	3038 L'.SgiCon (x, n, k, c) =>
adamc@471	3039 if E.checkENamed env n then
adamc@471	3040 env
adamc@471	3041 else
adamc@471	3042 E.pushCNamedAs env x n k (SOME c)
adamc@469	3043 \| L'.SgiConAbs (x, n, k) =>
adamc@471	3044 if E.checkENamed env n then
adamc@471	3045 env
adamc@471	3046 else
adamc@471	3047 E.pushCNamedAs env x n k NONE
adamc@469	3048 \| _ => env
adamc@469	3049 in
adamc@628	3050 seek (E.sgiBinds env h) t
adamc@469	3051 end
adamc@88	3052 \| SOME envs => envs
adamc@31	3053 in
adamc@628	3054 seek env sgis1
adamc@31	3055 end
adamc@805	3056
adamc@1000	3057 val seek = seek' (fn env => (sgnError env (UnmatchedSgi (strLoc, sgi2All));
adamc@805	3058 env))
adamc@31	3059 in
adamc@31	3060 case sgi of
adamc@31	3061 L'.SgiConAbs (x, n2, k2) =>
adam@1591	3062 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@31	3063 let
adamc@41	3064 fun found (x', n1, k1, co1) =
adamc@41	3065 if x = x' then
adamc@41	3066 let
adamc@623	3067 val () = unifyKinds env k1 k2
adam@1719	3068 handle KUnify (k1, k2, env', err) =>
adam@1591	3069 sgnError env (SgiWrongKind (loc, sgi1All, k1,
adam@1719	3070 sgi2All, k2, env', err))
adamc@41	3071 val env = E.pushCNamedAs env x n1 k1 co1
adamc@41	3072 in
adamc@41	3073 SOME (if n1 = n2 then
adamc@41	3074 env
adamc@41	3075 else
adamc@838	3076 (cparts (n2, n1);
adamc@838	3077 E.pushCNamedAs env x n2 k2 (SOME (L'.CNamed n1, loc2))))
adamc@41	3078 end
adamc@41	3079 else
adamc@41	3080 NONE
adamc@31	3081 in
adamc@31	3082 case sgi1 of
adamc@41	3083 L'.SgiConAbs (x', n1, k1) => found (x', n1, k1, NONE)
adamc@41	3084 \| L'.SgiCon (x', n1, k1, c1) => found (x', n1, k1, SOME c1)
adamc@805	3085 \| L'.SgiDatatype dts =>
adamc@191	3086 let
adamc@191	3087 val k = (L'.KType, loc)
adamc@805	3088
adamc@805	3089 fun search dts =
adamc@805	3090 case dts of
adamc@805	3091 [] => NONE
adamc@805	3092 \| (x', n1, xs, _) :: dts =>
adamc@805	3093 let
adamc@805	3094 val k' = foldl (fn (_, k') => (L'.KArrow (k, k'), loc)) k xs
adamc@805	3095 in
adamc@805	3096 case found (x', n1, k', NONE) of
adamc@805	3097 NONE => search dts
adamc@805	3098 \| x => x
adamc@805	3099 end
adamc@191	3100 in
adamc@805	3101 search dts
adamc@191	3102 end
adamc@191	3103 \| L'.SgiDatatypeImp (x', n1, m1, ms, s, xs, _) =>
adamc@191	3104 let
adamc@191	3105 val k = (L'.KType, loc)
adamc@191	3106 val k' = foldl (fn (_, k') => (L'.KArrow (k, k'), loc)) k xs
adamc@191	3107 in
adamc@191	3108 found (x', n1, k', SOME (L'.CModProj (m1, ms, s), loc))
adamc@191	3109 end
adamc@711	3110 \| L'.SgiClassAbs (x', n1, k) => found (x', n1, k, NONE)
adamc@711	3111 \| L'.SgiClass (x', n1, k, c) => found (x', n1, k, SOME c)
adamc@31	3112 \| _ => NONE
adamc@31	3113 end)
adamc@31	3114
adamc@31	3115 \| L'.SgiCon (x, n2, k2, c2) =>
adam@1591	3116 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@211	3117 let
adamc@211	3118 fun found (x', n1, k1, c1) =
adamc@211	3119 if x = x' then
adamc@211	3120 let
adamc@838	3121 val c2 = sub2 c2
adamc@838	3122
adamc@327	3123 fun good () =
adamc@327	3124 let
adamc@327	3125 val env = E.pushCNamedAs env x n2 k2 (SOME c2)
adamc@327	3126 val env = if n1 = n2 then
adamc@327	3127 env
adamc@327	3128 else
adamc@839	3129 (cparts (n2, n1);
adamc@839	3130 E.pushCNamedAs env x n1 k1 (SOME c1))
adamc@327	3131 in
adamc@628	3132 SOME env
adamc@327	3133 end
adamc@211	3134 in
adamc@987	3135 (unifyCons env loc c1 c2;
adamc@628	3136 good ())
adam@1719	3137 handle CUnify (c1, c2, env', err) =>
adam@1591	3138 (sgnError env (SgiWrongCon (loc, sgi1All, c1,
adam@1719	3139 sgi2All, c2, env', err));
adamc@211	3140 good ())
adamc@211	3141 end
adamc@211	3142 else
adamc@211	3143 NONE
adamc@211	3144 in
adamc@211	3145 case sgi1 of
adamc@211	3146 L'.SgiCon (x', n1, k1, c1) => found (x', n1, k1, c1)
adamc@711	3147 \| L'.SgiClass (x', n1, k1, c1) => found (x', n1, k1, c1)
adamc@211	3148 \| _ => NONE
adamc@211	3149 end)
adamc@31	3150
adamc@805	3151 \| L'.SgiDatatype dts2 =>
adamc@805	3152 let
adam@1591	3153 fun found' (sgi1All as (_, loc), (x1, n1, xs1, xncs1), (x2, n2, xs2, xncs2), env) =
adamc@805	3154 if x1 <> x2 then
adamc@805	3155 NONE
adamc@805	3156 else
adamc@805	3157 let
adamc@805	3158 fun mismatched ue =
adam@1591	3159 (sgnError env (SgiMismatchedDatatypes (loc, sgi1All, sgi2All, ue));
adamc@805	3160 SOME env)
adamc@805	3161
adamc@805	3162 val k = (L'.KType, loc)
adamc@805	3163 val k' = foldl (fn (_, k') => (L'.KArrow (k, k'), loc)) k xs1
adamc@805	3164
adamc@805	3165 fun good () =
adamc@805	3166 let
adamc@805	3167 val env = E.sgiBinds env sgi1All
adamc@805	3168 val env = if n1 = n2 then
adamc@805	3169 env
adamc@805	3170 else
adamc@838	3171 (cparts (n2, n1);
adamc@838	3172 E.pushCNamedAs env x1 n2 k'
adamc@838	3173 (SOME (L'.CNamed n1, loc)))
adamc@805	3174 in
adamc@805	3175 SOME env
adamc@805	3176 end
adamc@805	3177
adamc@805	3178 val env = E.pushCNamedAs env x1 n1 k' NONE
adamc@805	3179 val env = if n1 = n2 then
adamc@805	3180 env
adamc@805	3181 else
adamc@838	3182 (cparts (n2, n1);
adamc@838	3183 E.pushCNamedAs env x1 n2 k' (SOME (L'.CNamed n1, loc)))
adamc@805	3184 val env = foldl (fn (x, env) => E.pushCRel env x k) env xs1
adamc@805	3185 fun xncBad ((x1, _, t1), (x2, _, t2)) =
adamc@805	3186 String.compare (x1, x2) <> EQUAL
adamc@805	3187 orelse case (t1, t2) of
adamc@805	3188 (NONE, NONE) => false
adamc@805	3189 \| (SOME t1, SOME t2) =>
adamc@987	3190 (unifyCons env loc t1 (sub2 t2); false)
adamc@805	3191 \| _ => true
adamc@805	3192 in
adamc@805	3193 (if xs1 <> xs2
adamc@805	3194 orelse length xncs1 <> length xncs2
adamc@805	3195 orelse ListPair.exists xncBad (xncs1, xncs2) then
adamc@805	3196 mismatched NONE
adamc@160	3197 else
adamc@805	3198 good ())
adamc@805	3199 handle CUnify ue => mismatched (SOME ue)
adamc@805	3200 end
adamc@805	3201 in
adamc@805	3202 seek'
adamc@805	3203 (fn _ =>
adamc@805	3204 let
adamc@805	3205 fun seekOne (dt2, env) =
adamc@805	3206 seek (fn (env, sgi1All as (sgi1, _)) =>
adamc@805	3207 case sgi1 of
adamc@805	3208 L'.SgiDatatypeImp (x', n1, _, _, _, xs, xncs1) =>
adamc@805	3209 found' (sgi1All, (x', n1, xs, xncs1), dt2, env)
adamc@805	3210 \| _ => NONE)
adamc@805	3211
adamc@805	3212 fun seekAll (dts, env) =
adamc@805	3213 case dts of
adamc@805	3214 [] => env
adamc@805	3215 \| dt :: dts => seekAll (dts, seekOne (dt, env))
adamc@805	3216 in
adamc@805	3217 seekAll (dts2, env)
adamc@805	3218 end)
adamc@805	3219 (fn (env, sgi1All as (sgi1, _)) =>
adamc@805	3220 let
adamc@805	3221 fun found dts1 =
adamc@805	3222 let
adamc@805	3223 fun iter (dts1, dts2, env) =
adamc@805	3224 case (dts1, dts2) of
adamc@805	3225 ([], []) => SOME env
adamc@805	3226 \| (dt1 :: dts1, dt2 :: dts2) =>
adamc@805	3227 (case found' (sgi1All, dt1, dt2, env) of
adamc@805	3228 NONE => NONE
adamc@805	3229 \| SOME env => iter (dts1, dts2, env))
adamc@805	3230 \| _ => NONE
adamc@805	3231 in
adamc@805	3232 iter (dts1, dts2, env)
adamc@805	3233 end
adamc@805	3234 in
adamc@805	3235 case sgi1 of
adamc@805	3236 L'.SgiDatatype dts1 => found dts1
adamc@805	3237 \| _ => NONE
adamc@805	3238 end)
adamc@805	3239 end
adamc@156	3240
adamc@191	3241 \| L'.SgiDatatypeImp (x, n2, m12, ms2, s2, xs, _) =>
adam@1591	3242 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@158	3243 case sgi1 of
adamc@191	3244 L'.SgiDatatypeImp (x', n1, m11, ms1, s1, _, _) =>
adamc@158	3245 if x = x' then
adamc@158	3246 let
adamc@158	3247 val k = (L'.KType, loc)
adamc@191	3248 val k' = foldl (fn (_, k') => (L'.KArrow (k, k'), loc)) k xs
adamc@158	3249 val t1 = (L'.CModProj (m11, ms1, s1), loc)
adamc@158	3250 val t2 = (L'.CModProj (m12, ms2, s2), loc)
adamc@158	3251
adamc@158	3252 fun good () =
adamc@158	3253 let
adamc@191	3254 val env = E.pushCNamedAs env x n1 k' (SOME t1)
adamc@191	3255 val env = E.pushCNamedAs env x n2 k' (SOME t2)
adamc@158	3256 in
adamc@838	3257 cparts (n2, n1);
adamc@628	3258 SOME env
adamc@158	3259 end
adamc@158	3260 in
adamc@987	3261 (unifyCons env loc t1 t2;
adamc@628	3262 good ())
adam@1719	3263 handle CUnify (c1, c2, env', err) =>
adam@1719	3264 (sgnError env (SgiWrongCon (loc, sgi1All, c1, sgi2All, c2, env', err));
adamc@158	3265 good ())
adamc@158	3266 end
adamc@158	3267 else
adamc@158	3268 NONE
adamc@158	3269
adamc@158	3270 \| _ => NONE)
adamc@156	3271
adamc@32	3272 \| L'.SgiVal (x, n2, c2) =>
adam@1591	3273 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@32	3274 case sgi1 of
adamc@41	3275 L'.SgiVal (x', n1, c1) =>
adamc@41	3276 if x = x' then
adamc@838	3277 ((*prefaces "val" [("x", PD.string x),
adamc@838	3278 ("n1", PD.string (Int.toString n1)),
adamc@838	3279 ("c1", p_con env c1),
adamc@838	3280 ("c2", p_con env c2),
adamc@838	3281 ("c2'", p_con env (sub2 c2))];*)
adamc@987	3282 unifyCons env loc c1 (sub2 c2);
adamc@628	3283 SOME env)
adam@1719	3284 handle CUnify (c1, c2, env', err) =>
adam@1719	3285 (sgnError env (SgiWrongCon (loc, sgi1All, c1, sgi2All, c2, env', err));
adamc@628	3286 SOME env)
adamc@41	3287 else
adamc@41	3288 NONE
adamc@32	3289 \| _ => NONE)
adamc@32	3290
adamc@33	3291 \| L'.SgiStr (x, n2, sgn2) =>
adam@1591	3292 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@33	3293 case sgi1 of
adamc@41	3294 L'.SgiStr (x', n1, sgn1) =>
adamc@41	3295 if x = x' then
adamc@66	3296 let
adam@1591	3297 val () = subSgn' counterparts env loc sgn1 sgn2
adamc@66	3298 val env = E.pushStrNamedAs env x n1 sgn1
adamc@66	3299 val env = if n1 = n2 then
adamc@66	3300 env
adamc@66	3301 else
adamc@66	3302 E.pushStrNamedAs env x n2
adamc@66	3303 (selfifyAt env {str = (L'.StrVar n1, #2 sgn2),
adamc@66	3304 sgn = sgn2})
adamc@66	3305 in
adamc@628	3306 SOME env
adamc@66	3307 end
adamc@41	3308 else
adamc@41	3309 NONE
adamc@33	3310 \| _ => NONE)
adamc@59	3311
adamc@59	3312 \| L'.SgiSgn (x, n2, sgn2) =>
adam@1591	3313 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@59	3314 case sgi1 of
adamc@59	3315 L'.SgiSgn (x', n1, sgn1) =>
adamc@59	3316 if x = x' then
adamc@65	3317 let
adam@1591	3318 val () = subSgn' counterparts env loc sgn1 sgn2
adam@1591	3319 val () = subSgn' counterparts env loc sgn2 sgn1
adamc@65	3320
adamc@65	3321 val env = E.pushSgnNamedAs env x n2 sgn2
adamc@65	3322 val env = if n1 = n2 then
adamc@65	3323 env
adamc@65	3324 else
adamc@838	3325 (cparts (n2, n1);
adamc@838	3326 E.pushSgnNamedAs env x n1 sgn2)
adamc@65	3327 in
adamc@628	3328 SOME env
adamc@65	3329 end
adamc@59	3330 else
adamc@59	3331 NONE
adamc@59	3332 \| _ => NONE)
adamc@88	3333
adamc@88	3334 \| L'.SgiConstraint (c2, d2) =>
adam@1591	3335 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@88	3336 case sgi1 of
adamc@88	3337 L'.SgiConstraint (c1, d1) =>
adamc@987	3338 if consEq env loc (c1, c2)
adamc@987	3339 andalso consEq env loc (d1, d2) then
adamc@628	3340 SOME env
adamc@88	3341 else
adamc@88	3342 NONE
adamc@88	3343 \| _ => NONE)
adamc@203	3344
adamc@563	3345 \| L'.SgiClassAbs (x, n2, k2) =>
adam@1591	3346 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@211	3347 let
adamc@563	3348 fun found (x', n1, k1, co) =
adamc@211	3349 if x = x' then
adamc@211	3350 let
adamc@623	3351 val () = unifyKinds env k1 k2
adam@1719	3352 handle KUnify (k1, k2, env', err) =>
adam@1591	3353 sgnError env (SgiWrongKind (loc, sgi1All, k1,
adam@1719	3354 sgi2All, k2, env', err))
adamc@563	3355
adamc@711	3356 val env = E.pushCNamedAs env x n1 k1 co
adamc@211	3357 in
adamc@211	3358 SOME (if n1 = n2 then
adamc@211	3359 env
adamc@211	3360 else
adamc@838	3361 (cparts (n2, n1);
adamc@838	3362 E.pushCNamedAs env x n2 k1 (SOME (L'.CNamed n1, loc2))))
adamc@211	3363 end
adamc@211	3364 else
adamc@211	3365 NONE
adamc@211	3366 in
adamc@211	3367 case sgi1 of
adamc@563	3368 L'.SgiClassAbs (x', n1, k1) => found (x', n1, k1, NONE)
adamc@563	3369 \| L'.SgiClass (x', n1, k1, c) => found (x', n1, k1, SOME c)
adam@1797	3370 \| L'.SgiConAbs (x', n1, k1) => found (x', n1, k1, NONE)
adam@1797	3371 \| L'.SgiCon (x', n1, k1, c) => found (x', n1, k1, SOME c)
adamc@211	3372 \| _ => NONE
adamc@211	3373 end)
adamc@563	3374 \| L'.SgiClass (x, n2, k2, c2) =>
adam@1591	3375 seek (fn (env, sgi1All as (sgi1, loc)) =>
adamc@211	3376 let
adamc@563	3377 fun found (x', n1, k1, c1) =
adamc@211	3378 if x = x' then
adamc@211	3379 let
adamc@623	3380 val () = unifyKinds env k1 k2
adam@1719	3381 handle KUnify (k1, k2, env', err) =>
adam@1591	3382 sgnError env (SgiWrongKind (loc, sgi1All, k1,
adam@1719	3383 sgi2All, k2, env', err))
adamc@563	3384
adamc@838	3385 val c2 = sub2 c2
adamc@838	3386
adamc@218	3387 fun good () =
adamc@218	3388 let
adamc@711	3389 val env = E.pushCNamedAs env x n2 k2 (SOME c2)
adamc@218	3390 val env = if n1 = n2 then
adamc@218	3391 env
adamc@218	3392 else
adamc@839	3393 (cparts (n2, n1);
adamc@839	3394 E.pushCNamedAs env x n1 k2 (SOME c1))
adamc@218	3395 in
adamc@628	3396 SOME env
adamc@218	3397 end
adamc@211	3398 in
adamc@987	3399 (unifyCons env loc c1 c2;
adamc@628	3400 good ())
adam@1719	3401 handle CUnify (c1, c2, env', err) =>
adam@1591	3402 (sgnError env (SgiWrongCon (loc, sgi1All, c1,
adam@1719	3403 sgi2All, c2, env', err));
adamc@211	3404 good ())
adamc@211	3405 end
adamc@211	3406 else
adamc@211	3407 NONE
adamc@211	3408 in
adamc@211	3409 case sgi1 of
adamc@563	3410 L'.SgiClass (x', n1, k1, c1) => found (x', n1, k1, c1)
adam@1797	3411 \| L'.SgiCon (x', n1, k1, c1) => found (x', n1, k1, c1)
adamc@211	3412 \| _ => NONE
adamc@211	3413 end)
adamc@31	3414 end
adamc@31	3415 in
adamc@628	3416 ignore (foldl folder env sgis2)
adamc@31	3417 end
adamc@31	3418
adamc@41	3419 \| (L'.SgnFun (m1, n1, dom1, ran1), L'.SgnFun (m2, n2, dom2, ran2)) =>
adamc@43	3420 let
adamc@480	3421 val ran2 =
adamc@43	3422 if n1 = n2 then
adamc@480	3423 ran2
adamc@43	3424 else
adamc@480	3425 subStrInSgn (n2, n1) ran2
adamc@43	3426 in
adamc@1000	3427 subSgn' counterparts env strLoc dom2 dom1;
adamc@1000	3428 subSgn' counterparts (E.pushStrNamedAs env m1 n1 dom2) strLoc ran1 ran2
adamc@43	3429 end
adamc@41	3430
adamc@1000	3431 \| _ => sgnError env (SgnWrongForm (strLoc, sgn1, sgn2)))
adamc@41	3432
adam@1580	3433 and subSgn env x y z = subSgn' (ref IM.empty) env x y z
adam@1580	3434 handle e as E.UnboundNamed _ => if ErrorMsg.anyErrors () then () else raise e
adamc@61	3435
adamc@706	3436 and positive self =
adamc@312	3437 let
adamc@312	3438 open L
adamc@312	3439
adamc@312	3440 fun none (c, _) =
adamc@312	3441 case c of
adamc@312	3442 CAnnot (c, _) => none c
adamc@312	3443
adamc@312	3444 \| TFun (c1, c2) => none c1 andalso none c2
adamc@312	3445 \| TCFun (_, _, _, c) => none c
adamc@312	3446 \| TRecord c => none c
adamc@312	3447
adamc@312	3448 \| CVar ([], x) => x <> self
adamc@312	3449 \| CVar _ => true
adamc@312	3450 \| CApp (c1, c2) => none c1 andalso none c2
adamc@312	3451 \| CAbs _ => false
adamc@628	3452 \| TDisjoint (c1, c2, c3) => none c1 andalso none c2 andalso none c3
adamc@312	3453
adamc@623	3454 \| CKAbs _ => false
adamc@623	3455 \| TKFun _ => false
adamc@623	3456
adamc@312	3457 \| CName _ => true
adamc@312	3458
adamc@312	3459 \| CRecord xcs => List.all (fn (c1, c2) => none c1 andalso none c2) xcs
adamc@312	3460 \| CConcat (c1, c2) => none c1 andalso none c2
adamc@621	3461 \| CMap => true
adamc@312	3462
adamc@312	3463 \| CUnit => true
adamc@312	3464
adamc@312	3465 \| CTuple cs => List.all none cs
adamc@312	3466 \| CProj (c, _) => none c
adamc@312	3467
adamc@312	3468 \| CWild _ => false
adamc@312	3469
adamc@312	3470 fun pos (c, _) =
adamc@312	3471 case c of
adamc@312	3472 CAnnot (c, _) => pos c
adamc@312	3473
adamc@312	3474 \| TFun (c1, c2) => none c1 andalso pos c2
adamc@312	3475 \| TCFun (_, _, _, c) => pos c
adamc@312	3476 \| TRecord c => pos c
adamc@312	3477
adamc@312	3478 \| CVar _ => true
adamc@312	3479 \| CApp (c1, c2) => pos c1 andalso none c2
adamc@312	3480 \| CAbs _ => false
adamc@628	3481 \| TDisjoint (c1, c2, c3) => none c1 andalso none c2 andalso none c3
adamc@312	3482
adamc@623	3483 \| CKAbs _ => false
adamc@623	3484 \| TKFun _ => false
adamc@623	3485
adamc@312	3486 \| CName _ => true
adamc@312	3487
adamc@312	3488 \| CRecord xcs => List.all (fn (c1, c2) => none c1 andalso pos c2) xcs
adamc@312	3489 \| CConcat (c1, c2) => pos c1 andalso pos c2
adamc@621	3490 \| CMap => true
adamc@312	3491
adamc@312	3492 \| CUnit => true
adamc@312	3493
adamc@312	3494 \| CTuple cs => List.all pos cs
adamc@312	3495 \| CProj (c, _) => pos c
adamc@312	3496
adamc@312	3497 \| CWild _ => false
adamc@312	3498 in
adamc@312	3499 pos
adamc@312	3500 end
adamc@312	3501
adamc@706	3502 and wildifyStr env (str, sgn) =
adamc@325	3503 case #1 (hnormSgn env sgn) of
adamc@325	3504 L'.SgnConst sgis =>
adamc@325	3505 (case #1 str of
adamc@325	3506 L.StrConst ds =>
adamc@325	3507 let
adamc@1270	3508 fun cname d =
adamc@1270	3509 case d of
adamc@1270	3510 L'.SgiCon (x, _, _, _) => SOME x
adamc@1270	3511 \| L'.SgiConAbs (x, _, _) => SOME x
adamc@1270	3512 \| L'.SgiClass (x, _, _, _) => SOME x
adamc@1270	3513 \| L'.SgiClassAbs (x, _, _) => SOME x
adamc@1270	3514 \| _ => NONE
adamc@1270	3515
adamc@1270	3516 fun dname (d, _) =
adamc@1270	3517 case d of
adamc@1270	3518 L.DCon (x, _, _) => SOME x
adamc@1270	3519 \| _ => NONE
adamc@1270	3520
adamc@493	3521 fun decompileKind (k, loc) =
adamc@493	3522 case k of
adamc@493	3523 L'.KType => SOME (L.KType, loc)
adamc@493	3524 \| L'.KArrow (k1, k2) =>
adamc@493	3525 (case (decompileKind k1, decompileKind k2) of
adamc@493	3526 (SOME k1, SOME k2) => SOME (L.KArrow (k1, k2), loc)
adamc@493	3527 \| _ => NONE)
adamc@493	3528 \| L'.KName => SOME (L.KName, loc)
adamc@493	3529 \| L'.KRecord k =>
adamc@493	3530 (case decompileKind k of
adamc@493	3531 SOME k => SOME (L.KRecord k, loc)
adamc@493	3532 \| _ => NONE)
adamc@493	3533 \| L'.KUnit => SOME (L.KUnit, loc)
adamc@493	3534 \| L'.KTuple ks =>
adamc@493	3535 let
adamc@493	3536 val ks' = List.mapPartial decompileKind ks
adamc@493	3537 in
adamc@493	3538 if length ks' = length ks then
adamc@493	3539 SOME (L.KTuple ks', loc)
adamc@493	3540 else
adamc@493	3541 NONE
adamc@493	3542 end
adamc@493	3543
adamc@493	3544 \| L'.KError => NONE
adam@1639	3545 \| L'.KUnif (_, _, ref (L'.KKnown k)) => decompileKind k
adamc@493	3546 \| L'.KUnif _ => NONE
adam@1639	3547 \| L'.KTupleUnif (_, _, ref (L'.KKnown k)) => decompileKind k
adam@1302	3548 \| L'.KTupleUnif _ => NONE
adamc@493	3549
adamc@623	3550 \| L'.KRel _ => NONE
adamc@623	3551 \| L'.KFun _ => NONE
adamc@623	3552
adam@1529	3553 fun maybeHnorm env c =
adam@1865	3554 hnormCon env c
adam@1865	3555 handle E.UnboundNamed _ => c
adam@1865	3556
adam@1865	3557 fun decompileCon env c =
adam@1865	3558 case decompileCon' env c of
adam@1865	3559 SOME v => SOME v
adam@1865	3560 \| NONE => decompileCon' env (maybeHnorm env c)
adam@1865	3561
adam@1865	3562 and decompileCon' env (c as (_, loc)) =
adam@1865	3563 case #1 c of
adamc@325	3564 L'.CRel i =>
adamc@325	3565 let
adamc@325	3566 val (s, _) = E.lookupCRel env i
adamc@325	3567 in
adamc@325	3568 SOME (L.CVar ([], s), loc)
adamc@325	3569 end
adamc@325	3570 \| L'.CNamed i =>
adamc@325	3571 let
adamc@325	3572 val (s, _, _) = E.lookupCNamed env i
adamc@325	3573 in
adamc@325	3574 SOME (L.CVar ([], s), loc)
adamc@325	3575 end
adamc@325	3576 \| L'.CModProj (m1, ms, x) =>
adamc@325	3577 let
adamc@325	3578 val (s, _) = E.lookupStrNamed env m1
adamc@325	3579 in
adamc@325	3580 SOME (L.CVar (s :: ms, x), loc)
adamc@325	3581 end
adamc@325	3582 \| L'.CName s => SOME (L.CName s, loc)
adam@1886	3583 \| L'.CRecord (k, xcs) =>
adamc@325	3584 let
adamc@325	3585 fun fields xcs =
adamc@325	3586 case xcs of
adamc@325	3587 [] => SOME []
adamc@325	3588 \| (x, t) :: xcs =>
adamc@325	3589 case (decompileCon env x, decompileCon env t, fields xcs) of
adamc@325	3590 (SOME x, SOME t, SOME xcs) => SOME ((x, t) :: xcs)
adamc@325	3591 \| _ => NONE
adam@1886	3592
adam@1886	3593 val c' = Option.map (fn xcs => (L.CRecord xcs, loc))
adam@1886	3594 (fields xcs)
adamc@325	3595 in
adam@1886	3596 Option.map (fn c' =>
adam@1886	3597 case decompileKind k of
adam@1886	3598 NONE => c'
adam@1886	3599 \| SOME k' => (L.CAnnot (c', (L.KRecord k', loc)), loc)) c'
adamc@325	3600 end
adamc@325	3601 \| L'.CConcat (c1, c2) =>
adamc@325	3602 (case (decompileCon env c1, decompileCon env c2) of
adamc@325	3603 (SOME c1, SOME c2) => SOME (L.CConcat (c1, c2), loc)
adamc@325	3604 \| _ => NONE)
adamc@325	3605 \| L'.CUnit => SOME (L.CUnit, loc)
adam@1639	3606 \| L'.CUnif (nl, _, _, _, ref (L'.Known c)) => decompileCon env (E.mliftConInCon nl c)
adamc@325	3607
adam@1585	3608 \| L'.CApp (f, x) =>
adam@1585	3609 (case (decompileCon env f, decompileCon env x) of
adam@1585	3610 (SOME f, SOME x) => SOME (L.CApp (f, x), loc)
adam@1585	3611 \| _ => NONE)
adam@1585	3612
adam@1864	3613 \| L'.CTuple cs =>
adam@1864	3614 let
adam@1864	3615 val cs' = foldr (fn (c, cs') =>
adam@1864	3616 case cs' of
adam@1864	3617 NONE => NONE
adam@1864	3618 \| SOME cs' =>
adam@1864	3619 case decompileCon env c of
adam@1864	3620 NONE => NONE
adam@1864	3621 \| SOME c' => SOME (c' :: cs'))
adam@1864	3622 (SOME []) cs
adam@1864	3623 in
adam@1864	3624 case cs' of
adam@1864	3625 NONE => NONE
adam@1864	3626 \| SOME cs' => SOME (L.CTuple cs', loc)
adam@1864	3627 end
adam@1864	3628
adam@1864	3629 \| L'.CMap _ => SOME (L.CMap, loc)
adam@1865	3630 \| L'.TRecord c =>
adam@1865	3631 (case decompileCon env c of
adam@1865	3632 NONE => NONE
adam@1865	3633 \| SOME c' => SOME (L.TRecord c', loc))
adam@1864	3634
adam@1912	3635 \| c => ((Print.preface ("WTF?", p_con env (c, loc));) NONE)
adamc@325	3636
adamc@1264	3637 fun buildNeeded env sgis =
adamc@1275	3638 #1 (foldl (fn ((sgi, loc), (nd, env')) =>
adamc@1264	3639 (case sgi of
adam@1570	3640 L'.SgiCon (x, _, k, _) => naddCon (nd, x, k)
adam@1570	3641 \| L'.SgiConAbs (x, _, k) => naddCon (nd, x, k)
adamc@1264	3642 \| L'.SgiConstraint cs => naddConstraint (nd, (env', cs, loc))
adamc@1264	3643 \| L'.SgiVal (x, _, t) =>
adamc@1264	3644 let
adamc@1277	3645 fun should t =
adamc@1277	3646 let
adamc@1277	3647 val t = normClassConstraint env' t
adamc@1277	3648 in
adamc@1277	3649 case #1 t of
adamc@1277	3650 L'.CApp (f, _) => isClassOrFolder env' f
adamc@1277	3651 \| L'.TRecord t =>
adamc@1277	3652 (case hnormCon env' t of
adamc@1277	3653 (L'.CApp (f, _), _) =>
adamc@1277	3654 (case hnormCon env' f of
adamc@1277	3655 (L'.CApp (f, cl), loc) =>
adamc@1277	3656 (case hnormCon env' f of
adamc@1277	3657 (L'.CMap _, _) => isClassOrFolder env' cl
adamc@1277	3658 \| _ => false)
adamc@1277	3659 \| _ => false)
adamc@1277	3660 \| _ => false)
adamc@1277	3661 \| _ => false
adamc@1277	3662 end
adamc@1270	3663 in
adamc@1277	3664 if should t then
adamc@1277	3665 naddVal (nd, x)
adamc@1277	3666 else
adamc@1277	3667 nd
adamc@1264	3668 end
adamc@1264	3669 \| L'.SgiStr (x, _, s) =>
adamc@1270	3670 (case #1 (hnormSgn env' s) of
adamc@1270	3671 L'.SgnConst sgis' => naddMod (nd, x, (env', buildNeeded env' sgis'))
adamc@1264	3672 \| _ => nd)
adamc@1264	3673 \| _ => nd,
adamc@1275	3674 E.sgiBinds env' (sgi, loc)))
adamc@1275	3675 (nempty, env) sgis)
adamc@1264	3676
adamc@1264	3677 val nd = buildNeeded env sgis
adamc@1264	3678
adamc@1264	3679 fun removeUsed (nd, ds) =
adamc@1264	3680 foldl (fn ((d, _), nd) =>
adamc@634	3681 case d of
adamc@1264	3682 L.DCon (x, _, _) => ndelCon (nd, x)
adamc@1264	3683 \| L.DVal (x, _, _) => ndelVal (nd, x)
adamc@1264	3684 \| L.DOpen _ => nempty
adam@1868	3685 \| L.DStr (x, _, _, (L.StrConst ds', _), _) =>
adamc@1264	3686 (case SM.find (nmods nd, x) of
adamc@1264	3687 NONE => nd
adamc@1270	3688 \| SOME (env, nd') => naddMod (nd, x, (env, removeUsed (nd', ds'))))
adamc@1264	3689 \| _ => nd)
adamc@1264	3690 nd ds
adamc@1264	3691
adamc@1264	3692 val nd = removeUsed (nd, ds)
adamc@1264	3693
adam@1662	3694 (* Among the declarations present explicitly in the program, find the last constructor or constraint declaration.
adam@1662	3695 * The new constructor/constraint declarations that we add may safely be put after that point. *)
adam@1662	3696 fun findLast (ds, acc) =
adam@1662	3697 case ds of
adam@1662	3698 [] => ([], acc)
adam@1662	3699 \| (d : L.decl) :: ds' =>
adam@1662	3700 let
adam@1662	3701 val isCony = case #1 d of
adam@1662	3702 L.DCon _ => true
adam@1662	3703 \| L.DDatatype _ => true
adam@1662	3704 \| L.DDatatypeImp _ => true
adam@1662	3705 \| L.DStr _ => true
adam@1662	3706 \| L.DConstraint _ => true
adam@1662	3707 \| _ => false
adam@1662	3708 in
adam@1662	3709 if isCony then
adam@1662	3710 (ds, acc)
adam@1662	3711 else
adam@1662	3712 findLast (ds', d :: acc)
adam@1662	3713 end
adam@1662	3714
adam@1662	3715 val (dPrefix, dSuffix) = findLast (rev ds, [])
adam@1662	3716
adamc@1270	3717 fun extend (env, nd, ds) =
adamc@1264	3718 let
adamc@1264	3719 val ds' = List.mapPartial (fn (env', (c1, c2), loc) =>
adamc@1264	3720 case (decompileCon env' c1, decompileCon env' c2) of
adamc@1264	3721 (SOME c1, SOME c2) =>
adamc@1264	3722 SOME (L.DConstraint (c1, c2), loc)
adam@1586	3723 \| _ => NONE) (nconstraints nd)
adamc@1264	3724
adamc@1264	3725 val ds' =
adamc@1264	3726 case SS.listItems (nvals nd) of
adamc@1264	3727 [] => ds'
adamc@1264	3728 \| xs =>
adamc@1264	3729 let
adamc@1264	3730 val ewild = (L.EWild, #2 str)
adamc@1264	3731 val ds'' = map (fn x => (L.DVal (x, NONE, ewild), #2 str)) xs
adamc@1264	3732 in
adamc@1264	3733 ds'' @ ds'
adamc@1264	3734 end
adamc@1264	3735
adamc@1275	3736 val ds' =
adam@1640	3737 case ncons nd of
adamc@1275	3738 [] => ds'
adamc@1264	3739 \| xs =>
adam@1570	3740 map (fn (x, k) =>
adamc@1270	3741 let
adamc@1270	3742 val k =
adamc@1270	3743 case decompileKind k of
adamc@1270	3744 NONE => (L.KWild, #2 str)
adamc@1270	3745 \| SOME k => k
adamc@1275	3746
adamc@1270	3747 val cwild = (L.CWild k, #2 str)
adamc@1270	3748 in
adam@1570	3749 (L.DCon (x, NONE, cwild), #2 str)
adamc@1275	3750 end) xs @ ds'
adamc@1275	3751
adamc@1275	3752 val ds = ds @ ds'
adamc@1264	3753 in
adam@1868	3754 map (fn d as (L.DStr (x, s, tm, (L.StrConst ds', loc'), r), loc) =>
adamc@1270	3755 (case SM.find (nmods nd, x) of
adamc@1270	3756 NONE => d
adamc@1270	3757 \| SOME (env, nd') =>
adam@1868	3758 (L.DStr (x, s, tm, (L.StrConst (extend (env, nd', ds')), loc'), r), loc))
adamc@1270	3759 \| d => d) ds
adamc@1264	3760 end
adamc@325	3761 in
adam@1662	3762 (L.StrConst (extend (env, nd, rev dPrefix) @ dSuffix), #2 str)
adamc@325	3763 end
adamc@325	3764 \| _ => str)
adamc@325	3765 \| _ => str
adamc@325	3766
adamc@706	3767 and elabDecl (dAll as (d, loc), (env, denv, gs)) =
adamc@255	3768 let
adamc@904	3769 (val () = preface ("elabDecl", SourcePrint.p_decl dAll))
adamc@514	3770 (val befor = Time.now ())
adamc@255	3771
adamc@255	3772 val r =
adamc@255	3773 case d of
adamc@255	3774 L.DCon (x, ko, c) =>
adamc@255	3775 let
adamc@255	3776 val k' = case ko of
adam@1639	3777 NONE => kunif env loc
adamc@623	3778 \| SOME k => elabKind env k
adamc@255	3779
adamc@255	3780 val (c', ck, gs') = elabCon (env, denv) c
adamc@255	3781 val (env', n) = E.pushCNamed env x k' (SOME c')
adamc@255	3782 in
adamc@255	3783 checkKind env c' ck k';
adamc@255	3784
adamc@255	3785 ([(L'.DCon (x, n, k', c'), loc)], (env', denv, enD gs' @ gs))
adamc@255	3786 end
adamc@805	3787 \| L.DDatatype dts =>
adamc@255	3788 let
adamc@255	3789 val k = (L'.KType, loc)
adamc@805	3790
adamc@805	3791 val (dts, env) = ListUtil.foldlMap
adamc@805	3792 (fn ((x, xs, xcs), env) =>
adamc@805	3793 let
adamc@805	3794 val k' = foldl (fn (_, k') => (L'.KArrow (k, k'), loc)) k xs
adamc@805	3795 val (env, n) = E.pushCNamed env x k' NONE
adamc@805	3796 in
adamc@805	3797 ((x, n, xs, xcs), env)
adamc@805	3798 end)
adamc@805	3799 env dts
adamc@805	3800
adamc@805	3801 val (dts, (env, gs')) = ListUtil.foldlMap
adamc@805	3802 (fn ((x, n, xs, xcs), (env, gs')) =>
adamc@805	3803 let
adamc@805	3804 val t = (L'.CNamed n, loc)
adamc@805	3805 val nxs = length xs - 1
adamc@805	3806 val t = ListUtil.foldli
adamc@805	3807 (fn (i, _, t) =>
adamc@805	3808 (L'.CApp (t, (L'.CRel (nxs - i), loc)), loc)) t xs
adamc@805	3809
adamc@805	3810 val (env', denv') = foldl (fn (x, (env', denv')) =>
adamc@805	3811 (E.pushCRel env' x k,
adamc@805	3812 D.enter denv')) (env, denv) xs
adamc@805	3813
adamc@805	3814 val (xcs, (used, env, gs')) =
adamc@805	3815 ListUtil.foldlMap
adamc@805	3816 (fn ((x, to), (used, env, gs)) =>
adamc@805	3817 let
adamc@805	3818 val (to, t, gs') = case to of
adamc@805	3819 NONE => (NONE, t, gs)
adamc@805	3820 \| SOME t' =>
adamc@805	3821 let
adamc@805	3822 val (t', tk, gs') = elabCon (env', denv') t'
adamc@805	3823 in
adamc@805	3824 checkKind env' t' tk k;
adamc@805	3825 (SOME t', (L'.TFun (t', t), loc), enD gs' @ gs)
adamc@805	3826 end
adamc@805	3827 val t = foldr (fn (x, t) => (L'.TCFun (L'.Implicit, x, k, t), loc)) t xs
adamc@805	3828
adamc@805	3829 val (env, n') = E.pushENamed env x t
adamc@805	3830 in
adamc@805	3831 if SS.member (used, x) then
adamc@805	3832 strError env (DuplicateConstructor (x, loc))
adamc@805	3833 else
adamc@805	3834 ();
adamc@805	3835 ((x, n', to), (SS.add (used, x), env, gs'))
adamc@805	3836 end)
adamc@805	3837 (SS.empty, env, gs') xcs
adamc@805	3838 in
adamc@805	3839 ((x, n, xs, xcs), (E.pushDatatype env n xs xcs, gs'))
adamc@805	3840 end)
adamc@805	3841 (env, []) dts
adamc@255	3842 in
adamc@805	3843 ([(L'.DDatatype dts, loc)], (env, denv, gs' @ gs))
adamc@255	3844 end
adamc@255	3845
adamc@255	3846 \| L.DDatatypeImp (_, [], _) => raise Fail "Empty DDatatypeImp"
adamc@255	3847
adamc@255	3848 \| L.DDatatypeImp (x, m1 :: ms, s) =>
adamc@255	3849 (case E.lookupStr env m1 of
adamc@255	3850 NONE => (expError env (UnboundStrInExp (loc, m1));
adamc@255	3851 ([], (env, denv, gs)))
adamc@255	3852 \| SOME (n, sgn) =>
adamc@255	3853 let
adamc@255	3854 val (str, sgn) = foldl (fn (m, (str, sgn)) =>
adamc@255	3855 case E.projectStr env {sgn = sgn, str = str, field = m} of
adamc@255	3856 NONE => (conError env (UnboundStrInCon (loc, m));
adamc@255	3857 (strerror, sgnerror))
adamc@255	3858 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adamc@255	3859 ((L'.StrVar n, loc), sgn) ms
adamc@255	3860 in
adamc@628	3861 case hnormCon env (L'.CModProj (n, ms, s), loc) of
adamc@628	3862 (L'.CModProj (n, ms, s), _) =>
adamc@255	3863 (case E.projectDatatype env {sgn = sgn, str = str, field = s} of
adamc@255	3864 NONE => (conError env (UnboundDatatype (loc, s));
adamc@255	3865 ([], (env, denv, gs)))
adamc@255	3866 \| SOME (xs, xncs) =>
adamc@255	3867 let
adamc@255	3868 val k = (L'.KType, loc)
adamc@255	3869 val k' = foldl (fn (_, k') => (L'.KArrow (k, k'), loc)) k xs
adamc@255	3870 val t = (L'.CModProj (n, ms, s), loc)
adamc@255	3871 val (env, n') = E.pushCNamed env x k' (SOME t)
adamc@255	3872 val env = E.pushDatatype env n' xs xncs
adamc@255	3873
adamc@255	3874 val t = (L'.CNamed n', loc)
adamc@844	3875 val nxs = length xs
adamc@844	3876 val t = ListUtil.foldli (fn (i, _, t) =>
adamc@844	3877 (L'.CApp (t, (L'.CRel (nxs - 1 - i), loc)), loc))
adamc@844	3878 t xs
adamc@255	3879 val env = foldl (fn ((x, n, to), env) =>
adamc@255	3880 let
adamc@255	3881 val t = case to of
adamc@255	3882 NONE => t
adamc@255	3883 \| SOME t' => (L'.TFun (t', t), loc)
adamc@255	3884
adamc@255	3885 val t = foldr (fn (x, t) =>
adamc@255	3886 (L'.TCFun (L'.Implicit, x, k, t), loc))
adamc@255	3887 t xs
adamc@255	3888 in
adamc@255	3889 E.pushENamedAs env x n t
adamc@255	3890 end) env xncs
adamc@255	3891 in
adamc@628	3892 ([(L'.DDatatypeImp (x, n', n, ms, s, xs, xncs), loc)], (env, denv, gs))
adamc@255	3893 end)
adamc@255	3894 \| _ => (strError env (NotDatatype loc);
adamc@255	3895 ([], (env, denv, [])))
adamc@255	3896 end)
adamc@255	3897
adamc@255	3898 \| L.DVal (x, co, e) =>
adamc@255	3899 let
adamc@255	3900 val (c', _, gs1) = case co of
adam@1639	3901 NONE => (cunif env (loc, ktype), ktype, [])
adamc@255	3902 \| SOME c => elabCon (env, denv) c
adamc@255	3903
adamc@255	3904 val (e', et, gs2) = elabExp (env, denv) e
adamc@629	3905
adamc@629	3906 val () = checkCon env e' et c'
adamc@629	3907
adamc@674	3908 val c' = normClassConstraint env c'
adamc@255	3909 val (env', n) = E.pushENamed env x c'
adamc@255	3910 in
adamc@255	3911 (*prefaces "DVal" [("x", Print.PD.string x),
adamc@362	3912 ("c'", p_con env c')];*)
adamc@628	3913 ([(L'.DVal (x, n, c', e'), loc)], (env', denv, enD gs1 @ gs2 @ gs))
adamc@255	3914 end
adamc@255	3915 \| L.DValRec vis =>
adamc@255	3916 let
adamc@255	3917 fun allowable (e, _) =
adamc@255	3918 case e of
adamc@255	3919 L.EAbs _ => true
adamc@255	3920 \| L.ECAbs (_, _, _, e) => allowable e
adamc@623	3921 \| L.EKAbs (_, e) => allowable e
adamc@255	3922 \| L.EDisjoint (_, _, e) => allowable e
adamc@255	3923 \| _ => false
adamc@255	3924
adamc@255	3925 val (vis, gs) = ListUtil.foldlMap
adamc@255	3926 (fn ((x, co, e), gs) =>
adamc@255	3927 let
adamc@255	3928 val (c', _, gs1) = case co of
adam@1639	3929 NONE => (cunif env (loc, ktype), ktype, [])
adamc@255	3930 \| SOME c => elabCon (env, denv) c
adamc@674	3931 val c' = normClassConstraint env c'
adamc@255	3932 in
adamc@255	3933 ((x, c', e), enD gs1 @ gs)
adamc@280	3934 end) gs vis
adamc@255	3935
adamc@255	3936 val (vis, env) = ListUtil.foldlMap (fn ((x, c', e), env) =>
adamc@255	3937 let
adamc@255	3938 val (env, n) = E.pushENamed env x c'
adamc@255	3939 in
adamc@255	3940 ((x, n, c', e), env)
adamc@255	3941 end) env vis
adamc@255	3942
adamc@255	3943 val (vis, gs) = ListUtil.foldlMap (fn ((x, n, c', e), gs) =>
adamc@255	3944 let
adamc@255	3945 val (e', et, gs1) = elabExp (env, denv) e
adamc@255	3946 in
adamc@628	3947 checkCon env e' et c';
adamc@255	3948 if allowable e then
adamc@255	3949 ()
adamc@255	3950 else
adamc@255	3951 expError env (IllegalRec (x, e'));
adamc@628	3952 ((x, n, c', e'), gs1 @ gs)
adamc@255	3953 end) gs vis
adam@1736	3954
adam@1736	3955 val vis = map (fn (x, n, t, e) => (x, n, normClassConstraint env t, e)) vis
adam@1736	3956 val d = (L'.DValRec vis, loc)
adamc@255	3957 in
adam@1736	3958 ([d], (E.declBinds env d, denv, gs))
adamc@255	3959 end
adamc@255	3960
adamc@255	3961 \| L.DSgn (x, sgn) =>
adamc@255	3962 let
adamc@255	3963 val (sgn', gs') = elabSgn (env, denv) sgn
adamc@255	3964 val (env', n) = E.pushSgnNamed env x sgn'
adamc@255	3965 in
adamc@255	3966 ([(L'.DSgn (x, n, sgn'), loc)], (env', denv, enD gs' @ gs))
adamc@255	3967 end
adamc@255	3968
adam@1868	3969 \| L.DStr (x, sgno, tmo, str, _) =>
adam@1732	3970 (case ModDb.lookup dAll of
adam@1732	3971 SOME d =>
adam@1732	3972 let
adam@1744	3973 val () = if !verbose then TextIO.print ("REUSE: " ^ x ^ "\n") else ()
adam@1732	3974 val env' = E.declBinds env d
adam@1732	3975 val denv' = dopenConstraints (loc, env', denv) {str = x, strs = []}
adam@1732	3976 in
adam@1738	3977 ([d], (env', denv', gs))
adam@1732	3978 end
adam@1732	3979 \| NONE =>
adam@1732	3980 let
adam@1744	3981 val () = if !verbose then TextIO.print ("CHECK: " ^ x ^ "\n") else ()
adam@1744	3982
adam@1732	3983 val () = if x = "Basis" then
adam@1732	3984 raise Fail "Not allowed to redefine structure 'Basis'"
adam@1732	3985 else
adam@1732	3986 ()
adam@1732	3987
adam@1732	3988 val formal = Option.map (elabSgn (env, denv)) sgno
adam@1732	3989
adam@1732	3990 val (str', sgn', gs') =
adam@1732	3991 case formal of
adam@1732	3992 NONE =>
adam@1732	3993 let
adam@1732	3994 val (str', actual, gs') = elabStr (env, denv) str
adam@1732	3995 in
adam@1732	3996 (str', selfifyAt env {str = str', sgn = actual}, gs')
adam@1732	3997 end
adam@1732	3998 \| SOME (formal, gs1) =>
adam@1732	3999 let
adam@1732	4000 val str = wildifyStr env (str, formal)
adam@1732	4001 val (str', actual, gs2) = elabStr (env, denv) str
adam@1732	4002 in
adam@1732	4003 subSgn env loc (selfifyAt env {str = str', sgn = actual}) formal;
adam@1732	4004 (str', formal, enD gs1 @ gs2)
adam@1732	4005 end
adam@1732	4006
adam@1732	4007 val (env', n) = E.pushStrNamed env x sgn'
adam@1883	4008
adam@1732	4009 val denv' =
adam@1732	4010 case #1 str' of
adam@1732	4011 L'.StrConst _ => dopenConstraints (loc, env', denv) {str = x, strs = []}
adam@1732	4012 \| L'.StrApp _ => dopenConstraints (loc, env', denv) {str = x, strs = []}
adam@1732	4013 \| _ => denv
adam@1732	4014
adam@1732	4015 val dNew = (L'.DStr (x, n, sgn', str'), loc)
adam@1732	4016 in
adam@1732	4017 case #1 (hnormSgn env sgn') of
adam@1732	4018 L'.SgnFun _ =>
adam@1732	4019 (case #1 str' of
adam@1732	4020 L'.StrFun _ => ()
adam@1732	4021 \| _ => strError env (FunctorRebind loc))
adam@1732	4022 \| _ => ();
adam@1732	4023 Option.map (fn tm => ModDb.insert (dNew, tm)) tmo;
adam@1732	4024 ([dNew], (env', denv', gs' @ gs))
adam@1732	4025 end)
adam@1732	4026
adam@1733	4027 \| L.DFfiStr (x, sgn, tmo) =>
adam@1732	4028 (case ModDb.lookup dAll of
adam@1732	4029 SOME d =>
adam@1732	4030 let
adam@1732	4031 val env' = E.declBinds env d
adam@1732	4032 val denv' = dopenConstraints (loc, env', denv) {str = x, strs = []}
adam@1732	4033 in
adam@1732	4034 ([d], (env', denv', []))
adam@1732	4035 end
adam@1732	4036 \| NONE =>
adam@1732	4037 let
adam@1732	4038 val (sgn', gs') = elabSgn (env, denv) sgn
adam@1732	4039
adam@1732	4040 val (env', n) = E.pushStrNamed env x sgn'
adam@1732	4041
adam@1732	4042 val dNew = (L'.DFfiStr (x, n, sgn'), loc)
adam@1732	4043 in
adam@1733	4044 Option.map (fn tm => ModDb.insert (dNew, tm)) tmo;
adam@1732	4045 ([dNew], (env', denv, enD gs' @ gs))
adam@1732	4046 end)
adamc@255	4047
adamc@255	4048 \| L.DOpen (m, ms) =>
adamc@255	4049 (case E.lookupStr env m of
adamc@255	4050 NONE => (strError env (UnboundStr (loc, m));
adamc@255	4051 ([], (env, denv, gs)))
adamc@255	4052 \| SOME (n, sgn) =>
adamc@255	4053 let
adamc@1030	4054 val (str, sgn) = foldl (fn (m, (str, sgn)) =>
adamc@1030	4055 case E.projectStr env {str = str, sgn = sgn, field = m} of
adamc@1030	4056 NONE => (strError env (UnboundStr (loc, m));
adamc@1030	4057 (strerror, sgnerror))
adamc@1030	4058 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adamc@1030	4059 ((L'.StrVar n, loc), sgn) ms
adamc@1030	4060
adamc@1030	4061 val sgn = selfifyAt env {str = str, sgn = sgn}
adamc@255	4062
adamc@628	4063 val (ds, env') = dopen env {str = n, strs = ms, sgn = sgn}
adamc@628	4064 val denv' = dopenConstraints (loc, env', denv) {str = m, strs = ms}
adamc@255	4065 in
adamc@255	4066 (ds, (env', denv', gs))
adamc@255	4067 end)
adamc@255	4068
adamc@255	4069 \| L.DConstraint (c1, c2) =>
adamc@255	4070 let
adamc@255	4071 val (c1', k1, gs1) = elabCon (env, denv) c1
adamc@255	4072 val (c2', k2, gs2) = elabCon (env, denv) c2
adamc@255	4073 val gs3 = D.prove env denv (c1', c2', loc)
adamc@255	4074
adamc@628	4075 val denv' = D.assert env denv (c1', c2')
adamc@255	4076 in
adam@1639	4077 checkKind env c1' k1 (L'.KRecord (kunif env loc), loc);
adam@1639	4078 checkKind env c2' k2 (L'.KRecord (kunif env loc), loc);
adamc@255	4079
adamc@628	4080 ([(L'.DConstraint (c1', c2'), loc)], (env, denv', enD gs1 @ enD gs2 @ enD gs3 @ gs))
adamc@255	4081 end
adamc@255	4082
adamc@255	4083 \| L.DOpenConstraints (m, ms) =>
adamc@255	4084 let
adamc@255	4085 val denv = dopenConstraints (loc, env, denv) {str = m, strs = ms}
adamc@255	4086 in
adamc@255	4087 ([], (env, denv, gs))
adamc@255	4088 end
adamc@255	4089
adamc@255	4090 \| L.DExport str =>
adamc@255	4091 let
adamc@255	4092 val (str', sgn, gs') = elabStr (env, denv) str
adamc@255	4093
adamc@255	4094 val sgn =
adamc@255	4095 case #1 (hnormSgn env sgn) of
adamc@255	4096 L'.SgnConst sgis =>
adamc@255	4097 let
adamc@255	4098 fun doOne (all as (sgi, _), env) =
adamc@255	4099 (case sgi of
adamc@255	4100 L'.SgiVal (x, n, t) =>
adamc@325	4101 let
adamc@325	4102 fun doPage (makeRes, ran) =
adamc@628	4103 case hnormCon env ran of
adamc@628	4104 (L'.CApp (tf, arg), _) =>
adamc@628	4105 (case (hnormCon env tf, hnormCon env arg) of
adamc@628	4106 ((L'.CModProj (basis, [], "transaction"), _),
adamc@720	4107 (L'.CApp (tf, arg3), _)) =>
adamc@325	4108 (case (basis = !basis_r,
adamc@720	4109 hnormCon env tf, hnormCon env arg3) of
adamc@325	4110 (true,
adamc@720	4111 (L'.CApp (tf, arg2), _),
adamc@628	4112 ((L'.CRecord (_, []), _))) =>
adamc@720	4113 (case (hnormCon env tf) of
adamc@720	4114 (L'.CApp (tf, arg1), _) =>
adamc@720	4115 (case (hnormCon env tf,
adamc@720	4116 hnormCon env arg1,
adamc@720	4117 hnormCon env arg2) of
adamc@720	4118 (tf, arg1,
adamc@720	4119 (L'.CRecord (_, []), _)) =>
adamc@720	4120 let
adamc@720	4121 val t = (L'.CApp (tf, arg1), loc)
adamc@720	4122 val t = (L'.CApp (t, arg2), loc)
adamc@720	4123 val t = (L'.CApp (t, arg3), loc)
adamc@720	4124 val t = (L'.CApp (
adamc@720	4125 (L'.CModProj
adamc@720	4126 (basis, [], "transaction"), loc),
adamc@325	4127 t), loc)
adam@1347	4128
adam@1347	4129 fun normArgs t =
adam@1347	4130 case hnormCon env t of
adam@1347	4131 (L'.TFun (dom, ran), loc) =>
adam@1347	4132 (L'.TFun (hnormCon env dom, normArgs ran), loc)
adam@1347	4133 \| t' => t'
adamc@720	4134 in
adam@1347	4135 (L'.SgiVal (x, n, normArgs (makeRes t)), loc)
adamc@720	4136 end
adamc@325	4137 \| _ => all)
adamc@325	4138 \| _ => all)
adamc@325	4139 \| _ => all)
adamc@325	4140 \| _ => all)
adamc@325	4141 \| _ => all
adamc@325	4142 in
adamc@628	4143 case hnormCon env t of
adamc@628	4144 (L'.TFun (dom, ran), _) =>
adamc@628	4145 (case hnormCon env dom of
adamc@628	4146 (L'.TRecord domR, _) =>
adamc@325	4147 doPage (fn t => (L'.TFun ((L'.TRecord domR,
adamc@325	4148 loc),
adamc@325	4149 t), loc), ran)
adamc@325	4150 \| _ => all)
adamc@325	4151 \| _ => doPage (fn t => t, t)
adamc@325	4152 end
adamc@255	4153 \| _ => all,
adamc@255	4154 E.sgiBinds env all)
adamc@255	4155 in
adamc@255	4156 (L'.SgnConst (#1 (ListUtil.foldlMap doOne env sgis)), loc)
adamc@255	4157 end
adamc@255	4158 \| _ => sgn
adamc@255	4159 in
adamc@255	4160 ([(L'.DExport (E.newNamed (), sgn, str'), loc)], (env, denv, gs' @ gs))
adamc@255	4161 end
adamc@255	4162
adamc@707	4163 \| L.DTable (x, c, pe, ce) =>
adamc@255	4164 let
adamc@707	4165 val cstK = (L'.KRecord (L'.KRecord (L'.KUnit, loc), loc), loc)
adamc@707	4166
adamc@255	4167 val (c', k, gs') = elabCon (env, denv) c
adam@1639	4168 val pkey = cunif env (loc, cstK)
adam@1639	4169 val uniques = cunif env (loc, cstK)
adamc@705	4170
adamc@705	4171 val ct = tableOf ()
adamc@705	4172 val ct = (L'.CApp (ct, c'), loc)
adamc@707	4173 val ct = (L'.CApp (ct, (L'.CConcat (pkey, uniques), loc)), loc)
adamc@705	4174
adamc@705	4175 val (env, n) = E.pushENamed env x ct
adamc@707	4176 val (pe', pet, gs'') = elabExp (env, denv) pe
adamc@707	4177 val (ce', cet, gs''') = elabExp (env, denv) ce
adamc@707	4178
adamc@707	4179 val pst = (L'.CModProj (!basis_r, [], "primary_key"), loc)
adamc@707	4180 val pst = (L'.CApp (pst, c'), loc)
adamc@707	4181 val pst = (L'.CApp (pst, pkey), loc)
adamc@704	4182
adamc@704	4183 val cst = (L'.CModProj (!basis_r, [], "sql_constraints"), loc)
adamc@704	4184 val cst = (L'.CApp (cst, c'), loc)
adamc@705	4185 val cst = (L'.CApp (cst, uniques), loc)
adamc@255	4186 in
adamc@255	4187 checkKind env c' k (L'.KRecord (L'.KType, loc), loc);
adamc@707	4188 checkCon env pe' pet pst;
adamc@707	4189 checkCon env ce' cet cst;
adamc@707	4190 ([(L'.DTable (!basis_r, x, n, c', pe', pkey, ce', uniques), loc)],
adamc@707	4191 (env, denv, gs''' @ gs'' @ enD gs' @ gs))
adamc@255	4192 end
adamc@338	4193 \| L.DSequence x =>
adamc@338	4194 let
adamc@338	4195 val (env, n) = E.pushENamed env x (sequenceOf ())
adamc@338	4196 in
adamc@338	4197 ([(L'.DSequence (!basis_r, x, n), loc)], (env, denv, gs))
adamc@338	4198 end
adamc@754	4199 \| L.DView (x, e) =>
adamc@754	4200 let
adamc@754	4201 val (e', t, gs') = elabExp (env, denv) e
adamc@754	4202
adamc@754	4203 val k = (L'.KRecord (L'.KType, loc), loc)
adam@1639	4204 val fs = cunif env (loc, k)
adam@1639	4205 val ts = cunif env (loc, (L'.KRecord k, loc))
adamc@754	4206 val tf = (L'.CApp ((L'.CMap (k, k), loc),
adamc@754	4207 (L'.CAbs ("_", k, (L'.CRecord ((L'.KType, loc), []), loc)), loc)), loc)
adamc@754	4208 val ts = (L'.CApp (tf, ts), loc)
adamc@754	4209
adamc@754	4210 val cv = viewOf ()
adamc@754	4211 val cv = (L'.CApp (cv, fs), loc)
adamc@754	4212 val (env', n) = E.pushENamed env x cv
adamc@754	4213
adamc@754	4214 val ct = queryOf ()
adamc@1191	4215 val ct = (L'.CApp (ct, (L'.CRecord ((L'.KRecord (L'.KType, loc), loc), []), loc)), loc)
adam@1395	4216 val ct = (L'.CApp (ct, (L'.CRecord ((L'.KRecord (L'.KType, loc), loc), []), loc)), loc)
adamc@754	4217 val ct = (L'.CApp (ct, ts), loc)
adamc@754	4218 val ct = (L'.CApp (ct, fs), loc)
adamc@754	4219 in
adamc@754	4220 checkCon env e' t ct;
adamc@754	4221 ([(L'.DView (!basis_r, x, n, e', fs), loc)],
adamc@754	4222 (env', denv, gs' @ gs))
adamc@754	4223 end
adamc@255	4224
adamc@280	4225 \| L.DDatabase s => ([(L'.DDatabase s, loc)], (env, denv, gs))
adamc@280	4226
adamc@459	4227 \| L.DCookie (x, c) =>
adamc@459	4228 let
adamc@459	4229 val (c', k, gs') = elabCon (env, denv) c
adamc@459	4230 val (env, n) = E.pushENamed env x (L'.CApp (cookieOf (), c'), loc)
adamc@459	4231 in
adamc@459	4232 checkKind env c' k (L'.KType, loc);
adamc@459	4233 ([(L'.DCookie (!basis_r, x, n, c'), loc)], (env, denv, enD gs' @ gs))
adamc@459	4234 end
adamc@720	4235 \| L.DStyle x =>
adamc@718	4236 let
adamc@720	4237 val (env, n) = E.pushENamed env x (styleOf ())
adamc@718	4238 in
adamc@720	4239 ([(L'.DStyle (!basis_r, x, n), loc)], (env, denv, gs))
adamc@718	4240 end
adamc@1075	4241 \| L.DTask (e1, e2) =>
adamc@1073	4242 let
adamc@1075	4243 val (e1', t1, gs1) = elabExp (env, denv) e1
adamc@1075	4244 val (e2', t2, gs2) = elabExp (env, denv) e2
adamc@1075	4245
adam@1639	4246 val targ = cunif env (loc, (L'.KType, loc))
adam@1348	4247
adamc@1075	4248 val t1' = (L'.CModProj (!basis_r, [], "task_kind"), loc)
adam@1348	4249 val t1' = (L'.CApp (t1', targ), loc)
adam@1348	4250
adamc@1075	4251 val t2' = (L'.CApp ((L'.CModProj (!basis_r, [], "transaction"), loc),
adamc@1075	4252 (L'.TRecord (L'.CRecord ((L'.KType, loc), []), loc), loc)), loc)
adam@1348	4253 val t2' = (L'.TFun (targ, t2'), loc)
adamc@1073	4254 in
adamc@1075	4255 checkCon env e1' t1 t1';
adamc@1075	4256 checkCon env e2' t2 t2';
adamc@1075	4257 ([(L'.DTask (e1', e2'), loc)], (env, denv, gs2 @ gs1 @ gs))
adamc@1073	4258 end
adamc@1199	4259 \| L.DPolicy e1 =>
adamc@1199	4260 let
adamc@1199	4261 val (e1', t1, gs1) = elabExp (env, denv) e1
adamc@1199	4262
adamc@1199	4263 val t1' = (L'.CModProj (!basis_r, [], "sql_policy"), loc)
adamc@1199	4264 in
adamc@1199	4265 checkCon env e1' t1 t1';
adamc@1199	4266 ([(L'.DPolicy e1', loc)], (env, denv, gs1 @ gs))
adamc@1199	4267 end
adamc@459	4268
adam@1294	4269 \| L.DOnError (m1, ms, s) =>
adam@1294	4270 (case E.lookupStr env m1 of
adam@1294	4271 NONE => (expError env (UnboundStrInExp (loc, m1));
adam@1294	4272 ([], (env, denv, [])))
adam@1294	4273 \| SOME (n, sgn) =>
adam@1294	4274 let
adam@1294	4275 val (str, sgn) = foldl (fn (m, (str, sgn)) =>
adam@1294	4276 case E.projectStr env {sgn = sgn, str = str, field = m} of
adam@1294	4277 NONE => (conError env (UnboundStrInCon (loc, m));
adam@1294	4278 (strerror, sgnerror))
adam@1294	4279 \| SOME sgn => ((L'.StrProj (str, m), loc), sgn))
adam@1294	4280 ((L'.StrVar n, loc), sgn) ms
adam@1294	4281
adam@1294	4282 val t = case E.projectVal env {sgn = sgn, str = str, field = s} of
adam@1294	4283 NONE => (expError env (UnboundExp (loc, s));
adam@1294	4284 cerror)
adam@1294	4285 \| SOME t => t
adam@1294	4286
adam@1294	4287 val page = (L'.CModProj (!basis_r, [], "page"), loc)
adam@1294	4288 val xpage = (L'.CApp ((L'.CModProj (!basis_r, [], "transaction"), loc), page), loc)
adam@1294	4289 val func = (L'.TFun ((L'.CModProj (!basis_r, [], "xbody"), loc), xpage), loc)
adam@1294	4290 in
adam@1407	4291 (unifyCons env loc t func
adam@1407	4292 handle CUnify _ => ErrorMsg.error "onError handler has wrong type.");
adam@1294	4293 ([(L'.DOnError (n, ms, s), loc)], (env, denv, gs))
adam@1294	4294 end)
adam@1294	4295
adamc@280	4296 (val tcs = List.filter (fn TypeClass _ => true \| _ => false) (#3 (#2 r)))
adamc@255	4297 in
adamc@904	4298 (prefaces "/elabDecl" [("d", SourcePrint.p_decl dAll)];)
adamc@255	4299 r
adamc@255	4300 end
adamc@211	4301
adamc@83	4302 and elabStr (env, denv) (str, loc) =
adamc@31	4303 case str of
adamc@31	4304 L.StrConst ds =>
adamc@31	4305 let
adamc@88	4306 val (ds', (_, _, gs)) = ListUtil.foldlMapConcat elabDecl (env, denv, []) ds
adamc@123	4307 val sgis = ListUtil.mapConcat sgiOfDecl ds'
adamc@63	4308
adamc@63	4309 val (sgis, _, _, _, _) =
adamc@64	4310 foldr (fn ((sgi, loc), (sgis, cons, vals, sgns, strs)) =>
adamc@63	4311 case sgi of
adamc@64	4312 L'.SgiConAbs (x, n, k) =>
adamc@64	4313 let
adamc@64	4314 val (cons, x) =
adamc@64	4315 if SS.member (cons, x) then
adamc@64	4316 (cons, "?" ^ x)
adamc@64	4317 else
adamc@64	4318 (SS.add (cons, x), x)
adamc@64	4319 in
adamc@64	4320 ((L'.SgiConAbs (x, n, k), loc) :: sgis, cons, vals, sgns, strs)
adamc@64	4321 end
adamc@64	4322 \| L'.SgiCon (x, n, k, c) =>
adamc@64	4323 let
adamc@64	4324 val (cons, x) =
adamc@64	4325 if SS.member (cons, x) then
adamc@64	4326 (cons, "?" ^ x)
adamc@64	4327 else
adamc@64	4328 (SS.add (cons, x), x)
adamc@64	4329 in
adamc@64	4330 ((L'.SgiCon (x, n, k, c), loc) :: sgis, cons, vals, sgns, strs)
adamc@64	4331 end
adamc@805	4332 \| L'.SgiDatatype dts =>
adamc@156	4333 let
adamc@805	4334 fun doOne ((x, n, xs, xncs), (cons, vals)) =
adamc@805	4335 let
adamc@805	4336 val (cons, x) =
adamc@805	4337 if SS.member (cons, x) then
adamc@805	4338 (cons, "?" ^ x)
adamc@156	4339 else
adamc@805	4340 (SS.add (cons, x), x)
adamc@805	4341
adamc@805	4342 val (xncs, vals) =
adamc@805	4343 ListUtil.foldlMap
adamc@805	4344 (fn ((x, n, t), vals) =>
adamc@805	4345 if SS.member (vals, x) then
adamc@805	4346 (("?" ^ x, n, t), vals)
adamc@805	4347 else
adamc@805	4348 ((x, n, t), SS.add (vals, x)))
adamc@805	4349 vals xncs
adamc@805	4350 in
adamc@805	4351 ((x, n, xs, xncs), (cons, vals))
adamc@805	4352 end
adamc@805	4353
adamc@805	4354 val (dts, (cons, vals)) = ListUtil.foldlMap doOne (cons, vals) dts
adamc@156	4355 in
adamc@805	4356 ((L'.SgiDatatype dts, loc) :: sgis, cons, vals, sgns, strs)
adamc@156	4357 end
adamc@191	4358 \| L'.SgiDatatypeImp (x, n, m1, ms, x', xs, xncs) =>
adamc@156	4359 let
adamc@156	4360 val (cons, x) =
adamc@156	4361 if SS.member (cons, x) then
adamc@156	4362 (cons, "?" ^ x)
adamc@156	4363 else
adamc@156	4364 (SS.add (cons, x), x)
adamc@156	4365 in
adamc@191	4366 ((L'.SgiDatatypeImp (x, n, m1, ms, x', xs, xncs), loc) :: sgis, cons, vals, sgns, strs)
adamc@156	4367 end
adamc@64	4368 \| L'.SgiVal (x, n, c) =>
adamc@64	4369 let
adamc@64	4370 val (vals, x) =
adamc@64	4371 if SS.member (vals, x) then
adamc@64	4372 (vals, "?" ^ x)
adamc@64	4373 else
adamc@64	4374 (SS.add (vals, x), x)
adamc@64	4375 in
adamc@64	4376 ((L'.SgiVal (x, n, c), loc) :: sgis, cons, vals, sgns, strs)
adamc@64	4377 end
adamc@64	4378 \| L'.SgiSgn (x, n, sgn) =>
adamc@64	4379 let
adamc@64	4380 val (sgns, x) =
adamc@64	4381 if SS.member (sgns, x) then
adamc@64	4382 (sgns, "?" ^ x)
adamc@64	4383 else
adamc@64	4384 (SS.add (sgns, x), x)
adamc@64	4385 in
adamc@64	4386 ((L'.SgiSgn (x, n, sgn), loc) :: sgis, cons, vals, sgns, strs)
adamc@64	4387 end
adamc@64	4388
adamc@64	4389 \| L'.SgiStr (x, n, sgn) =>
adamc@64	4390 let
adamc@64	4391 val (strs, x) =
adamc@64	4392 if SS.member (strs, x) then
adamc@64	4393 (strs, "?" ^ x)
adamc@64	4394 else
adamc@64	4395 (SS.add (strs, x), x)
adamc@64	4396 in
adamc@64	4397 ((L'.SgiStr (x, n, sgn), loc) :: sgis, cons, vals, sgns, strs)
adamc@88	4398 end
adamc@203	4399 \| L'.SgiConstraint _ => ((sgi, loc) :: sgis, cons, vals, sgns, strs)
adamc@563	4400 \| L'.SgiClassAbs (x, n, k) =>
adamc@211	4401 let
adamc@211	4402 val (cons, x) =
adamc@211	4403 if SS.member (cons, x) then
adamc@211	4404 (cons, "?" ^ x)
adamc@211	4405 else
adamc@211	4406 (SS.add (cons, x), x)
adamc@211	4407 in
adamc@563	4408 ((L'.SgiClassAbs (x, n, k), loc) :: sgis, cons, vals, sgns, strs)
adamc@211	4409 end
adamc@563	4410 \| L'.SgiClass (x, n, k, c) =>
adamc@211	4411 let
adamc@211	4412 val (cons, x) =
adamc@211	4413 if SS.member (cons, x) then
adamc@211	4414 (cons, "?" ^ x)
adamc@211	4415 else
adamc@211	4416 (SS.add (cons, x), x)
adamc@211	4417 in
adamc@563	4418 ((L'.SgiClass (x, n, k, c), loc) :: sgis, cons, vals, sgns, strs)
adamc@203	4419 end)
adamc@64	4420
adamc@63	4421 ([], SS.empty, SS.empty, SS.empty, SS.empty) sgis
adamc@31	4422 in
adamc@83	4423 ((L'.StrConst ds', loc), (L'.SgnConst sgis, loc), gs)
adamc@31	4424 end
adamc@31	4425 \| L.StrVar x =>
adamc@31	4426 (case E.lookupStr env x of
adamc@31	4427 NONE =>
adamc@31	4428 (strError env (UnboundStr (loc, x));
adamc@83	4429 (strerror, sgnerror, []))
adamc@83	4430 \| SOME (n, sgn) => ((L'.StrVar n, loc), sgn, []))
adamc@34	4431 \| L.StrProj (str, x) =>
adamc@34	4432 let
adamc@83	4433 val (str', sgn, gs) = elabStr (env, denv) str
adamc@34	4434 in
adamc@34	4435 case E.projectStr env {str = str', sgn = sgn, field = x} of
adamc@34	4436 NONE => (strError env (UnboundStr (loc, x));
adamc@83	4437 (strerror, sgnerror, []))
adamc@83	4438 \| SOME sgn => ((L'.StrProj (str', x), loc), sgn, gs)
adamc@34	4439 end
adamc@41	4440 \| L.StrFun (m, dom, ranO, str) =>
adamc@41	4441 let
adamc@83	4442 val (dom', gs1) = elabSgn (env, denv) dom
adamc@41	4443 val (env', n) = E.pushStrNamed env m dom'
adamc@834	4444 val denv' = dopenConstraints (loc, env', denv) {str = m, strs = []}
adamc@834	4445 val (str', actual, gs2) = elabStr (env', denv') str
adamc@41	4446
adamc@83	4447 val (formal, gs3) =
adamc@41	4448 case ranO of
adamc@83	4449 NONE => (actual, [])
adamc@41	4450 \| SOME ran =>
adamc@41	4451 let
adamc@834	4452 val (ran', gs) = elabSgn (env', denv') ran
adamc@41	4453 in
adamc@1000	4454 subSgn env' loc actual ran';
adamc@83	4455 (ran', gs)
adamc@41	4456 end
adamc@41	4457 in
adamc@41	4458 ((L'.StrFun (m, n, dom', formal, str'), loc),
adamc@83	4459 (L'.SgnFun (m, n, dom', formal), loc),
adamc@228	4460 enD gs1 @ gs2 @ enD gs3)
adamc@41	4461 end
adamc@44	4462 \| L.StrApp (str1, str2) =>
adamc@44	4463 let
adamc@83	4464 val (str1', sgn1, gs1) = elabStr (env, denv) str1
adamc@325	4465 val str2 =
adamc@325	4466 case sgn1 of
adamc@325	4467 (L'.SgnFun (_, _, dom, _), _) =>
adamc@1275	4468 let
adamc@1275	4469 val s = wildifyStr env (str2, dom)
adamc@1275	4470 in
adamc@1275	4471 (Print.preface ("Wild", SourcePrint.p_str s);)
adamc@1275	4472 s
adamc@1275	4473 end
adamc@325	4474 \| _ => str2
adamc@83	4475 val (str2', sgn2, gs2) = elabStr (env, denv) str2
adamc@1270	4476 in
adamc@44	4477 case #1 (hnormSgn env sgn1) of
adamc@83	4478 L'.SgnError => (strerror, sgnerror, [])
adamc@44	4479 \| L'.SgnFun (m, n, dom, ran) =>
adamc@1000	4480 (subSgn env loc sgn2 dom;
adamc@44	4481 case #1 (hnormSgn env ran) of
adamc@83	4482 L'.SgnError => (strerror, sgnerror, [])
adamc@44	4483 \| L'.SgnConst sgis =>
adam@1968	4484 let
adam@1968	4485 (* This code handles a tricky case that led to a very nasty bug.
adam@1968	4486 * An invariant about signatures of elaborated modules is that no
adam@1968	4487 * identifier that could appear directly in a program is defined
adam@1968	4488 * twice. We add "?" in front of identifiers where necessary to
adam@1968	4489 * maintain the invariant, but the code below, to extend a functor
adam@1968	4490 * body with a binding for the functor argument, wasn't written
adam@1968	4491 * with the invariant in mind. Luckily for us, references to
adam@1968	4492 * an identifier later within a signature work by globally
adam@1968	4493 * unique index, so we just need to change the string name in the
adam@1968	4494 * new declaration. *)
adam@1968	4495 val m =
adam@1968	4496 if List.exists (fn (L'.SgiStr (x, _, _), _) => x = m
adam@1968	4497 \| _ => false) sgis then
adam@1968	4498 "?" ^ m
adam@1968	4499 else
adam@1968	4500 m
adam@1968	4501 in
adam@1968	4502 ((L'.StrApp (str1', str2'), loc),
adam@1968	4503 (L'.SgnConst ((L'.SgiStr (m, n, selfifyAt env {str = str2', sgn = sgn2}), loc) :: sgis), loc),
adam@1968	4504 gs1 @ gs2)
adam@1968	4505 end
adamc@44	4506 \| _ => raise Fail "Unable to hnormSgn in functor application")
adamc@44	4507 \| _ => (strError env (NotFunctor sgn1);
adamc@83	4508 (strerror, sgnerror, []))
adamc@44	4509 end
adamc@31	4510
adamc@987	4511 fun resolveClass env = E.resolveClass (hnormCon env) (consEq env dummy) env
adamc@833	4512
adam@1732	4513 fun elabFile basis basis_tm topStr topSgn top_tm env file =
adamc@56	4514 let
adam@1737	4515 val () = ModDb.snapshot ()
adam@1737	4516
adamc@713	4517 val () = mayDelay := true
adamc@713	4518 val () = delayedUnifs := []
adamc@830	4519 val () = delayedExhaustives := []
adamc@713	4520
adam@1733	4521 val d = (L.DFfiStr ("Basis", (L.SgnConst basis, ErrorMsg.dummySpan), SOME basis_tm), ErrorMsg.dummySpan)
adam@1732	4522 val (basis_n, env', sgn) =
adam@1733	4523 case (if !incremental then ModDb.lookup d else NONE) of
adam@1732	4524 NONE =>
adam@1732	4525 let
adam@1732	4526 val (sgn, gs) = elabSgn (env, D.empty) (L.SgnConst basis, ErrorMsg.dummySpan)
adam@1732	4527 val () = case gs of
adam@1732	4528 [] => ()
adam@1732	4529 \| _ => (app (fn (_, env, _, c1, c2) =>
adam@1732	4530 prefaces "Unresolved"
adam@1732	4531 [("c1", p_con env c1),
adam@1732	4532 ("c2", p_con env c2)]) gs;
adam@1732	4533 raise Fail "Unresolved disjointness constraints in Basis")
adam@1732	4534
adam@1732	4535 val (env', basis_n) = E.pushStrNamed env "Basis" sgn
adam@1732	4536 in
adam@1732	4537 ModDb.insert ((L'.DFfiStr ("Basis", basis_n, sgn), ErrorMsg.dummySpan), basis_tm);
adam@1732	4538 (basis_n, env', sgn)
adam@1732	4539 end
adam@1732	4540 \| SOME (d' as (L'.DFfiStr (_, basis_n, sgn), _)) =>
adam@1732	4541 (basis_n, E.pushStrNamedAs env "Basis" basis_n sgn, sgn)
adam@1732	4542 \| _ => raise Fail "Elaborate: Basis impossible"
adam@1732	4543
adamc@210	4544 val () = basis_r := basis_n
adamc@628	4545 val (ds, env') = dopen env' {str = basis_n, strs = [], sgn = sgn}
adamc@56	4546
adamc@56	4547 fun discoverC r x =
adamc@56	4548 case E.lookupC env' x of
adamc@56	4549 E.NotBound => raise Fail ("Constructor " ^ x ^ " unbound in Basis")
adamc@56	4550 \| E.Rel _ => raise Fail ("Constructor " ^ x ^ " bound relatively in Basis")
adamc@56	4551 \| E.Named (n, (_, loc)) => r := (L'.CNamed n, loc)
adamc@56	4552
adamc@56	4553 val () = discoverC int "int"
adamc@56	4554 val () = discoverC float "float"
adamc@56	4555 val () = discoverC string "string"
adamc@821	4556 val () = discoverC char "char"
adamc@203	4557 val () = discoverC table "sql_table"
adamc@56	4558
adam@1732	4559 val d = (L.DStr ("Top", SOME (L.SgnConst topSgn, ErrorMsg.dummySpan),
adam@1732	4560 SOME (if Time.< (top_tm, basis_tm) then basis_tm else top_tm),
adam@1868	4561 (L.StrConst topStr, ErrorMsg.dummySpan), false), ErrorMsg.dummySpan)
adam@1732	4562 val (top_n, env', topSgn, topStr) =
adam@1733	4563 case (if !incremental then ModDb.lookup d else NONE) of
adam@1732	4564 NONE =>
adam@1732	4565 let
adam@1732	4566 val (topSgn, gs) = elabSgn (env', D.empty) (L.SgnConst topSgn, ErrorMsg.dummySpan)
adam@1732	4567 val () = case gs of
adam@1732	4568 [] => ()
adam@1732	4569 \| _ => raise Fail "Unresolved disjointness constraints in top.urs"
adam@1732	4570 val (topStr, topSgn', gs) = elabStr (env', D.empty) (L.StrConst topStr, ErrorMsg.dummySpan)
adam@1732	4571
adam@1732	4572 val () = case gs of
adam@1732	4573 [] => ()
adam@1732	4574 \| _ => app (fn Disjoint (loc, env, denv, c1, c2) =>
adam@1732	4575 (case D.prove env denv (c1, c2, loc) of
adam@1732	4576 [] => ()
adam@1732	4577 \| _ =>
adam@1732	4578 (prefaces "Unresolved constraint in top.ur"
adam@1732	4579 [("loc", PD.string (ErrorMsg.spanToString loc)),
adam@1732	4580 ("c1", p_con env c1),
adam@1732	4581 ("c2", p_con env c2)];
adam@1732	4582 raise Fail "Unresolved constraint in top.ur"))
adam@1732	4583 \| TypeClass (env, c, r, loc) =>
adam@1732	4584 let
adam@1732	4585 val c = normClassKey env c
adam@1732	4586 in
adam@1732	4587 case resolveClass env c of
adam@1732	4588 SOME e => r := SOME e
adam@1732	4589 \| NONE => expError env (Unresolvable (loc, c))
adam@1732	4590 end) gs
adam@1732	4591
adam@1732	4592 val () = subSgn env' ErrorMsg.dummySpan topSgn' topSgn
adam@1732	4593
adam@1732	4594 val (env', top_n) = E.pushStrNamed env' "Top" topSgn
adam@1732	4595 in
adam@1732	4596 ModDb.insert ((L'.DStr ("Top", top_n, topSgn, topStr), ErrorMsg.dummySpan), top_tm);
adam@1732	4597 (top_n, env', topSgn, topStr)
adam@1732	4598 end
adam@1732	4599 \| SOME (d' as (L'.DStr (_, top_n, topSgn, topStr), _)) =>
adam@1732	4600 (top_n, E.declBinds env' d', topSgn, topStr)
adam@1732	4601 \| _ => raise Fail "Elaborate: Top impossible"
adam@1732	4602
adamc@633	4603 val () = top_r := top_n
adamc@325	4604
adamc@628	4605 val (ds', env') = dopen env' {str = top_n, strs = [], sgn = topSgn}
adamc@325	4606
adam@1883	4607 fun elabDecl' x =
adam@1883	4608 (resetKunif ();
adam@1883	4609 resetCunif ();
adam@1883	4610 elabDecl x)
adam@1883	4611
adam@1883	4612 val (file, (env'', _, gs)) = ListUtil.foldlMapConcat elabDecl' (env', D.empty, []) file
adamc@753	4613
adamc@777	4614 fun oneSummaryRound () =
adamc@777	4615 if ErrorMsg.anyErrors () then
adamc@777	4616 ()
adamc@777	4617 else
adamc@777	4618 let
adamc@777	4619 val delayed = !delayedUnifs
adamc@777	4620 in
adamc@777	4621 delayedUnifs := [];
adamc@777	4622 app (fn (loc, env, k, s1, s2) =>
adamc@777	4623 unifySummaries env (loc, k, normalizeRecordSummary env s1, normalizeRecordSummary env s2))
adamc@777	4624 delayed
adamc@777	4625 end
adam@1576	4626
adam@1576	4627 val checkConstraintErrors = ref (fn () => ())
adam@1723	4628 fun stopHere () = not (!unifyMore) andalso ErrorMsg.anyErrors ()
adamc@56	4629 in
adamc@777	4630 oneSummaryRound ();
adamc@753	4631
adam@1723	4632 if stopHere () then
adamc@753	4633 ()
adamc@753	4634 else
adamc@753	4635 let
adam@1767	4636 fun solver (gs : constraint list) =
adamc@753	4637 let
adamc@753	4638 val (gs, solved) =
adamc@753	4639 ListUtil.foldlMapPartial
adam@1767	4640 (fn (g : constraint, solved) =>
adamc@753	4641 case g of
adamc@753	4642 Disjoint (loc, env, denv, c1, c2) =>
adamc@753	4643 (case D.prove env denv (c1, c2, loc) of
adamc@753	4644 [] => (NONE, true)
adamc@753	4645 \| _ => (SOME g, solved))
adamc@753	4646 \| TypeClass (env, c, r, loc) =>
adamc@753	4647 let
adamc@753	4648 fun default () = (SOME g, solved)
adam@1767	4649
adam@1767	4650 fun resolver r c =
adam@1767	4651 let
adam@1767	4652 val c = normClassKey env c
adam@1767	4653 in
adam@1767	4654 case resolveClass env c of
adam@1767	4655 SOME e => (r := SOME e;
adam@1767	4656 (NONE, true))
adam@1767	4657 \| NONE =>
adam@1767	4658 case #1 (hnormCon env c) of
adam@1767	4659 L'.CApp (f, x) =>
adam@1767	4660 (case (#1 (hnormCon env f), #1 (hnormCon env x)) of
adam@1767	4661 (L'.CKApp (f, _), L'.CRecord (k, xcs)) =>
adam@1767	4662 (case #1 (hnormCon env f) of
adam@1767	4663 L'.CModProj (top_n', [], "folder") =>
adam@1767	4664 if top_n' = top_n then
adam@1767	4665 let
adam@1767	4666 val e = (L'.EModProj (top_n, ["Folder"], "nil"), loc)
adam@1767	4667 val e = (L'.EKApp (e, k), loc)
adam@1767	4668
adam@1767	4669 val (folder, _) = foldr (fn ((x, c), (folder, xcs)) =>
adam@1767	4670 let
adam@1767	4671 val e = (L'.EModProj (top_n, ["Folder"],
adam@1767	4672 "cons"), loc)
adam@1767	4673 val e = (L'.EKApp (e, k), loc)
adam@1767	4674 val e = (L'.ECApp (e,
adam@1767	4675 (L'.CRecord (k, xcs),
adam@1767	4676 loc)), loc)
adam@1767	4677 val e = (L'.ECApp (e, x), loc)
adam@1767	4678 val e = (L'.ECApp (e, c), loc)
adam@1767	4679 val e = (L'.EApp (e, folder), loc)
adam@1767	4680 in
adam@1767	4681 (e, (x, c) :: xcs)
adam@1767	4682 end)
adam@1767	4683 (e, []) xcs
adam@1767	4684 in
adam@1767	4685 (r := SOME folder;
adam@1767	4686 (NONE, true))
adam@1767	4687 end
adam@1767	4688 else
adam@1767	4689 default ()
adam@1767	4690 \| _ => default ())
adam@1767	4691 \| _ => default ())
adam@1767	4692
adam@1767	4693 \| L'.TRecord c' =>
adam@1767	4694 (case #1 (hnormCon env c') of
adam@1767	4695 L'.CRecord (_, xts) =>
adam@1767	4696 let
adam@1767	4697 val witnesses = map (fn (x, t) =>
adam@1767	4698 let
adam@1767	4699 val r = ref NONE
adam@1767	4700 val (opt, _) = resolver r t
adam@1767	4701 in
adam@1767	4702 case opt of
adam@1767	4703 SOME _ => NONE
adam@1767	4704 \| NONE =>
adam@1767	4705 case !r of
adam@1767	4706 NONE => NONE
adam@1767	4707 \| SOME e =>
adam@1767	4708 SOME (x, e, t)
adam@1767	4709 end) xts
adam@1767	4710 in
adam@1767	4711 if List.all Option.isSome witnesses then
adam@1767	4712 (r := SOME (L'.ERecord (map valOf witnesses), loc);
adam@1767	4713 (NONE, true))
adam@1767	4714 else
adam@1767	4715 (SOME g, solved)
adam@1767	4716 end
adam@1767	4717 \| _ => (SOME g, solved))
adam@1767	4718
adam@1767	4719 \| _ => default ()
adam@1767	4720 end
adamc@753	4721 in
adam@1767	4722 resolver r c
adamc@753	4723 end)
adamc@753	4724 false gs
adamc@753	4725 in
adamc@753	4726 case (gs, solved) of
adamc@753	4727 ([], _) => ()
adamc@777	4728 \| (_, true) => (oneSummaryRound (); solver gs)
adamc@753	4729 \| _ =>
adam@1576	4730 checkConstraintErrors :=
adam@1576	4731 (fn () => app (fn Disjoint (loc, env, denv, c1, c2) =>
adam@1576	4732 let
adam@1576	4733 val c1' = ElabOps.hnormCon env c1
adam@1576	4734 val c2' = ElabOps.hnormCon env c2
adam@1576	4735
adam@1576	4736 fun isUnif (c, _) =
adam@1576	4737 case c of
adam@1576	4738 L'.CUnif _ => true
adam@1576	4739 \| _ => false
adam@1576	4740
adam@1576	4741 fun maybeAttr (c, _) =
adam@1576	4742 case c of
adam@1576	4743 L'.CRecord ((L'.KType, _), xts) => true
adam@1576	4744 \| _ => false
adam@1576	4745 in
adam@1576	4746 ErrorMsg.errorAt loc "Couldn't prove field name disjointness";
adam@1576	4747 eprefaces' [("Con 1", p_con env c1),
adam@1576	4748 ("Con 2", p_con env c2),
adam@1576	4749 ("Hnormed 1", p_con env c1'),
adam@1576	4750 ("Hnormed 2", p_con env c2')]
adam@1576	4751
adam@1576	4752 (*app (fn (loc, env, k, s1, s2) =>
adam@1576	4753 eprefaces' [("s1", p_summary env (normalizeRecordSummary env s1)),
adam@1576	4754 ("s2", p_summary env (normalizeRecordSummary env s2))])
adam@1576	4755 (!delayedUnifs);*)
adam@1576	4756 end
adam@1576	4757 \| TypeClass (env, c, r, loc) =>
adam@1742	4758 let
adam@1742	4759 val c = normClassKey env c
adam@1742	4760 in
adam@1742	4761 case resolveClass env c of
adam@1767	4762 SOME e => r := SOME e
adam@1742	4763 \| NONE => expError env (Unresolvable (loc, c))
adam@1742	4764 end)
adam@1576	4765 gs)
adamc@753	4766 end
adamc@753	4767 in
adamc@753	4768 solver gs
adamc@753	4769 end;
adamc@753	4770
adamc@713	4771 mayDelay := false;
adamc@713	4772
adam@1723	4773 if stopHere () then
adamc@777	4774 ()
adamc@777	4775 else
adamc@777	4776 (app (fn (loc, env, k, s1, s2) =>
adamc@777	4777 unifySummaries env (loc, k, normalizeRecordSummary env s1, normalizeRecordSummary env s2)
adam@1719	4778 handle CUnify' (env', err) => (ErrorMsg.errorAt loc "Error in final record unification";
adam@1719	4779 cunifyError env' err;
adam@1719	4780 case !reducedSummaries of
adam@1719	4781 NONE => ()
adam@1719	4782 \| SOME (s1, s2) =>
adam@1719	4783 (ErrorMsg.errorAt loc "Stuck unifying these records after canceling matching pieces:";
adam@1719	4784 eprefaces' [("Have", s1),
adam@1719	4785 ("Need", s2)])))
adamc@777	4786 (!delayedUnifs);
adamc@777	4787 delayedUnifs := []);
adamc@713	4788
adam@1723	4789 if stopHere () then
adam@1346	4790 ()
adam@1346	4791 else
adam@1584	4792 if List.exists kunifsInDecl file then
adam@1584	4793 case U.File.findDecl kunifsInDecl file of
adam@1584	4794 NONE => ()
adam@1584	4795 \| SOME d => declError env'' (KunifsRemain [d])
adam@1584	4796 else
adam@1584	4797 ();
adam@1345	4798
adam@1723	4799 if stopHere () then
adam@1346	4800 ()
adam@1346	4801 else
adam@1584	4802 if List.exists cunifsInDecl file then
adam@1584	4803 case U.File.findDecl cunifsInDecl file of
adam@1584	4804 NONE => ()
adam@1584	4805 \| SOME d => declError env'' (CunifsRemain [d])
adam@1584	4806 else
adam@1584	4807 ();
adamc@750	4808
adam@1723	4809 if stopHere () then
adamc@830	4810 ()
adamc@830	4811 else
adamc@837	4812 app (fn all as (env, _, _, loc) =>
adamc@830	4813 case exhaustive all of
adamc@830	4814 NONE => ()
adamc@830	4815 \| SOME p => expError env (Inexhaustive (loc, p)))
adamc@830	4816 (!delayedExhaustives);
adamc@830	4817
adam@1723	4818 if stopHere () then
adam@1576	4819 ()
adam@1576	4820 else
adam@1576	4821 !checkConstraintErrors ();
adam@1576	4822
adamc@799	4823 (preface ("file", p_file env' file);)
adam@1531	4824
adam@1745	4825 if !dumpTypes orelse (!dumpTypesOnError andalso ErrorMsg.anyErrors ()) then
adam@1531	4826 let
adam@1531	4827 open L'
adam@1531	4828 open Print.PD
adam@1531	4829 open Print
adam@1531	4830
adam@1715	4831 fun p_con env c = ElabPrint.p_con env (ElabOps.reduceCon env c)
adam@1715	4832
adam@1531	4833 fun dumpDecl (d, env) =
adam@1531	4834 case #1 d of
adam@1531	4835 DCon (x, _, k, _) => (print (box [string x,
adam@1531	4836 space,
adam@1531	4837 string "::",
adam@1531	4838 space,
adam@1531	4839 p_kind env k,
adam@1531	4840 newline,
adam@1531	4841 newline]);
adam@1531	4842 E.declBinds env d)
adam@1531	4843 \| DVal (x, _, t, _) => (print (box [string x,
adam@1531	4844 space,
adam@1531	4845 string ":",
adam@1531	4846 space,
adam@1531	4847 p_con env t,
adam@1531	4848 newline,
adam@1531	4849 newline]);
adam@1531	4850 E.declBinds env d)
adam@1531	4851 \| DValRec vis => (app (fn (x, _, t, _) => print (box [string x,
adam@1531	4852 space,
adam@1531	4853 string ":",
adam@1531	4854 space,
adam@1531	4855 p_con env t,
adam@1531	4856 newline,
adam@1531	4857 newline])) vis;
adam@1531	4858 E.declBinds env d)
adam@1531	4859 \| DStr (x, _, _, str) => (print (box [string ("<" ^ x ^ ">"),
adam@1531	4860 newline,
adam@1531	4861 newline]);
adam@1531	4862 dumpStr (str, env);
adam@1531	4863 print (box [string ("</" ^ x ^ ">"),
adam@1531	4864 newline,
adam@1531	4865 newline]);
adam@1531	4866 E.declBinds env d)
adam@1531	4867 \| _ => E.declBinds env d
adam@1531	4868
adam@1531	4869 and dumpStr (str, env) =
adam@1531	4870 case #1 str of
adam@1531	4871 StrConst ds => ignore (foldl dumpDecl env ds)
adam@1531	4872 \| _ => ()
adam@1531	4873 in
adam@1531	4874 ignore (foldl dumpDecl env' file)
adam@1531	4875 end
adam@1531	4876 else
adam@1531	4877 ();
adam@1737	4878
adam@1737	4879 if ErrorMsg.anyErrors () then
adam@1737	4880 ModDb.revert ()
adam@1737	4881 else
adam@1737	4882 ();
adam@1912	4883
adam@1912	4884 (Print.preface("File", ElabPrint.p_file env file);)
adam@1345	4885
adamc@325	4886 (L'.DFfiStr ("Basis", basis_n, sgn), ErrorMsg.dummySpan)
adamc@325	4887 :: ds
adamc@325	4888 @ (L'.DStr ("Top", top_n, topSgn, topStr), ErrorMsg.dummySpan)
adamc@325	4889 :: ds' @ file
adamc@56	4890 end
adamc@2	4891
adamc@2	4892 end

Mercurial > urweb

annotate src/elaborate.sml @ 1986:b2254554542f