Project

General

Profile

« Previous | Next » 

Revision 9ae027f8

Added by Pierre-Loïc Garoche almost 7 years ago

[stateflow] some progress, linking the parsed json to lustrec engine. Some variables are not yet typed. To investigate ...

View differences:

src/tools/stateflow/common/basetypes.ml
10 10
type user_variable_name_t = string
11 11

  
12 12
(* Connected to lustrec types *)
13
type base_action_t    = { defs : LustreSpec.eq list; ident : string }
14
type base_condition_t = LustreSpec.expr
13
type base_action_t    = { defs : LustreSpec.statement list;
14
			  ainputs: LustreSpec.var_decl list;
15
			  aoutputs: LustreSpec.var_decl list;
16
			  avariables: LustreSpec.var_decl list;
17
			  (* ident: string; *)
18
			}
19
type base_condition_t = { expr: LustreSpec.expr;
20
			  cinputs: LustreSpec.var_decl list;
21
			  coutputs: LustreSpec.var_decl list;
22
			  cvariables: LustreSpec.var_decl list }
15 23

  
16 24
(* P(r)etty printers *)
17 25
let pp_state_name     = Format.pp_print_string
18 26
let pp_junction_name  = Format.pp_print_string
19 27
let pp_path fmt p     = Utils.fprintf_list ~sep:"." pp_state_name fmt p
20 28
let pp_event fmt e    = match e with None -> Format.fprintf fmt "none" | Some s -> Format.fprintf fmt "%s" s
21
let pp_base_act fmt a = Utils.fprintf_list ~sep:",@ " Printers.pp_node_eq fmt a.defs
22
let pp_base_cond      = Printers.pp_expr
29
let pp_base_act fmt a = Printers.pp_node_stmts fmt a.defs
30
let pp_base_cond fmt c= Printers.pp_expr fmt c.expr
23 31

  
24 32
(* Action and Condition types and functions. *)
25 33

  

Also available in: Unified diff