Mercurial > urweb
diff src/expl_util.sml @ 191:aa54250f58ac
Parametrized datatypes through explify
author | Adam Chlipala <adamc@hcoop.net> |
---|---|
date | Fri, 08 Aug 2008 10:28:32 -0400 |
parents | 8e9f97508f0d |
children | ab86aa858e6c |
line wrap: on
line diff
--- a/src/expl_util.sml Thu Aug 07 13:09:26 2008 -0400 +++ b/src/expl_util.sml Fri Aug 08 10:28:32 2008 -0400 @@ -373,7 +373,7 @@ S.map2 (con ctx c, fn c' => (SgiCon (x, n, k', c'), loc))) - | SgiDatatype (x, n, xncs) => + | SgiDatatype (x, n, xs, xncs) => S.map2 (ListUtil.mapfold (fn (x, n, c) => case c of NONE => S.return2 (x, n, c) @@ -381,8 +381,8 @@ S.map2 (con ctx c, fn c' => (x, n, SOME c'))) xncs, fn xncs' => - (SgiDatatype (x, n, xncs'), loc)) - | SgiDatatypeImp (x, n, m1, ms, s, xncs) => + (SgiDatatype (x, n, xs, xncs'), loc)) + | SgiDatatypeImp (x, n, m1, ms, s, xs, xncs) => S.map2 (ListUtil.mapfold (fn (x, n, c) => case c of NONE => S.return2 (x, n, c) @@ -390,7 +390,7 @@ S.map2 (con ctx c, fn c' => (x, n, SOME c'))) xncs, fn xncs' => - (SgiDatatypeImp (x, n, m1, ms, s, xncs'), loc)) + (SgiDatatypeImp (x, n, m1, ms, s, xs, xncs'), loc)) | SgiVal (x, n, c) => S.map2 (con ctx c, fn c' => @@ -416,9 +416,9 @@ bind (ctx, NamedC (x, k)) | SgiCon (x, _, k, _) => bind (ctx, NamedC (x, k)) - | SgiDatatype (x, n, xncs) => + | SgiDatatype (x, n, _, xncs) => bind (ctx, NamedC (x, (KType, loc))) - | SgiDatatypeImp (x, _, _, _, _, _) => + | SgiDatatypeImp (x, _, _, _, _, _, _) => bind (ctx, NamedC (x, (KType, loc))) | SgiVal _ => ctx | SgiStr (x, _, sgn) =>