Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions check/classic/classic.exp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:10: internally_used_fun_with_single_always_used_opt_arg
./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:12: internally_used_fun_with_single_sometimes_used_opt_arg

./examples/using_dune/unwrapped_lib/values/builder_sig_api/bsa_api.ml:7: S.unused
./examples/using_dune/unwrapped_lib/values/include_modtype/imt_modtype.ml:2: S.unused
./examples/using_dune/unwrapped_lib/values/values.mli:2: unused_int
./examples/using_dune/unwrapped_lib/values/values.mli:3: internally_used_int
./examples/using_dune/unwrapped_lib/values/values.mli:14: unused_fun
Expand All @@ -29,6 +31,8 @@
./examples/using_dune/wrapped_lib/opt_args/opt_args.mli:10: internally_used_fun_with_single_always_used_opt_arg
./examples/using_dune/wrapped_lib/opt_args/opt_args.mli:12: internally_used_fun_with_single_sometimes_used_opt_arg

./examples/using_dune/wrapped_lib/values/builder_sig_api/bsa_api.ml:7: S.unused
./examples/using_dune/wrapped_lib/values/include_modtype/imt_modtype.ml:2: S.unused
./examples/using_dune/wrapped_lib/values/values.mli:2: unused_int
./examples/using_dune/wrapped_lib/values/values.mli:3: internally_used_int
./examples/using_dune/wrapped_lib/values/values.mli:14: unused_fun
Expand Down
17 changes: 14 additions & 3 deletions check/classic/classic.ref
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:10: internally_used_fun_with_single_always_used_opt_arg
./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:12: internally_used_fun_with_single_sometimes_used_opt_arg

./examples/using_dune/unwrapped_lib/values/builder_sig_api/bsa_api.ml:7: S.unused: Not detected
./examples/using_dune/unwrapped_lib/values/builder_sig_api/bsa_api.ml:7: unused: Should not be detected
./examples/using_dune/unwrapped_lib/values/include_modtype/imt_modtype.ml:2: S.unused: Not detected
./examples/using_dune/unwrapped_lib/values/include_modtype/imt_modtype.ml:2: unused: Should not be detected
./examples/using_dune/unwrapped_lib/values/include_modtype/imt_modtype.ml:2: unused: Should not be detected
./examples/using_dune/unwrapped_lib/values/values.mli:2: unused_int
./examples/using_dune/unwrapped_lib/values/values.mli:3: internally_used_int
./examples/using_dune/unwrapped_lib/values/values.mli:14: unused_fun
Expand All @@ -29,6 +34,12 @@
./examples/using_dune/wrapped_lib/opt_args/opt_args.mli:10: internally_used_fun_with_single_always_used_opt_arg
./examples/using_dune/wrapped_lib/opt_args/opt_args.mli:12: internally_used_fun_with_single_sometimes_used_opt_arg

./examples/using_dune/wrapped_lib/values/builder_sig_api/bsa_api.ml:7: S.unused: Not detected
./examples/using_dune/wrapped_lib/values/builder_sig_api/bsa_api.ml:7: unused: Should not be detected
./examples/using_dune/wrapped_lib/values/builder_sig_api/bsa_api.ml:7: unused: Should not be detected
./examples/using_dune/wrapped_lib/values/include_modtype/imt_modtype.ml:2: S.unused: Not detected
./examples/using_dune/wrapped_lib/values/include_modtype/imt_modtype.ml:2: unused: Should not be detected
./examples/using_dune/wrapped_lib/values/include_modtype/imt_modtype.ml:2: unused: Should not be detected
./examples/using_dune/wrapped_lib/values/values.mli:2: unused_int
./examples/using_dune/wrapped_lib/values/values.mli:3: internally_used_int
./examples/using_dune/wrapped_lib/values/values.mli:14: unused_fun
Expand Down Expand Up @@ -533,7 +544,7 @@ Nothing else to report in this section
--------------------------------------------------------------------------------


Total: 460
Total: 471
Success: 460
Failed: 0
Ratio: 100.%
Failed: 11
Ratio: 97.6645435244%
4 changes: 4 additions & 0 deletions check/internal/internal.exp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:1: unused_fun_with_single_never_used_opt_arg

