From 1ec7c7a236d7cc6e7f1c0ae476d5223c2281cdc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20Mart=C3=ADnez?= Date: Tue, 30 May 2023 17:20:20 -0700 Subject: [PATCH] options: fix the order of warn_error See comments in #2950 --- src/basic/FStar.Errors.fst | 4 +++- src/basic/FStar.Options.fst | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/basic/FStar.Errors.fst b/src/basic/FStar.Errors.fst index 060418fa332..1c9aa2084eb 100644 --- a/src/basic/FStar.Errors.fst +++ b/src/basic/FStar.Errors.fst @@ -92,7 +92,9 @@ let update_flags (l:list (error_flag * string)) in flag, (l, h) in - let error_range_settings = List.map compute_range l in + // NOTE: Rev below so when we handle things like '@0..100-50' + // the -50 overrides the @0..100. + let error_range_settings = List.map compute_range (List.rev l) in List.collect set_flag_for_range error_range_settings @ default_settings diff --git a/src/basic/FStar.Options.fst b/src/basic/FStar.Options.fst index d8b324b0179..c5db3e5777f 100644 --- a/src/basic/FStar.Options.fst +++ b/src/basic/FStar.Options.fst @@ -1283,7 +1283,7 @@ let rec specs_with_types warn_unsafe : list (char * string * opt_type * string) ( noshort, "warn_error", - Accumulated (SimpleStr ("")), + ReverseAccumulated (SimpleStr ("")), "The [-warn_error] option follows the OCaml syntax, namely:\n\t\t\ - [r] is a range of warnings (either a number [n], or a range [n..n])\n\t\t\ - [-r] silences range [r]\n\t\t\