From 7599d4cacde93b7dac3d1dea2b147f6e49425072 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Mon, 2 Jan 2012 16:54:18 -0500 Subject: Adapt Monoize serialization to handle freshly created variant types --- src/monoize.sml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/monoize.sml b/src/monoize.sml index 2e663bc3..82e0030c 100644 --- a/src/monoize.sml +++ b/src/monoize.sml @@ -531,7 +531,20 @@ fun fooifyExp fk env = let fun makeDecl n fm = let - val (x, _, xncs) = Env.lookupDatatype env i + val (x, xncs) = + case ListUtil.search (fn (L'.DDatatype [(x, i', xncs)], _) => + if i' = i then + SOME (x, xncs) + else + NONE + | _ => NONE) (!pvarDefs) of + NONE => + let + val (x, _, xncs) = Env.lookupDatatype env i + in + (x, map (fn (x, n, c) => (x, n, Option.map (monoType env) c)) xncs) + end + | SOME v => v val (branches, fm) = ListUtil.foldlMap @@ -543,7 +556,6 @@ fun fooifyExp fk env = fm) | SOME t => let - val t = monoType env t val (arg, fm) = fooify fm ((L'.ERel 0, loc), t) in (((L'.PCon (dk, L'.PConVar n, SOME (L'.PVar ("a", t), loc)), loc), -- cgit v1.2.3