# HG changeset patch
# User Adam Chlipala <adamc@hcoop.net>
# Date 1216305796 14400
# Node ID 4eb68ed311450161ea90464372a758f425237511
# Parent  76a4d69719d8f211ead20bfb1443dfc687a7c26d
Reducing (non-mutual) 'val rec'

diff -r 76a4d69719d8 -r 4eb68ed31145 src/core_util.sml
--- a/src/core_util.sml	Thu Jul 17 10:38:03 2008 -0400
+++ b/src/core_util.sml	Thu Jul 17 10:43:16 2008 -0400
@@ -385,9 +385,14 @@
                      fn vi' =>
                         (DVal vi', loc))
               | DValRec vis =>
-                S.map2 (ListUtil.mapfold (mfvi ctx) vis,
-                     fn vis' =>
-                        (DValRec vis', loc))
+                let
+                    val ctx = foldl (fn ((x, n, t, e, s), ctx) => bind (ctx, NamedE (x, n, t, NONE, s)))
+                                    ctx vis
+                in
+                    S.map2 (ListUtil.mapfold (mfvi ctx) vis,
+                         fn vis' =>
+                            (DValRec vis', loc))
+                end
               | DExport _ => S.return2 dAll
 
         and mfvi ctx (x, n, t, e, s) =
@@ -445,7 +450,7 @@
                                         DCon (x, n, k, c) => bind (ctx, NamedC (x, n, k, SOME c))
                                       | DVal (x, n, t, e, s) => bind (ctx, NamedE (x, n, t, SOME e, s))
                                       | DValRec vis =>
-                                        foldl (fn ((x, n, t, e, s), ctx) => bind (ctx, NamedE (x, n, t, SOME e, s)))
+                                        foldl (fn ((x, n, t, e, s), ctx) => bind (ctx, NamedE (x, n, t, NONE, s)))
                                         ctx vis
                                       | DExport _ => ctx
                             in