From fbe98dfc0dab84c8f2d3effadb9fcc0335829c02 Mon Sep 17 00:00:00 2001
From: Leandre Lacourt <lacourtl@santel.imag.fr>
Date: Tue, 10 Sep 2024 16:09:24 +0200
Subject: [PATCH] =?UTF-8?q?correction=20de=20bugs=20sur=20les=20assignemen?=
=?UTF-8?q?ts=20et=20merge=20en=20mode=20multi-t=C3=A2che?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/socNameC.ml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/socNameC.ml b/lib/socNameC.ml
index 51ef320..b770edb 100644
--- a/lib/socNameC.ml
+++ b/lib/socNameC.ml
@@ -251,7 +251,7 @@ let (var_expr_to_index : (string * variable_type) list -> var_expr -> int) =
| Call(_, Method((_, sk), _, _), _, _)
| Call(_, Procedure (sk, _, _), _, _) ->
let (name, _, _) = sk in
- (String.equal "Lustre::pre" name) || (String.equal "Lustre::arrow" name) (*les 2 socs qui ont de la mémoire*)
+ (String.equal "Lustre::pre" name) || (String.equal "Lustre::arrow" name) (*les 2 socs qui ont de la mémoire : manque un noeud avec memoire*)
| Case(_, _, _) -> assert false
in
List.exists (fun x -> x = true) (List.map gao_has_memory gaol)
@@ -265,7 +265,7 @@ let (var_expr_to_index : (string * variable_type) list -> var_expr -> int) =
let gaol = get_gaol soc in
let (gao_to_tasks: gao -> task_type option) = fun gao ->
match gao with
- | Call(_,Assign,_,_) -> assert false
+ | Call(_,Assign,_,_) -> None
| Call(_, Method(_, _, task), _, _)
| Call(_, Procedure (_, _, task), _, _) ->
begin
@@ -285,7 +285,7 @@ let (var_expr_to_index : (string * variable_type) list -> var_expr -> int) =
} in
Some t
end
- | Case(_, _,_) -> assert false
+ | Case(_, _,_) -> None
in
let (to_list : task_type option -> task_type list) = fun a ->
match a with
--
GitLab