diff src/elab_util.sml @ 1254:935a981f4380

Merge
author Adam Chlipala <adamc@hcoop.net>
date Thu, 06 May 2010 13:57:01 -0400
parents c316ca3c9ec6
children 56bd4a4f6e66
line wrap: on
line diff
--- a/src/elab_util.sml	Sat Apr 17 13:57:10 2010 -0400
+++ b/src/elab_util.sml	Thu May 06 13:57:01 2010 -0400
@@ -854,7 +854,8 @@
                                                                                 c), loc)))
                                                  | DStyle (tn, x, n) =>
                                                    bind (ctx, NamedE (x, (CModProj (n, [], "css_class"), loc)))
-                                                 | DTask _ => ctx,
+                                                 | DTask _ => ctx
+                                                 | DPolicy _ => ctx,
                                                mfd ctx d)) ctx ds,
                      fn ds' => (StrConst ds', loc))
               | StrVar _ => S.return2 strAll
@@ -985,6 +986,10 @@
                            S.map2 (mfe ctx e2,
                                 fn e2' =>
                                    (DTask (e1', e2'), loc)))
+              | DPolicy e1 =>
+                S.map2 (mfe ctx e1,
+                     fn e1' =>
+                        (DPolicy e1', loc))
 
         and mfvi ctx (x, n, c, e) =
             S.bind2 (mfc ctx c,
@@ -1128,6 +1133,7 @@
       | DCookie (n1, _, n2, _) => Int.max (n1, n2)
       | DStyle (n1, _, n2) => Int.max (n1, n2)
       | DTask _ => 0
+      | DPolicy _ => 0
 and maxNameStr (str, _) =
     case str of
         StrConst ds => maxName ds