diff options
| author |  Adam Chlipala <adamc@hcoop.net> | 2008-07-29 12:30:04 -0400 |
|---|---|---|
| committer | Adam Chlipala <adamc@hcoop.net> | 2008-07-29 12:30:04 -0400 |
| commit | 4cbbb0bb751dd9e9dae9d6b621e563ee5c7ae1b4 (patch) | |
| tree | 13fe85f442a35d516a1591c98af5b85e0cf1f6b7 /src/expl_env.sml | |
| parent | 21f2ec92093d2b00afe3d36476f20f45b4d4a194 (diff) | |
Add datatype import constructor annotations; datatypes through explify
Diffstat (limited to 'src/expl_env.sml')
| -rw-r--r-- | src/expl_env.sml | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/src/expl_env.sml b/src/expl_env.sml index 1871e560..359c92a3 100644 --- a/src/expl_env.sml +++ b/src/expl_env.sml @@ -236,9 +236,28 @@ fun lookupStrNamed (env : env) n = NONE => raise UnboundNamed n | SOME x => x -fun declBinds env (d, _) = +fun declBinds env (d, loc) = case d of DCon (x, n, k, c) => pushCNamed env x n k (SOME c) + | DDatatype (x, n, xncs) => + let + val env = pushCNamed env x n (KType, loc) NONE + in + foldl (fn ((x', n', NONE), env) => pushENamed env x' n' (CNamed n, loc) + | ((x', n', SOME t), env) => pushENamed env x' n' (TFun (t, (CNamed n, loc)), loc)) + env xncs + end + | DDatatypeImp (x, n, m, ms, x', xncs) => + let + val t = (CModProj (m, ms, x'), loc) + val env = pushCNamed env x n (KType, loc) (SOME t) + + val t = (CNamed n, loc) + in + foldl (fn ((x', n', NONE), env) => pushENamed env x' n' t + | ((x', n', SOME t'), env) => pushENamed env x' n' (TFun (t', t), loc)) + env xncs + end | DVal (x, n, t, _) => pushENamed env x n t | DValRec vis => foldl (fn ((x, n, t, _), env) => pushENamed env x n t) env vis | DSgn (x, n, sgn) => pushSgnNamed env x n sgn @@ -246,10 +265,26 @@ fun declBinds env (d, _) = | DFfiStr (x, n, sgn) => pushStrNamed env x n sgn | DExport _ => env -fun sgiBinds env (sgi, _) = +fun sgiBinds env (sgi, loc) = case sgi of SgiConAbs (x, n, k) => pushCNamed env x n k NONE | SgiCon (x, n, k, c) => pushCNamed env x n k (SOME c) + | SgiDatatype (x, n, xncs) => + let + val env = pushCNamed env x n (KType, loc) NONE + in + foldl (fn ((x', n', NONE), env) => pushENamed env x' n' (CNamed n, loc) + | ((x', n', SOME t), env) => pushENamed env x' n' (TFun (t, (CNamed n, loc)), loc)) + env xncs + end + | SgiDatatypeImp (x, n, m1, ms, x', xncs) => + let + val env = pushCNamed env x n (KType, loc) (SOME (CModProj (m1, ms, x'), loc)) + in + foldl (fn ((x', n', NONE), env) => pushENamed env x' n' (CNamed n, loc) + | ((x', n', SOME t), env) => pushENamed env x' n' (TFun (t, (CNamed n, loc)), loc)) + env xncs + end | SgiVal (x, n, t) => pushENamed env x n t | SgiSgn (x, n, sgn) => pushSgnNamed env x n sgn | SgiStr (x, n, sgn) => pushStrNamed env x n sgn |