Project

General

Profile

Revision 5c1184ad src/corelang.ml

View differences:

src/corelang.ml
136 136
  | Consts of const_desc list
137 137
  | ImportedNode of imported_node_desc
138 138
  | ImportedFun of imported_fun_desc
139
  | Include of string
139
  | Open of string
140 140

  
141 141
type top_decl =
142 142
    {top_decl_desc: top_decl_desc;
......
493 493
    fun consts decl ->
494 494
      match decl.top_decl_desc with
495 495
	| Consts clist -> clist@consts
496
	| Node _ | ImportedNode _ | ImportedFun _ | Include _ -> consts  
496
	| Node _ | ImportedNode _ | ImportedFun _ | Open _ -> consts  
497 497
  ) [] prog
498 498

  
499 499

  
......
502 502
    fun nodes decl ->
503 503
      match decl.top_decl_desc with
504 504
	| Node nd -> nd::nodes
505
	| Consts _ | ImportedNode _ | ImportedFun _ | Include _ -> nodes  
505
	| Consts _ | ImportedNode _ | ImportedFun _ | Open _ -> nodes  
506 506
  ) [] prog
507 507

  
508 508
let prog_unfold_consts prog =
......
587 587
    fprintf fmt "%s: " ind.fun_id;
588 588
    Utils.reset_names ();
589 589
    fprintf fmt "%a@ " Types.print_ty ind.fun_type
590
  | Consts _ | Include _ -> ()
590
  | Consts _ | Open _ -> ()
591 591

  
592 592
let pp_prog_type fmt tdecl_list =
593 593
  Utils.fprintf_list ~sep:"" pp_decl_type fmt tdecl_list
......
600 600
    fprintf fmt "%a@ " Clocks.print_ck nd.node_clock
601 601
  | ImportedNode ind ->
602 602
    fprintf fmt "%s: " ind.nodei_id;
603
      Utils.reset_names ();
604
      fprintf fmt "%a@ " Clocks.print_ck ind.nodei_clock
605
      | ImportedFun _ | Consts _ | Include _ -> ()
603
    Utils.reset_names ();
604
    fprintf fmt "%a@ " Clocks.print_ck ind.nodei_clock
605
  | ImportedFun _ | Consts _ | Open _ -> ()
606 606

  
607 607
let pp_prog_clock fmt prog =
608 608
  Utils.fprintf_list ~sep:"" pp_decl_clock fmt prog

Also available in: Unified diff