diff src/core_util.sml @ 1254:935a981f4380

Merge
author Adam Chlipala <adamc@hcoop.net>
date Thu, 06 May 2010 13:57:01 -0400
parents c316ca3c9ec6
children b4480a56cab7
line wrap: on
line diff
--- a/src/core_util.sml	Sat Apr 17 13:57:10 2010 -0400
+++ b/src/core_util.sml	Thu May 06 13:57:01 2010 -0400
@@ -992,6 +992,10 @@
                         S.map2 (mfe ctx e2,
                              fn e2' =>
                                 (DTask (e1', e2'), loc)))
+              | DPolicy e =>
+                S.map2 (mfe ctx e,
+                     fn e' =>
+                        (DPolicy e', loc))
 
         and mfvi ctx (x, n, t, e, s) =
             S.bind2 (mfc ctx t,
@@ -1147,6 +1151,7 @@
                                             bind (ctx, NamedE (x, n, t, NONE, s))
                                         end
                                       | DTask _ => ctx
+                                      | DPolicy _ => ctx
                             in
                                 S.map2 (mff ctx' ds',
                                      fn ds' =>
@@ -1210,7 +1215,8 @@
                           | DDatabase _ => count
                           | DCookie (_, n, _, _) => Int.max (n, count)
                           | DStyle (_, n, _) => Int.max (n, count)
-                          | DTask _ => count) 0
+                          | DTask _ => count
+                          | DPolicy _ => count) 0
               
 end