diff options
| author |  Adam Chlipala <adamc@hcoop.net> | 2008-07-29 13:16:21 -0400 |
|---|---|---|
| committer | Adam Chlipala <adamc@hcoop.net> | 2008-07-29 13:16:21 -0400 |
| commit | 4b511aa7ed5b36cb0a9adb898f881d6db0a89996 (patch) | |
| tree | 116bd8e11b341df6999ea79432cb4386a48ca9fc /src/shake.sml | |
| parent | 4cbbb0bb751dd9e9dae9d6b621e563ee5c7ae1b4 (diff) | |
Datatypes through corify
Diffstat (limited to 'src/shake.sml')
| -rw-r--r-- | src/shake.sml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/shake.sml b/src/shake.sml index 693385d9..c8105b07 100644 --- a/src/shake.sml +++ b/src/shake.sml @@ -47,7 +47,9 @@ fun shake file = (fn ((DExport (_, n), _), page_es) => n :: page_es | (_, page_es) => page_es) [] file - val (cdef, edef) = foldl (fn ((DCon (_, n, _, c), _), (cdef, edef)) => (IM.insert (cdef, n, c), edef) + val (cdef, edef) = foldl (fn ((DCon (_, n, _, c), _), (cdef, edef)) => (IM.insert (cdef, n, [c]), edef) + | ((DDatatype (_, n, xncs), _), (cdef, edef)) => + (IM.insert (cdef, n, List.mapPartial #3 xncs), edef) | ((DVal (_, n, t, e, _), _), (cdef, edef)) => (cdef, IM.insert (edef, n, (t, e))) | ((DValRec vis, _), (cdef, edef)) => (cdef, foldl (fn ((_, n, t, e, _), edef) => IM.insert (edef, n, (t, e))) edef vis) @@ -68,7 +70,7 @@ fun shake file = in case IM.find (cdef, n) of NONE => s' - | SOME c => shakeCon s' c + | SOME cs => foldl (fn (c, s') => shakeCon s' c) s' cs end | _ => s @@ -100,6 +102,7 @@ fun shake file = | SOME (t, e) => shakeExp (shakeCon s t) e) s page_es in List.filter (fn (DCon (_, n, _, _), _) => IS.member (#con s, n) + | (DDatatype (_, n, _), _) => IS.member (#con s, n) | (DVal (_, n, _, _, _), _) => IS.member (#exp s, n) | (DValRec vis, _) => List.exists (fn (_, n, _, _, _) => IS.member (#exp s, n)) vis | (DExport _, _) => true) file |