From 2396dd1bd2bdaeb7608d88bbb2f890b5788852c0 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Sat, 16 May 2009 16:02:17 -0400 Subject: Mutual datatypes through Cjrize --- src/cjr_env.sml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/cjr_env.sml') diff --git a/src/cjr_env.sml b/src/cjr_env.sml index 54dbea17..217efb3a 100644 --- a/src/cjr_env.sml +++ b/src/cjr_env.sml @@ -137,15 +137,16 @@ fun classifyDatatype xncs = fun declBinds env (d, loc) = case d of - DDatatype (_, x, n, xncs) => - let - val env = pushDatatype env x n xncs - val dt = (TDatatype (classifyDatatype xncs, n, ref xncs), loc) - in - foldl (fn ((x', n', NONE), env) => pushENamed env x' n' dt - | ((x', n', SOME t), env) => pushENamed env x' n' (TFun (t, dt), loc)) - env xncs - end + DDatatype dts => + foldl (fn ((_, x, n, xncs), env) => + let + val env = pushDatatype env x n xncs + val dt = (TDatatype (classifyDatatype xncs, n, ref xncs), loc) + in + foldl (fn ((x', n', NONE), env) => pushENamed env x' n' dt + | ((x', n', SOME t), env) => pushENamed env x' n' (TFun (t, dt), loc)) + env xncs + end) env dts | DDatatypeForward (_, x, n) => pushDatatype env x n [] | DStruct (n, xts) => pushStruct env n xts | DVal (x, n, t, _) => pushENamed env x n t -- cgit v1.2.3