Mercurial > urweb
diff src/elab_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 | c316ca3c9ec6 |
line wrap: on
line diff
--- a/src/elab_util.sml Sun Dec 13 14:34:18 2009 -0500 +++ b/src/elab_util.sml Tue Dec 15 10:19:05 2009 -0500 @@ -854,7 +854,7 @@ c), loc))) | DStyle (tn, x, n) => bind (ctx, NamedE (x, (CModProj (n, [], "css_class"), loc))) - | DInitializer _ => ctx, + | DTask _ => ctx, mfd ctx d)) ctx ds, fn ds' => (StrConst ds', loc)) | StrVar _ => S.return2 strAll @@ -979,10 +979,12 @@ fn c' => (DCookie (tn, x, n, c'), 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, c, e) = S.bind2 (mfc ctx c, @@ -1125,7 +1127,7 @@ | DDatabase _ => 0 | DCookie (n1, _, n2, _) => Int.max (n1, n2) | DStyle (n1, _, n2) => Int.max (n1, n2) - | DInitializer _ => 0 + | DTask _ => 0 and maxNameStr (str, _) = case str of StrConst ds => maxName ds