Skip to content

Commit df933e6

Browse files
author
Jérôme FERET
committed
ignore events related to permanently removed items
1 parent 55dcde8 commit df933e6

1 file changed

Lines changed: 23 additions & 12 deletions

File tree

core/KaSa_rep/reachability_analysis/analyzer.ml

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -197,19 +197,24 @@ module Make (Domain : Composite_domain.Composite_domain) = struct
197197
let error, dynamic, _ =
198198
List.fold_left
199199
(fun (error, dynamic, i) chemical_species ->
200-
let error, dynamic =
201-
add_event parameters error (StoryProfiling.Initial_state i) None
202-
dynamic
203-
in
204-
let error, dynamic, () =
205-
Domain.add_initial_state static dynamic error chemical_species
200+
let error, b =
201+
Cckappa_sig.init_is_permanently_disabled_in_current_working_set
202+
parameters error i compil in
203+
let error, dynamic =
204+
if b then error, dynamic else
205+
let error, dynamic =
206+
add_event parameters error (StoryProfiling.Initial_state i) None
207+
dynamic
208+
in
209+
let error, dynamic, () =
210+
Domain.add_initial_state static dynamic error chemical_species
206211
in
207212
let error, dynamic =
208213
close_event parameters error (StoryProfiling.Initial_state i) None
209214
dynamic
210-
in
215+
in error, dynamic in
211216
error, dynamic, i + 1)
212-
(error, dynamic, 1) init
217+
(error, dynamic, 0) init
213218
in
214219
let error, dynamic = close_event parameters error init_event None dynamic in
215220
let log = Remanent_parameters.get_logger parameters in
@@ -222,7 +227,7 @@ module Make (Domain : Composite_domain.Composite_domain) = struct
222227
match next_opt with
223228
| None -> error, static, dynamic
224229
| Some rule_id ->
225-
let error =
230+
let error =
226231
if
227232
local_trace
228233
|| Remanent_parameters.get_dump_reachability_analysis_iteration
@@ -242,11 +247,17 @@ module Make (Domain : Composite_domain.Composite_domain) = struct
242247
) else
243248
error
244249
in
250+
let error, b =
251+
Cckappa_sig.rule_is_permanently_disabled_in_current_working_set
252+
parameters error rule_id compil in
253+
if b then error, static, dynamic
254+
else
255+
245256
let error, dynamic, is_enabled =
246257
Domain.is_enabled static dynamic error rule_id
247258
in
248-
(match is_enabled with
249-
| None ->
259+
(match b,is_enabled with
260+
| false, _ | _, None ->
250261
let _ =
251262
if
252263
local_trace
@@ -263,7 +274,7 @@ module Make (Domain : Composite_domain.Composite_domain) = struct
263274
)
264275
in
265276
aux error dynamic
266-
| Some precondition ->
277+
| true, Some precondition ->
267278
let _ =
268279
if
269280
local_trace

0 commit comments

Comments
 (0)