Upgrade Ocamlformat version.
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
(** [pair_nums_from_string s] takes a string of two numbers separated by
|
||||
(** [pair_nums_from_string s] takes a string of two numbers separated by
|
||||
whitespace and returns the pair of the numbers *)
|
||||
let pair_ints_of_string s =
|
||||
match Aoc.ints_of_string s with
|
||||
match Aoc.ints_of_string ~sep:" " s with
|
||||
| [ h; h' ] -> (h, h')
|
||||
| _ -> raise (Invalid_argument "pair_nums_from_string")
|
||||
|
||||
(** [rev_split lst] takes a list of pairs and returns a pair of lists. Is
|
||||
equivalent to List.split (List.rev lst) but more efficient (and tail
|
||||
(** [rev_split lst] takes a list of pairs and returns a pair of lists. Is
|
||||
equivalent to List.split (List.rev lst) but more efficient (and tail
|
||||
recursive). *)
|
||||
let rev_split lst =
|
||||
let rec impl acc acc' = function
|
||||
@@ -16,7 +16,7 @@ let rev_split lst =
|
||||
impl [] [] lst
|
||||
|
||||
(** [count lst n] counts the number of times [n] appears as an element in [lst].
|
||||
*)
|
||||
*)
|
||||
let count lst n =
|
||||
List.fold_left (fun acc x -> if x = n then acc + 1 else acc) 0 lst
|
||||
|
||||
|
@@ -14,7 +14,7 @@ let find_rule a b m =
|
||||
| Some s -> ( match IntSet.find_opt b s with Some _ -> true | None -> false)
|
||||
| None -> false
|
||||
|
||||
(** [compare m a b] is a total ordering on pages in the rule map [m]. Returns
|
||||
(** [compare m a b] is a total ordering on pages in the rule map [m]. Returns
|
||||
[-1] if [a] should appear before [b], [0] if [a = b], and [1] if [b] should
|
||||
appear before [a]. *)
|
||||
let compare m a b =
|
||||
@@ -35,9 +35,9 @@ let rec is_page_order_valid m pages =
|
||||
in
|
||||
match pages with h :: t -> impl h t && is_page_order_valid m t | [] -> true
|
||||
|
||||
(** [parse_rules lst] parses the rules in the list [lst] stopping when
|
||||
encountering an empty line. Returns a pair [(rule_map, tail)].
|
||||
[tail] starts the line after the empty line. *)
|
||||
(** [parse_rules lst] parses the rules in the list [lst] stopping when
|
||||
encountering an empty line. Returns a pair [(rule_map, tail)]. [tail] starts
|
||||
the line after the empty line. *)
|
||||
let parse_rules =
|
||||
let m = Hashtbl.create 17 in
|
||||
let rec impl = function
|
||||
@@ -52,7 +52,7 @@ let parse_rules =
|
||||
in
|
||||
impl
|
||||
|
||||
(** [parse_page_orders lst] parses a list of page orders. *)
|
||||
(** [parse_page_orders lst] parses a list of page orders. *)
|
||||
let parse_page_orders =
|
||||
let rec impl acc = function
|
||||
| [] -> acc
|
||||
|
Reference in New Issue
Block a user