./examples/using_dune/unwrapped_lib/values/builder_sig_api/bsa_api.ml:7: S.unused
./examples/using_dune/unwrapped_lib/values/include_modtype/imt_modtype.ml:2: S.unused
./examples/using_dune/unwrapped_lib/values/values.mli:2: unused_int
./examples/using_dune/unwrapped_lib/values/values.mli:14: unused_fun
./examples/using_dune/unwrapped_lib/values/values.mli:20: unused_alias_fun
Expand All @@ -18,6 +20,8 @@

./examples/using_dune/wrapped_lib/opt_args/opt_args.mli:1: unused_fun_with_single_never_used_opt_arg

./examples/using_dune/wrapped_lib/values/builder_sig_api/bsa_api.ml:7: S.unused
./examples/using_dune/wrapped_lib/values/include_modtype/imt_modtype.ml:2: S.unused
./examples/using_dune/wrapped_lib/values/values.mli:2: unused_int
./examples/using_dune/wrapped_lib/values/values.mli:14: unused_fun
./examples/using_dune/wrapped_lib/values/values.mli:20: unused_alias_fun
Expand Down
17 changes: 14 additions & 3 deletions check/internal/internal.ref
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@

./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:1: unused_fun_with_single_never_used_opt_arg

./examples/using_dune/unwrapped_lib/values/builder_sig_api/bsa_api.ml:7: S.unused: Not detected
./examples/using_dune/unwrapped_lib/values/builder_sig_api/bsa_api.ml:7: unused: Should not be detected
./examples/using_dune/unwrapped_lib/values/include_modtype/imt_modtype.ml:2: S.unused: Not detected
./examples/using_dune/unwrapped_lib/values/include_modtype/imt_modtype.ml:2: unused: Should not be detected
./examples/using_dune/unwrapped_lib/values/include_modtype/imt_modtype.ml:2: unused: Should not be detected
./examples/using_dune/unwrapped_lib/values/values.mli:2: unused_int
./examples/using_dune/unwrapped_lib/values/values.mli:14: unused_fun
./examples/using_dune/unwrapped_lib/values/values.mli:20: unused_alias_fun
Expand All @@ -18,6 +23,12 @@

./examples/using_dune/wrapped_lib/opt_args/opt_args.mli:1: unused_fun_with_single_never_used_opt_arg

./examples/using_dune/wrapped_lib/values/builder_sig_api/bsa_api.ml:7: S.unused: Not detected
./examples/using_dune/wrapped_lib/values/builder_sig_api/bsa_api.ml:7: unused: Should not be detected
./examples/using_dune/wrapped_lib/values/builder_sig_api/bsa_api.ml:7: unused: Should not be detected
./examples/using_dune/wrapped_lib/values/include_modtype/imt_modtype.ml:2: S.unused: Not detected
./examples/using_dune/wrapped_lib/values/include_modtype/imt_modtype.ml:2: unused: Should not be detected
./examples/using_dune/wrapped_lib/values/include_modtype/imt_modtype.ml:2: unused: Should not be detected
./examples/using_dune/wrapped_lib/values/values.mli:2: unused_int
./examples/using_dune/wrapped_lib/values/values.mli:14: unused_fun
./examples/using_dune/wrapped_lib/values/values.mli:20: unused_alias_fun
Expand Down Expand Up @@ -501,7 +512,7 @@ Nothing else to report in this section
--------------------------------------------------------------------------------


Total: 430
Total: 441
Success: 430
Failed: 0
Ratio: 100.%
Failed: 11
Ratio: 97.5056689342%
8 changes: 4 additions & 4 deletions check/src/check.ml
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@ and process_mismatch state exp_lines got_lines =
in
let handle_report_infos alt state =
(* If either is not a valid report line, then it is consumed.
If both are valid report_lines then the first in lexicographical order
is consumed *)
If both are valid report_lines then the first that should appear in
the report order is consumed *)
let exp_ri = Reports.report_info_of_line exp in
let got_ri = Reports.report_info_of_line got in
match exp_ri, got_ri with
| Ok _, Ok _ ->
let comp = String.compare exp got in
| Ok exp_ri, Ok got_ri ->
let comp = Reports.compare exp_ri got_ri in
assert (comp <> 0);
if comp < 0 then consume_exp state
else (* > 0 *) consume_got state
Expand Down
6 changes: 6 additions & 0 deletions check/src/reports.ml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ type report_info = {
value : string;
}

