From 744cdbb9e3907db9bb01576750634c614147e1a3 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Sun, 3 Aug 2008 19:49:21 -0400 Subject: Datatype representation optimization --- src/cjr_env.sml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/cjr_env.sml') diff --git a/src/cjr_env.sml b/src/cjr_env.sml index 6a3c41bc..83f0cc30 100644 --- a/src/cjr_env.sml +++ b/src/cjr_env.sml @@ -129,14 +129,21 @@ fun lookupStruct (env : env) n = NONE => raise UnboundStruct n | SOME x => x +fun classifyDatatype xncs = + if List.all (fn (_, _, NONE) => true | _ => false) xncs then + Enum + else + Default + fun declBinds env (d, loc) = case d of - DDatatype (x, n, xncs) => + DDatatype (_, x, n, xncs) => let val env = pushDatatype env x n xncs + val dt = (TDatatype (classifyDatatype xncs, n, xncs), loc) in - foldl (fn ((x', n', NONE), env) => pushENamed env x' n' (TDatatype (n, xncs), loc) - | ((x', n', SOME t), env) => pushENamed env x' n' (TFun (t, (TDatatype (n, xncs), loc)), loc)) + 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 | DStruct (n, xts) => pushStruct env n xts -- cgit v1.2.3