aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/elab_util.sml
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2009-12-15 10:19:05 -0500
committerGravatar Adam Chlipala <adamc@hcoop.net>2009-12-15 10:19:05 -0500
commit6179a09d47c5af4db1ac41d00b8cb7ec36741c3e (patch)
tree0912963011416a0f1132c07d44c3eca8b6545d54 /src/elab_util.sml
parent1589307fcb887ec55b5baea7445747b479a665d2 (diff)
Convert to task syntax
Diffstat (limited to 'src/elab_util.sml')
-rw-r--r--src/elab_util.sml14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/elab_util.sml b/src/elab_util.sml
index 2a044e71..d0e140c5 100644
--- a/src/elab_util.sml
+++ b/src/elab_util.sml
@@ -854,7 +854,7 @@ fun mapfoldB {kind = fk, con = fc, exp = fe, sgn_item = fsgi, sgn = fsg, str = f
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 @@ fun mapfoldB {kind = fk, con = fc, exp = fe, sgn_item = fsgi, sgn = fsg, str = f
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 @@ and maxNameDecl (d, _) =
| 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