let compare ri1 ri2 =
let ( |:? ) x f = if x <> 0 then x else f () in
String.compare ri1.filepath ri2.filepath
|:? (fun () -> Int.compare ri1.line_nb ri2.line_nb)
|:? (fun () -> String.compare ri1.value ri2.value)

let line_of_report_info ri =
Printf.sprintf "%s:%d:%s" ri.filepath ri.line_nb ri.value

Expand Down
2 changes: 2 additions & 0 deletions check/src/reports.mli
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ type report_info = {
value : string;
}

val compare : report_info -> report_info -> int

val line_of_report_info : report_info -> string

(* Format of report lines is : '<file_path>:<line_number>:<value>' with :
Expand Down
8 changes: 8 additions & 0 deletions check/threshold-1/threshold-1.exp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:1: unused_fun_with_single_never_used_opt_arg

./examples/using_dune/unwrapped_lib/values/builder_sig_api/bsa_api.ml:7: S.unused
./examples/using_dune/unwrapped_lib/values/include_modtype/imt_modtype.ml:2: S.unused
./examples/using_dune/unwrapped_lib/values/values.mli:2: unused_int
./examples/using_dune/unwrapped_lib/values/values.mli:14: unused_fun
./examples/using_dune/unwrapped_lib/values/values.mli:20: unused_alias_fun
Expand All @@ -18,6 +20,8 @@

./examples/using_dune/wrapped_lib/opt_args/opt_args.mli:1: unused_fun_with_single_never_used_opt_arg

./examples/using_dune/wrapped_lib/values/builder_sig_api/bsa_api.ml:7: S.unused
./examples/using_dune/wrapped_lib/values/include_modtype/imt_modtype.ml:2: S.unused
./examples/using_dune/wrapped_lib/values/values.mli:2: unused_int
./examples/using_dune/wrapped_lib/values/values.mli:14: unused_fun
./examples/using_dune/wrapped_lib/values/values.mli:20: unused_alias_fun
Expand Down Expand Up @@ -75,7 +79,9 @@
./examples/using_dune/bin/use_preprocessed_lib/use_preprocessed_lib.mli:1: mark_used
./examples/using_dune/bin/use_preprocessed_lib/use_preprocessed_no_intf.mli:1: mark_used

./examples/using_dune/bin/use_unwrapped_lib/use_builder_sig_api.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_constructors.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_include_modtype.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_mixed_args.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_opt_args.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_opt_args_in_higher_order_fun.mli:1: mark_used
Expand All @@ -89,7 +95,9 @@
./examples/using_dune/bin/use_unwrapped_lib/use_with_class.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_without_class.mli:1: mark_used

./examples/using_dune/bin/use_wrapped_lib/use_builder_sig_api.mli:1: mark_used
./examples/using_dune/bin/use_wrapped_lib/use_constructors.mli:1: mark_used
./examples/using_dune/bin/use_wrapped_lib/use_include_modtype.mli:1: mark_used
./examples/using_dune/bin/use_wrapped_lib/use_mixed_args.mli:1: mark_used
./examples/using_dune/bin/use_wrapped_lib/use_opt_args.mli:1: mark_used
./examples/using_dune/bin/use_wrapped_lib/use_opt_args_in_higher_order_fun.mli:1: mark_used
Expand Down
23 changes: 19 additions & 4 deletions check/threshold-1/threshold-1.ref
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@

./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:1: unused_fun_with_single_never_used_opt_arg

./examples/using_dune/unwrapped_lib/values/builder_sig_api/bsa_api.ml:7: S.unused: Not detected
./examples/using_dune/unwrapped_lib/values/builder_sig_api/bsa_api.ml:7: unused: Should not be detected
./examples/using_dune/unwrapped_lib/values/include_modtype/imt_modtype.ml:2: S.unused: Not detected
./examples/using_dune/unwrapped_lib/values/include_modtype/imt_modtype.ml:2: unused: Should not be detected
./examples/using_dune/unwrapped_lib/values/include_modtype/imt_modtype.ml:2: unused: Should not be detected
./examples/using_dune/unwrapped_lib/values/values.mli:2: unused_int
./examples/using_dune/unwrapped_lib/values/values.mli:14: unused_fun
./examples/using_dune/unwrapped_lib/values/values.mli:20: unused_alias_fun
Expand All @@ -18,6 +23,12 @@

./examples/using_dune/wrapped_lib/opt_args/opt_args.mli:1: unused_fun_with_single_never_used_opt_arg

./examples/using_dune/wrapped_lib/values/builder_sig_api/bsa_api.ml:7: S.unused: Not detected
./examples/using_dune/wrapped_lib/values/builder_sig_api/bsa_api.ml:7: unused: Should not be detected
./examples/using_dune/wrapped_lib/values/builder_sig_api/bsa_api.ml:7: unused: Should not be detected
./examples/using_dune/wrapped_lib/values/include_modtype/imt_modtype.ml:2: S.unused: Not detected
./examples/using_dune/wrapped_lib/values/include_modtype/imt_modtype.ml:2: unused: Should not be detected
./examples/using_dune/wrapped_lib/values/include_modtype/imt_modtype.ml:2: unused: Should not be detected
./examples/using_dune/wrapped_lib/values/values.mli:2: unused_int
./examples/using_dune/wrapped_lib/values/values.mli:14: unused_fun
./examples/using_dune/wrapped_lib/values/values.mli:20: unused_alias_fun
Expand Down Expand Up @@ -75,7 +86,9 @@
./examples/using_dune/bin/use_preprocessed_lib/use_preprocessed_lib.mli:1: mark_used
./examples/using_dune/bin/use_preprocessed_lib/use_preprocessed_no_intf.mli:1: mark_used

./examples/using_dune/bin/use_unwrapped_lib/use_builder_sig_api.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_constructors.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_include_modtype.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_mixed_args.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_opt_args.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_opt_args_in_higher_order_fun.mli:1: mark_used
Expand All @@ -89,7 +102,9 @@
./examples/using_dune/bin/use_unwrapped_lib/use_with_class.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_without_class.mli:1: mark_used

./examples/using_dune/bin/use_wrapped_lib/use_builder_sig_api.mli:1: mark_used
./examples/using_dune/bin/use_wrapped_lib/use_constructors.mli:1: mark_used
./examples/using_dune/bin/use_wrapped_lib/use_include_modtype.mli:1: mark_used
./examples/using_dune/bin/use_wrapped_lib/use_mixed_args.mli:1: mark_used
./examples/using_dune/bin/use_wrapped_lib/use_opt_args.mli:1: mark_used
./examples/using_dune/bin/use_wrapped_lib/use_opt_args_in_higher_order_fun.mli:1: mark_used
Expand Down Expand Up @@ -809,7 +824,7 @@ Nothing else to report in this section
--------------------------------------------------------------------------------


Total: 701
Success: 701
Failed: 0
Ratio: 100.%
Total: 716
Success: 705
Failed: 11
Ratio: 98.4636871508%
20 changes: 20 additions & 0 deletions check/threshold-3-0.5/threshold-3-0.5.exp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:1: unused_fun_with_single_never_used_opt_arg

./examples/using_dune/unwrapped_lib/values/builder_sig_api/bsa_api.ml:7: S.unused
./examples/using_dune/unwrapped_lib/values/include_modtype/imt_modtype.ml:2: S.unused
./examples/using_dune/unwrapped_lib/values/values.mli:2: unused_int
./examples/using_dune/unwrapped_lib/values/values.mli:14: unused_fun
./examples/using_dune/unwrapped_lib/values/values.mli:20: unused_alias_fun
Expand All @@ -18,6 +20,8 @@

./examples/using_dune/wrapped_lib/opt_args/opt_args.mli:1: unused_fun_with_single_never_used_opt_arg

./examples/using_dune/wrapped_lib/values/builder_sig_api/bsa_api.ml:7: S.unused
./examples/using_dune/wrapped_lib/values/include_modtype/imt_modtype.ml:2: S.unused
./examples/using_dune/wrapped_lib/values/values.mli:2: unused_int
./examples/using_dune/wrapped_lib/values/values.mli:14: unused_fun
./examples/using_dune/wrapped_lib/values/values.mli:20: unused_alias_fun
Expand Down Expand Up @@ -75,7 +79,9 @@
./examples/using_dune/bin/use_preprocessed_lib/use_preprocessed_lib.mli:1: mark_used
./examples/using_dune/bin/use_preprocessed_lib/use_preprocessed_no_intf.mli:1: mark_used

./examples/using_dune/bin/use_unwrapped_lib/use_builder_sig_api.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_constructors.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_include_modtype.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_mixed_args.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_opt_args.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_opt_args_in_higher_order_fun.mli:1: mark_used
Expand All @@ -89,7 +95,9 @@
./examples/using_dune/bin/use_unwrapped_lib/use_with_class.mli:1: mark_used
./examples/using_dune/bin/use_unwrapped_lib/use_without_class.mli:1: mark_used

./examples/using_dune/bin/use_wrapped_lib/use_builder_sig_api.mli:1: mark_used
./examples/using_dune/bin/use_wrapped_lib/use_constructors.mli:1: mark_used
./examples/using_dune/bin/use_wrapped_lib/use_include_modtype.mli:1: mark_used
./examples/using_dune/bin/use_wrapped_lib/use_mixed_args.mli:1: mark_used
./examples/using_dune/bin/use_wrapped_lib/use_opt_args.mli:1: mark_used
./examples/using_dune/bin/use_wrapped_lib/use_opt_args_in_higher_order_fun.mli:1: mark_used
Expand Down Expand Up @@ -262,6 +270,12 @@
./examples/using_dune/unwrapped_lib/opt_args/opt_args_in_higher_order_fun.mli:13: expect_fun_with_never_used_opt_arg_with_sig
./examples/using_dune/unwrapped_lib/opt_args/opt_args_in_higher_order_fun.mli:15: expect_fun_with_always_used_opt_arg_with_sig

./examples/using_dune/unwrapped_lib/values/builder_sig_api/bsa_api.ml:9: S.internally_used
./examples/using_dune/unwrapped_lib/values/builder_sig_api/bsa_api.ml:10: S.externally_used
./examples/using_dune/unwrapped_lib/values/builder_sig_api/bsa_api.ml:11: S.sometimes_used
./examples/using_dune/unwrapped_lib/values/include_modtype/imt_modtype.ml:4: S.internally_used
./examples/using_dune/unwrapped_lib/values/include_modtype/imt_modtype.ml:5: S.externally_used
./examples/using_dune/unwrapped_lib/values/include_modtype/imt_modtype.ml:6: S.sometimes_used
./examples/using_dune/unwrapped_lib/values/values.mli:1: used_int
./examples/using_dune/unwrapped_lib/values/values.mli:13: used_fun
./examples/using_dune/unwrapped_lib/values/values.mli:19: used_alias_fun
Expand Down Expand Up @@ -291,6 +305,12 @@
./examples/using_dune/wrapped_lib/opt_args/opt_args_in_higher_order_fun.mli:13: expect_fun_with_never_used_opt_arg_with_sig
./examples/using_dune/wrapped_lib/opt_args/opt_args_in_higher_order_fun.mli:15: expect_fun_with_always_used_opt_arg_with_sig

./examples/using_dune/wrapped_lib/values/builder_sig_api/bsa_api.ml:9: S.internally_used
./examples/using_dune/wrapped_lib/values/builder_sig_api/bsa_api.ml:10: S.externally_used
./examples/using_dune/wrapped_lib/values/builder_sig_api/bsa_api.ml:11: S.sometimes_used
./examples/using_dune/wrapped_lib/values/include_modtype/imt_modtype.ml:4: S.internally_used
./examples/using_dune/wrapped_lib/values/include_modtype/imt_modtype.ml:5: S.externally_used
./examples/using_dune/wrapped_lib/values/include_modtype/imt_modtype.ml:6: S.sometimes_used
./examples/using_dune/wrapped_lib/values/values.mli:1: used_int
./examples/using_dune/wrapped_lib/values/values.mli:13: used_fun
./examples/using_dune/wrapped_lib/values/values.mli:19: used_alias_fun
Expand Down
Loading