diff src/shake.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 a4979e31e4bf
line wrap: on
line diff
--- a/src/shake.sml	Sun Dec 13 14:34:18 2009 -0500
+++ b/src/shake.sml	Tue Dec 15 10:19:05 2009 -0500
@@ -79,7 +79,7 @@
                     in
                         (usedE, usedC)
                     end
-                  | ((DInitializer e, _), st) => usedVars st e
+                  | ((DTask (e1, e2), _), st) => usedVars (usedVars st e1) e2
                   | (_, acc) => acc) (IS.empty, IS.empty) file
 
         val (cdef, edef) = foldl (fn ((DCon (_, n, _, c), _), (cdef, edef)) => (IM.insert (cdef, n, [c]), edef)
@@ -106,7 +106,7 @@
                                      (cdef, IM.insert (edef, n, ([], c, dummye)))
                                    | ((DStyle (_, n, _), _), (cdef, edef)) =>
                                      (cdef, IM.insert (edef, n, ([], dummyt, dummye)))
-                                   | ((DInitializer _, _), acc) => acc)
+                                   | ((DTask _, _), acc) => acc)
                                  (IM.empty, IM.empty) file
 
         fun kind (_, s) = s
@@ -186,7 +186,7 @@
                       | (DDatabase _, _) => true
                       | (DCookie _, _) => true
                       | (DStyle _, _) => true
-                      | (DInitializer _, _) => true) file
+                      | (DTask _, _) => true) file
     end
 
 end