Benjamin_Loison/Synchronous_reactive_systems
1
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

error catching

Browse Source
This commit is contained in:
Antoine Grimod 2023-01-09 21:22:37 +01:00
parent 42cbc6ddaf
commit 2f0b9a572e
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/passes.ml
View File

@ -749,7 +749,7 @@ let pass_typing verbose debug ast =
else None else None
in aux ast in aux ast
let check_automata_validity verbos debug = let check_automata_validity verbose debug =
let check_automaton_branch_vars automaton = let check_automaton_branch_vars automaton =
let (init, states) = automaton in let (init, states) = automaton in
let left_side = Hashtbl.create 10 in let left_side = Hashtbl.create 10 in
@ -774,8 +774,11 @@ let check_automata_validity verbos debug =
end end
in in
let aux node = let aux node =
try
List.iter check_automaton_branch_vars node.n_automata; List.iter check_automaton_branch_vars node.n_automata;
Some node Some node
with
| PassExn err -> (verbose err; None)
in in
node_pass aux node_pass aux
@ -922,9 +925,12 @@ let automata_translation_pass verbose debug =
eqs@eqs_end, (ty@ty_end, vars@vars_end) eqs@eqs_end, (ty@ty_end, vars@vars_end)
in in
let aux node = let aux node =
let eqs, (ty, vars) = iter_automata node.n_automata in try
let (ty_old, vars_old) = node.n_local_vars in let eqs, (ty, vars) = iter_automata node.n_automata in
Some { node with n_local_vars = (ty@ty_old, vars@vars_old); n_equations = node.n_equations@eqs; n_automata = []} let (ty_old, vars_old) = node.n_local_vars in
Some { node with n_local_vars = (ty@ty_old, vars@vars_old); n_equations = node.n_equations@eqs; n_automata = []}
with
|PassExn err -> (verbose err; None)
in in
node_pass aux node_pass aux
@ -1060,9 +1066,14 @@ let clock_unification_pass verbose debug ast =
snd n.n_local_vars); (* Initializing local variables to Unknown clock *) snd n.n_local_vars); (* Initializing local variables to Unknown clock *)
List.iter (fun v -> Hashtbl.replace known_clocks v Base) ( List.iter (fun v -> Hashtbl.replace known_clocks v Base) (
snd n.n_outputs); (* Initializing outputs to base clock *) snd n.n_outputs); (* Initializing outputs to base clock *)
iter_til_stable n.n_equations; try
(* catch potential errors and test for unification *) begin
check_unification n; iter_til_stable n.n_equations;
Some n (* catch potential errors and test for unification *)
check_unification n;
Some n
end
with
| PassExn err -> (verbose err; None)
end end
in node_pass compute_clock_node ast in node_pass compute_clock_node ast