From 41f7bb23ff2a9598f8f3bff1487f39f9e91f9f05 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Sat, 16 May 2009 15:45:12 -0400 Subject: Mutual datatypes through Effectize --- src/core_env.sml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/core_env.sml') diff --git a/src/core_env.sml b/src/core_env.sml index 0630fef2..e8cd139f 100644 --- a/src/core_env.sml +++ b/src/core_env.sml @@ -301,15 +301,16 @@ fun lookupENamed (env : env) n = fun declBinds env (d, loc) = case d of DCon (x, n, k, c) => pushCNamed env x n k (SOME c) - | DDatatype (x, n, xs, xncs) => - let - val env = pushDatatype env x n xs xncs - val env = pushCNamed env x n (KType, loc) NONE - in - foldl (fn ((x', n', NONE), env) => pushENamed env x' n' (CNamed n, loc) NONE "" - | ((x', n', SOME t), env) => pushENamed env x' n' (TFun (t, (CNamed n, loc)), loc) NONE "") - env xncs - end + | DDatatype dts => + foldl (fn ((x, n, xs, xncs), env) => + let + val env = pushDatatype env x n xs xncs + val env = pushCNamed env x n (KType, loc) NONE + in + foldl (fn ((x', n', NONE), env) => pushENamed env x' n' (CNamed n, loc) NONE "" + | ((x', n', SOME t), env) => pushENamed env x' n' (TFun (t, (CNamed n, loc)), loc) NONE "") + env xncs + end) env dts | DVal (x, n, t, e, s) => pushENamed env x n t (SOME e) s | DValRec vis => foldl (fn ((x, n, t, e, s), env) => pushENamed env x n t NONE s) env vis | DExport _ => env -- cgit v1.2.3