From 95d133301593520d9677c130a4d611422b3a4f40 Mon Sep 17 00:00:00 2001
From: ploc <ploc@garoche.net>
Date: Fri, 28 Jan 2022 19:36:46 +0100
Subject: [PATCH] lustresf: change in model signature
---
src/tools/stateflow/models/model_stopwatch.ml | 26 +++++++++++--------
src/tools/stateflow/sf_sem.ml | 2 +-
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/tools/stateflow/models/model_stopwatch.ml b/src/tools/stateflow/models/model_stopwatch.ml
index 7c468570..ab97c432 100644
--- a/src/tools/stateflow/models/model_stopwatch.ml
+++ b/src/tools/stateflow/models/model_stopwatch.ml
@@ -249,17 +249,21 @@ let model =
let globals =
let int_typ = Corelang.mktyp Location.dummy_loc Lustre_types.Tydec_int in
List.map (fun k ->
- Corelang.mkvar_decl
- Location.dummy_loc
- (k, (* name *)
- int_typ, (* type *)
- Corelang.dummy_clock_dec, (* clock *)
- false, (* not a constant *)
- None, (* no default value *)
- None (* no parent known *)
- ),
- (* Default value is zero *)
- Corelang.mkexpr Location.dummy_loc (Lustre_types.Expr_const (Lustre_types.Const_int 0))
+ let vdecl =
+ Corelang.mkvar_decl
+ Location.dummy_loc
+ (k, (* name *)
+ int_typ, (* type *)
+ Corelang.dummy_clock_dec, (* clock *)
+ false, (* not a constant *)
+ None, (* no default value *)
+ None (* no parent known *)
+ ) in
+ let init_val =
+ (* Default value is zero *)
+ Corelang.mkexpr Location.dummy_loc (Lustre_types.Expr_const (Lustre_types.Const_int 0))
+ in
+ {GlobalVarDef.variable = vdecl; init_val = init_val; }
)
["cent";
diff --git a/src/tools/stateflow/sf_sem.ml b/src/tools/stateflow/sf_sem.ml
index f09fc284..75183143 100644
--- a/src/tools/stateflow/sf_sem.ml
+++ b/src/tools/stateflow/sf_sem.ml
@@ -64,7 +64,7 @@ let _ =
let module Model = (val model) in
let state_vars = Datatype.SF.states Model.model in
let global_vars =
- List.map (fun (v,e) -> {Basetypes.GlobalVarDef.variable = v; init_val = e;})
+ (* List.map (fun (v,e) -> {Basetypes.GlobalVarDef.variable = v; init_val = e;})*)
(Datatype.SF.global_vars Model.model) in
let module T = CPS_lustre_generator.LustrePrinter (struct
--
GitLab