diff options
| author |  Adam Chlipala <adamc@hcoop.net> | 2009-05-16 15:22:05 -0400 |
|---|---|---|
| committer | Adam Chlipala <adamc@hcoop.net> | 2009-05-16 15:22:05 -0400 |
| commit | 6cb3888614811abc30c6a00a1644e256d1d1c780 (patch) | |
| tree | 2880c44d43f0095ce5c1ac7531a4cdff3ce4b730 /src/corify.sml | |
| parent | 0159bec5067ac88f3f222595ac6f5e2f94c1d41f (diff) | |
Mutual datatypes through Corify
Diffstat (limited to 'src/corify.sml')
| -rw-r--r-- | src/corify.sml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/corify.sml b/src/corify.sml index 65f32fc2..9ac5c84e 100644 --- a/src/corify.sml +++ b/src/corify.sml @@ -621,7 +621,8 @@ fun corifyDecl mods (all as (d, loc : EM.span), st) = in ([(L'.DCon (x, n, corifyKind k, corifyCon st c), loc)], st) end - | L.DDatatype (x, n, xs, xncs) => + | L.DDatatype _ => raise Fail "Corify DDatatype" + (*| L.DDatatype (x, n, xs, xncs) => let val (st, n) = St.bindCon st x n val (xncs, st) = ListUtil.foldlMap (fn ((x, n, co), st) => @@ -658,7 +659,7 @@ fun corifyDecl mods (all as (d, loc : EM.span), st) = end) xncs in ((L'.DDatatype (x, n, xs, xncs), loc) :: dcons, st) - end + end*) | L.DDatatypeImp (x, n, m1, ms, s, xs, xncs) => let val (st, n) = St.bindCon st x n @@ -795,7 +796,8 @@ fun corifyDecl mods (all as (d, loc : EM.span), st) = trans) end - | L.SgiDatatype (x, n, xs, xnts) => + | L.SgiDatatype _ => raise Fail "Corify SgiDatatype" + (*| L.SgiDatatype (x, n, xs, xnts) => let val k = (L'.KType, loc) val dk = ElabUtil.classifyDatatype xnts @@ -856,7 +858,7 @@ fun corifyDecl mods (all as (d, loc : EM.span), st) = conmap, st, trans) - end + end*) | L.SgiVal (x, _, c) => let @@ -1061,7 +1063,7 @@ and corifyStr mods ((str, _), st) = fun maxName ds = foldl (fn ((d, _), n) => case d of L.DCon (_, n', _, _) => Int.max (n, n') - | L.DDatatype (_, n', _, _) => Int.max (n, n') + | L.DDatatype dts => foldl (fn ((_, n', _, _), n) => Int.max (n, n')) n dts | L.DDatatypeImp (_, n', _, _, _, _, _) => Int.max (n, n') | L.DVal (_, n', _, _) => Int.max (n, n') | L.DValRec vis => foldl (fn ((_, n', _, _), n) => Int.max (n, n)) n vis |