From a25aae33935b8c4a457b6aba57dff18e1fa5f6fe Mon Sep 17 00:00:00 2001 From: Zesen Qian Date: Fri, 28 Jun 2024 18:11:49 +0100 Subject: [PATCH] DOTDOT means interval --- .../formatting/test_locations.dlocations.ocamlc.reference | 4 ++-- .../test_locations.dno-locations.ocamlc.reference | 4 ++-- ocaml/typing/solver.ml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ocaml/testsuite/tests/formatting/test_locations.dlocations.ocamlc.reference b/ocaml/testsuite/tests/formatting/test_locations.dlocations.ocamlc.reference index f073c96adcf..c913c00b11b 100644 --- a/ocaml/testsuite/tests/formatting/test_locations.dlocations.ocamlc.reference +++ b/ocaml/testsuite/tests/formatting/test_locations.dlocations.ocamlc.reference @@ -88,11 +88,11 @@ let rec fib = function | 0 | 1 -> 1 | n -> (fib (n - 1)) + (fib (n - 2)) pattern (test_locations.ml[17,534+8]..test_locations.ml[17,534+11]) Tpat_var "fib" - value_mode global,many,nonportable;join(shared,contended)(modevar#1[shared,uncontended ... unique,uncontended]) + value_mode global,many,nonportable;join(shared,contended)(modevar#1[shared,uncontended .. unique,uncontended]) expression (test_locations.ml[17,534+14]..test_locations.ml[19,572+34]) Texp_function region true - alloc_mode global,many,nonportable;id(modevar#7[shared,contended ... unique,uncontended]) + alloc_mode global,many,nonportable;id(modevar#7[shared,contended .. unique,uncontended]) [] Tfunction_cases (test_locations.ml[17,534+14]..test_locations.ml[19,572+34]) alloc_mode global,many,nonportable;shared,uncontended diff --git a/ocaml/testsuite/tests/formatting/test_locations.dno-locations.ocamlc.reference b/ocaml/testsuite/tests/formatting/test_locations.dno-locations.ocamlc.reference index fbe58af957f..41ebb6653bf 100644 --- a/ocaml/testsuite/tests/formatting/test_locations.dno-locations.ocamlc.reference +++ b/ocaml/testsuite/tests/formatting/test_locations.dno-locations.ocamlc.reference @@ -88,11 +88,11 @@ let rec fib = function | 0 | 1 -> 1 | n -> (fib (n - 1)) + (fib (n - 2)) pattern Tpat_var "fib" - value_mode global,many,nonportable;join(shared,contended)(modevar#1[shared,uncontended ... unique,uncontended]) + value_mode global,many,nonportable;join(shared,contended)(modevar#1[shared,uncontended .. unique,uncontended]) expression Texp_function region true - alloc_mode global,many,nonportable;id(modevar#7[shared,contended ... unique,uncontended]) + alloc_mode global,many,nonportable;id(modevar#7[shared,contended .. unique,uncontended]) [] Tfunction_cases alloc_mode global,many,nonportable;shared,uncontended diff --git a/ocaml/typing/solver.ml b/ocaml/typing/solver.ml index d321fb50770..fd8cabcc9ab 100644 --- a/ocaml/typing/solver.ml +++ b/ocaml/typing/solver.ml @@ -128,11 +128,11 @@ module Solver_mono (C : Lattices_mono) = struct | Amodejoin : 'a * ('a, 'l * disallowed) morphvar list -> ('a, 'l * disallowed) mode - (** [Amodejoin a [mv0, mv1, ...]] represents [a join mv0 join mv1 join ...] *) + (** [Amodejoin a [mv0, mv1, ..]] represents [a join mv0 join mv1 join ..] *) | Amodemeet : 'a * ('a, disallowed * 'r) morphvar list -> ('a, disallowed * 'r) mode - (** [Amodemeet a [mv0, mv1, ...]] represents [a meet mv0 meet mv1 meet ...]. *) + (** [Amodemeet a [mv0, mv1, ..]] represents [a meet mv0 meet mv1 meet ..]. *) (** Prints a mode variable, including the set of variables below it (recursively). To handle cycles, [traversed] is the set of variables that @@ -154,7 +154,7 @@ module Solver_mono (C : Lattices_mono) = struct let rec print_var : type a. ?traversed:VarSet.t -> a C.obj -> _ -> a var -> _ = fun ?traversed obj ppf v -> - Format.fprintf ppf "modevar#%x[%a ... %a]" v.id (C.print obj) v.lower + Format.fprintf ppf "modevar#%x[%a .. %a]" v.id (C.print obj) v.lower (C.print obj) v.upper; match traversed with | None -> ()