Project

General

Profile

Revision 54d032f5 src/causality.ml

View differences:

src/causality.ml
109 109
 assert (is_read_var id);
110 110
 String.sub id 1 (String.length id - 1)
111 111

  
112
let undo_instance_var id =
113
 assert (is_instance_var id);
114
 String.sub id 1 (String.length id - 1)
115

  
112 116
let eq_memory_variables mems eq =
113 117
  let rec match_mem lhs rhs mems =
114 118
    match rhs.expr_desc with
......
241 245
      (* mashed up dependency for user-defined operators *)
242 246
      else
243 247
	mashup_appl_dependencies f e g
244
    | Expr_appl (f, e, Some (r, _)) ->
245
      mashup_appl_dependencies f e (add_var lhs_is_mem lhs r g)
248
    | Expr_appl (f, e, Some c) ->
249
      mashup_appl_dependencies f e (add_dep lhs_is_mem lhs c g)
246 250
  in
247 251
  let g =
248 252
    List.fold_left
......
362 366
	expr_delay = Delay.new_var ();
363 367
	expr_annot = None;
364 368
	expr_loc = var_decl.var_loc } in
365
    { var_decl with var_id = cp_var },
369
    { var_decl with var_id = cp_var; var_orig = false },
366 370
    mkeq var_decl.var_loc ([cp_var], expr)
367 371

  
368 372
  let wrong_partition g partition =
......
526 530

  
527 531
let pp_error fmt trace =
528 532
  fprintf fmt "@.Causality error, cyclic data dependencies: %a@."
529
    (fprintf_list ~sep:"->" pp_print_string) trace
533
    (fprintf_list ~sep:", " pp_print_string) trace
530 534

  
531 535
(* Merges elements of graph [g2] into graph [g1] *)
532 536
let merge_with g1 g2 =

Also available in: Unified diff