Simplifications && preparation for restart.

1 files changed, 16 insertions, 1 deletions

diff --git a/frontend/typing.ml b/frontend/typing.ml
index 46458f2..2859230 100644
--- a/frontend/typing.ml
+++ b/frontend/typing.ml
@@ -186,6 +186,18 @@ let rec extract_all_vars rp (node, prefix, eqs) n_vars =
             vars_of_expr c @ do_branch a @ do_branch b
         in do_branch b
       | AST_automaton (aid, states, ret) ->
+        (* Determine which states can be reset *)
+        let rst_trans = List.flatten
+            (List.map (fun (st, _) ->
+                List.map (fun (_, (id, _), _) -> (st.st_name, id))
+                (List.filter (fun (_, _, rst) -> rst) st.until))
+              states)
+        in
+        List.iter (fun (st, _) ->
+            st.i_rst <- List.mem (st.st_name, st.st_name) rst_trans;
+            st.o_rst <- List.exists (fun (a, b) -> b = st.st_name && a <> b) rst_trans)
+          states;
+
         let do_state (st, _) =
           let tvars =
             List.flatten
@@ -193,7 +205,10 @@ let rec extract_all_vars rp (node, prefix, eqs) n_vars =
           in
           let st_scope = (node, aid^"."^st.st_name^".", st.body) in
           let svars = vars_in_node node st.st_locals in
-          svars @ tvars @ clock_vars rp st_scope @
+          (if st.i_rst || st.o_rst then
+            [false, node^"/"^aid^"."^st.st_name^".next_reset", bool_type]
+          else [])
+          @ svars @ tvars @ clock_vars rp st_scope @
             extract_all_vars rp st_scope (tvars@n_vars)
         in
         let st_ids = List.map (fun (st, _) -> st.st_name) states in