correction de bugs sur les assignements et merge en mode multi-tâche

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