jeltz/heptagon
1
0
Fork 0
Code Issues Pull requests Releases Activity

Revert "Changed linear typing for merge."

Browse source 
This reverts commit 0abb050a23.
This commit is contained in:
Adrien Guatto 2012-02-14 14:36:47 +01:00
parent fc08800be6
commit 070d2eab55
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
compiler/heptagon/analysis/linear_typing.ml
View file

@ -802,18 +802,8 @@ and expect env lin e =
found_lin, env
| Emerge (_, c_e_list) ->
(* Idea: one of the branches should be of linear type [lin], the others can be of linear type
Top *)
(* TODO: Cedric, avis ?*)
let type_clause (env, no_lin) (_, e) =
try
let _, env = expect env lin e in env, false
with _ ->
safe_expect env Ltop e, no_lin
in
let env, no_lin = List.fold_left type_clause (env, true) c_e_list in
if no_lin then message e.e_loc (Eunify_failed_one lin);
lin, env
let env = List.fold_left (fun env (_, e) -> safe_expect env lin e) env c_e_list in
lin, env
| Ewhen (e, _, _) ->
expect env lin e