diff src/core_util.sml @ 1075:0657e5adc938

Convert to task syntax
author Adam Chlipala <adamc@hcoop.net>
date Tue, 15 Dec 2009 10:19:05 -0500
parents b2311dfb3158
children 338be96f8533
line wrap: on
line diff
--- a/src/core_util.sml	Sun Dec 13 14:34:18 2009 -0500
+++ b/src/core_util.sml	Tue Dec 15 10:19:05 2009 -0500
@@ -971,10 +971,12 @@
                      fn c' =>
                         (DCookie (x, n, c', s), loc))
               | DStyle _ => S.return2 dAll
-              | DInitializer e =>
-                S.map2 (mfe ctx e,
-                     fn e' =>
-                        (DInitializer e', loc))
+              | DTask (e1, e2) =>
+                S.bind2 (mfe ctx e1,
+                     fn e1' =>
+                        S.map2 (mfe ctx e2,
+                             fn e2' =>
+                                (DTask (e1', e2'), loc)))
 
         and mfvi ctx (x, n, t, e, s) =
             S.bind2 (mfc ctx t,
@@ -1129,7 +1131,7 @@
                                         in
                                             bind (ctx, NamedE (x, n, t, NONE, s))
                                         end
-                                      | DInitializer _ => ctx
+                                      | DTask _ => ctx
                             in
                                 S.map2 (mff ctx' ds',
                                      fn ds' =>
@@ -1193,7 +1195,7 @@
                           | DDatabase _ => count
                           | DCookie (_, n, _, _) => Int.max (n, count)
                           | DStyle (_, n, _) => Int.max (n, count)
-                          | DInitializer _ => count) 0
+                          | DTask _ => count) 0
               
 end