Project

General

Profile

Revision 3769b712 src/tools/stateflow/common/datatype.ml

View differences:

src/tools/stateflow/common/datatype.ml
1
open Lustrec
1 2
open Basetypes
2 3
(* open ActiveEnv *)
3 4

  
......
39 40
  | Junction of junction_name_t * transitions_t
40 41
  | SFFunction of 'prog_t
41 42

  
42
type prog_t = Program of state_name_t * prog_t src_components_t list * (Lustre_types.var_decl * Lustre_types.expr) list
43
type prog_t = Program of state_name_t * prog_t src_components_t list * (Lustrec.Lustre_types.var_decl * Lustrec.Lustre_types.expr) list
43 44

  
44 45
type scope_t = Constant | Input | Local | Output | Parameter
45 46

  
......
85 86

  
86 87
  let global_vars (Program (_, _, env)) = env
87 88

  
88
  (* Printers *)
89
  (* Lustrec.Printers *)
89 90

  
90 91
  let pp_event fmt e =
91 92
    match e with
......
108 109
  let pp_transitions fmt l =
109 110
    Format.fprintf fmt
110 111
      "@[<hov 0>[@[<hov 0>%a@]@ ]@]"
111
      (Utils.fprintf_list ~sep:";@ " pp_trans) l
112
      (Lustrec.Utils.fprintf_list ~sep:";@ " pp_trans) l
112 113

  
113 114
  let pp_comp fmt c = match c with
114 115
    | Or (_T, _S) ->
115 116
       Format.fprintf fmt "Or(%a, {%a})"
116 117
	 pp_transitions _T
117
	 (Utils.fprintf_list ~sep:"; " pp_state_name) _S
118
	 (Lustrec.Utils.fprintf_list ~sep:"; " pp_state_name) _S
118 119
    | And (_S) ->
119 120
       Format.fprintf fmt "And({%a})"
120
	 (Utils.fprintf_list ~sep:"; " pp_state_name) _S
121
	 (Lustrec.Utils.fprintf_list ~sep:"; " pp_state_name) _S
121 122

  
122 123
  let pp_state_actions fmt sa =
123 124
    Format.fprintf fmt "@[<hov 0>(%a,@ %a,@ %a)@]"
......
134 135

  
135 136
  let pp_src pp_sffunction fmt src =
136 137
    Format.fprintf fmt "@[<v>%a@ @]"
137
      (Utils.fprintf_list ~sep:"@ @ "
138
      (Lustrec.Utils.fprintf_list ~sep:"@ @ "
138 139
         (fun fmt src -> match src with
139 140
	    | State (p, def)   -> Format.fprintf fmt "%a: %a"
140 141
                                  pp_path p pp_state def
......
152 153

  
153 154
  let pp_vars fmt src =
154 155
    Format.fprintf fmt "@[<v>%a@ @]"
155
      (Utils.fprintf_list ~sep:"@ " Printers.pp_var)
156
      (Lustrec.Utils.fprintf_list ~sep:"@ " Lustrec.Printers.pp_var)
156 157
    src
157 158

  
158 159
  let pp_prog fmt (Program (name, component_list, vars)) =

Also available in: Unified diff