Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore compatibility with OCaml < 4.13 #1023

Merged
merged 1 commit into from
Jan 24, 2024
Merged
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
2 changes: 1 addition & 1 deletion template-coq/src/denoter.ml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ struct
| ACoq_tFloat x -> evm, Constr.mkFloat (D.unquote_float64 x)
| ACoq_tArray (u, arr, def, ty) ->
let evm, u = D.unquote_universe_level evm u in
let evm, arr = Array.fold_left_map (fun evm a -> aux env evm a) evm arr in
let evm, arr = ArrayCompat.fold_left_map (fun evm a -> aux env evm a) evm arr in
let evm, def = aux env evm def in
let evm, ty = aux env evm ty in
evm, Constr.mkArray (Univ.Instance.of_array [|u|], arr, def, ty)
Expand Down
2 changes: 1 addition & 1 deletion template-coq/src/quoter.ml
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ struct
let u = match Univ.Instance.to_array u with [| u |] -> u | _ -> assert false in
let def', acc = quote_term acc env sigma def in
let ty', acc = quote_term acc env sigma ty in
let acc, arr' = Array.fold_left_map (fun acc t -> let t', acc = quote_term acc env sigma t in acc, t') acc ar in
let acc, arr' = ArrayCompat.fold_left_map (fun acc t -> let t', acc = quote_term acc env sigma t in acc, t') acc ar in
Q.mkArray (Q.quote_univ_level u) arr' ~default:def' ~ty:ty', acc
in
aux acc env trm
Expand Down
17 changes: 17 additions & 0 deletions template-coq/src/tm_util.ml
Original file line number Diff line number Diff line change
Expand Up @@ -314,3 +314,20 @@ type ('term, 'nat, 'ident, 'name, 'quoted_sort, 'cast_kind, 'kername, 'inductive
| ACoq_tFloat of 'float64
| ACoq_tArray of 'universe_level * 'term array * 'term * 'term

module ArrayCompat = struct
(** For compat with OCaml < 4.13, copied from https://github.com/ocaml/ocaml/blob/d5b5c34971ed4291c385852f820554ad57adba84/stdlib/array.ml#L195-L207 *)
let fold_left_map f acc input_array =
let open Array in
let len = length input_array in
if len = 0 then (acc, [||]) else begin
let acc, elt = f acc (unsafe_get input_array 0) in
let output_array = make len elt in
let acc = ref acc in
for i = 1 to len - 1 do
let acc', elt = f !acc (unsafe_get input_array i) in
acc := acc';
unsafe_set output_array i elt;
done;
!acc, output_array
end
end