summaryrefslogtreecommitdiff
path: root/src/elaborate.sml
diff options
context:
space:
mode:
Diffstat (limited to 'src/elaborate.sml')
-rw-r--r--src/elaborate.sml18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/elaborate.sml b/src/elaborate.sml
index d1b9648a..2a237c50 100644
--- a/src/elaborate.sml
+++ b/src/elaborate.sml
@@ -2548,7 +2548,7 @@ and sgiOfDecl (d, loc) =
| L'.DDatabase _ => []
| L'.DCookie (tn, x, n, c) => [(L'.SgiVal (x, n, (L'.CApp (cookieOf (), c), loc)), loc)]
| L'.DStyle (tn, x, n) => [(L'.SgiVal (x, n, styleOf ()), loc)]
- | L'.DInitializer _ => []
+ | L'.DTask _ => []
and subSgn' counterparts env strLoc sgn1 (sgn2 as (_, loc2)) =
((*prefaces "subSgn" [("sgn1", p_sgn env sgn1),
@@ -3669,14 +3669,18 @@ and elabDecl (dAll as (d, loc), (env, denv, gs)) =
in
([(L'.DStyle (!basis_r, x, n), loc)], (env, denv, gs))
end
- | L.DInitializer e =>
+ | L.DTask (e1, e2) =>
let
- val (e', t, gs') = elabExp (env, denv) e
- val t' = (L'.CApp ((L'.CModProj (!basis_r, [], "transaction"), loc),
- (L'.TRecord (L'.CRecord ((L'.KType, loc), []), loc), loc)), loc)
+ val (e1', t1, gs1) = elabExp (env, denv) e1
+ val (e2', t2, gs2) = elabExp (env, denv) e2
+
+ val t1' = (L'.CModProj (!basis_r, [], "task_kind"), loc)
+ val t2' = (L'.CApp ((L'.CModProj (!basis_r, [], "transaction"), loc),
+ (L'.TRecord (L'.CRecord ((L'.KType, loc), []), loc), loc)), loc)
in
- checkCon env e' t t';
- ([(L'.DInitializer e', loc)], (env, denv, gs' @ gs))
+ checkCon env e1' t1 t1';
+ checkCon env e2' t2 t2';
+ ([(L'.DTask (e1', e2'), loc)], (env, denv, gs2 @ gs1 @ gs))
end
(*val tcs = List.filter (fn TypeClass _ => true | _ => false) (#3 (#2 r))*)