Skip to content

Commit 3f6167f

Browse files
committed
add is_a_patch in Remanent_parameters
1 parent 1bb2c62 commit 3f6167f

7 files changed

Lines changed: 23 additions & 15 deletions

File tree

core/KaSa_rep/export/export.ml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ functor
7070
(******************************************************************)
7171
(*operations of module signatures*)
7272

73-
let init ?compil ?files ~called_from () =
73+
let init ?compil ?files ?(is_a_patch=false) ~called_from () =
7474
match compil with
7575
| Some compil ->
76-
let parameters = Remanent_parameters.get_parameters ~called_from () in
76+
let parameters = Remanent_parameters.get_parameters ~called_from ~is_a_patch () in
7777
let state =
7878
Remanent_state.create_state parameters (Remanent_state.Compil compil)
7979
in
@@ -85,9 +85,9 @@ functor
8585
let errors = Exception.empty_exceptions_caught_and_uncaught in
8686
let errors, parameters, files =
8787
match files with
88-
| None -> Get_option.get_option errors
88+
| None -> Get_option.get_option ~is_a_patch errors
8989
| Some x ->
90-
let a, b, _ = Get_option.get_option errors in
90+
let a, b, _ = Get_option.get_option ~is_a_patch errors in
9191
a, b, x
9292
in
9393
let log = Remanent_parameters.get_logger parameters in
@@ -287,6 +287,7 @@ functor
287287
let parameters = get_parameters state in
288288
let syntax_version = Remanent_parameters.get_syntax_version parameters in
289289
let removed_rules = Remanent_parameters.get_rules_to_remove parameters in
290+
let is_a_patch = Remanent_parameters.get_is_a_patch parameters in
290291
let current_chapter =
291292
Remanent_parameters.get_current_chapter parameters
292293
in
@@ -300,6 +301,11 @@ functor
300301
| Remanent_state.Files files ->
301302
let () = show_title state in
302303
(try
304+
if is_a_patch then
305+
( errors,
306+
Cli_init.get_ast_from_list_of_files ~current_chapter:files ~rules_in_ws:[]
307+
~removed_rules:[] syntax_version [])
308+
else
303309
( errors,
304310
Cli_init.get_ast_from_list_of_files ~current_chapter ~rules_in_ws
305311
~removed_rules syntax_version files )
@@ -2438,7 +2444,7 @@ functor
24382444
| Some false | None -> false
24392445
in
24402446
let errors = get_errors state in
2441-
let state' = init ~called_from ?compil ?files () in
2447+
let state' = init ~called_from ?compil ?files ~is_a_patch:true () in
24422448
let state' = set_errors errors state' in
24432449
let state', _ = get_compilation state' in
24442450
let state' =

core/KaSa_rep/export/export_to_KaSim.ml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ module type Type = sig
1818
val init :
1919
?compil:Ast.parsing_compil ->
2020
?files:string list ->
21+
?is_a_patch:bool ->
2122
called_from:Remanent_parameters_sig.called_from ->
2223
unit ->
2324
state

core/KaSa_rep/export/export_to_KaSim.mli

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ module type Type = sig
1818
val init :
1919
?compil:Ast.parsing_compil ->
2020
?files:string list ->
21+
?is_a_patch:bool ->
2122
called_from:Remanent_parameters_sig.called_from ->
2223
unit ->
2324
state

core/parameters/get_option.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,11 +519,11 @@ let options =
519519
Hidden );
520520
]
521521

522-
let get_option error =
522+
let get_option ?(is_a_patch = false) error =
523523
let title = Version.version_kasa_full_name in
524524
let () = SuperargTk.parse ~title options FileNames.input in
525525
let parameters =
526-
Remanent_parameters.get_parameters ~called_from:Remanent_parameters_sig.KaSa
526+
Remanent_parameters.get_parameters ~called_from:Remanent_parameters_sig.KaSa ~is_a_patch
527527
()
528528
in
529529
error, parameters, !FileNames.input

core/parameters/remanent_parameters.ml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ let fetch_backdoors () =
340340
Remanent_parameters_sig.backdoor_directory = !Config.backdoor_directory;
341341
}
342342

343-
let get_parameters ?(html_mode = true) ~called_from () =
343+
let get_parameters ?(html_mode = true) ?(is_a_patch=false) ~called_from () =
344344
let channel, channel_err, channel_backdoor, html_mode, command =
345345
match called_from with
346346
| Remanent_parameters_sig.Server ->
@@ -479,6 +479,7 @@ let get_parameters ?(html_mode = true) ~called_from () =
479479
| Some channel -> Loggers.open_logger_from_channel channel);
480480
Remanent_parameters_sig.compression_status = Loggers.dummy_txt_logger;
481481
Remanent_parameters_sig.print_efficiency = !Config.print_efficiency;
482+
Remanent_parameters_sig.is_a_patch = is_a_patch;
482483
Remanent_parameters_sig.profiler =
483484
(match channel with
484485
| None -> Loggers.dummy_txt_logger
@@ -1438,12 +1439,12 @@ let get_compression_status_logger parameter =
14381439

14391440
let get_kasa_state = compose get_kasa_state_1 get_marshalisable
14401441

1441-
let set_print_efficiency parameter bool =
1442-
{ parameter with Remanent_parameters_sig.print_efficiency = bool }
1443-
14441442
let get_print_efficiency parameter =
14451443
parameter.Remanent_parameters_sig.print_efficiency
14461444

1445+
let get_is_a_patch parameter =
1446+
parameter.Remanent_parameters_sig.is_a_patch
1447+
14471448
let set_logger parameter logger =
14481449
{ parameter with Remanent_parameters_sig.logger }
14491450

core/parameters/remanent_parameters.mli

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ val ext_format : Remanent_parameters_sig.graph_format -> string
2020

2121
val get_parameters :
2222
?html_mode:bool ->
23+
?is_a_patch:bool ->
2324
called_from:Remanent_parameters_sig.called_from ->
2425
unit ->
2526
Remanent_parameters_sig.parameters
@@ -335,10 +336,7 @@ val update_call_stack :
335336

336337
val get_print_efficiency : Remanent_parameters_sig.parameters -> bool
337338

338-
val set_print_efficiency :
339-
Remanent_parameters_sig.parameters ->
340-
bool ->
341-
Remanent_parameters_sig.parameters
339+
val get_is_a_patch : Remanent_parameters_sig.parameters -> bool
342340

343341
val open_influence_map_file :
344342
Remanent_parameters_sig.parameters -> Remanent_parameters_sig.parameters

core/parameters/remanent_parameters_sig.ml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ type parameters = {
167167
profiler: Loggers.t;
168168
compression_status: Loggers.t;
169169
print_efficiency: bool;
170+
is_a_patch: bool;
170171
save_error_list:
171172
Exception_without_parameter.exceptions_caught_and_uncaught -> unit;
172173
save_progress_bar: bool * int * int * int -> unit;

0 commit comments

Comments
 (0)