Renames

Author: WardBrian

scripts/install_build_deps.sh

@@ -8,6 +8,6 @@ eval $(opam env)
 opam pin -y core v0.16.0 --no-action
 
 opam install -y dune core.v0.16.0 menhir.20230608 ppx_deriving.5.2.1 fmt.0.9.0 yojson.2.1.0\
- cmdliner.1.3.0 uucp.15.1.0 uunf.15.1.0
+ cmdliner.1.3.0 uucp.16.0.0 uunf.16.0.0
 
 eval $(opam env)

scripts/install_build_deps_windows.sh

@@ -14,7 +14,7 @@ opam install -y "ocaml-windows64=4.14.1"
 
 # Install dependencies
 opam install -y core.v0.16.1 core-windows.v0.16.1 menhir.20230608 menhir-windows.20230608 ppx_deriving.5.2.1 ppx_deriving-windows.5.2.1\
- fmt.0.9.0 fmt-windows.0.9.0 yojson.2.1.0 yojson-windows.2.1.0 cmdliner.1.3.0 cmdliner-windows.1.3.0 uucp.15.1.0 uucp-windows.15.1.0\
- uunf.15.1.0 uunf-windows.15.1.0
+ fmt.0.9.0 fmt-windows.0.9.0 yojson.2.1.0 yojson-windows.2.1.0 cmdliner.1.3.0 cmdliner-windows.1.3.0 uucp.16.0.0 uucp-windows.16.0.0\
+ uunf.16.0.0 uunf-windows.16.0.0
 
 eval $(opam env)

src/common/Unicode.ml

@@ -13,7 +13,7 @@ let is_ascii s =
 
 let normalize = Uunf_string.normalize_utf_8 `NFKC
 
-let fold_uchars f acc str =
+let foldi_uchars ~f acc str =
   let len = String.length str in
   let rec loop pos acc =
     if pos == len then acc
@@ -25,19 +25,22 @@ let fold_uchars f acc str =
       loop (pos + char_length) acc in
   loop 0 acc
 
-let iter_uchars s f =
+let iteri_uchars ~f str =
   let f' buf pos c =
     f pos c;
     Buffer.add_utf_8_uchar buf c;
     buf in
   let s_after =
-    Buffer.contents @@ fold_uchars f' (Buffer.create (String.length s)) s in
+    Buffer.contents
+    @@ foldi_uchars ~f:f' (Buffer.create (String.length str)) str in
   (* another sanity check *)
-  if not (String.equal s s_after) then
+  if not (String.equal str s_after) then
     Core.(
       ICE.internal_compiler_error
         [%message
-          "Failed to round-trip unicode string!" (s : string) (s_after : string)])
+          "Failed to round-trip unicode string!"
+            (str : string)
+            (s_after : string)])
 
 (* WIP:
 
@@ -60,7 +63,7 @@ let confusable x y =
         (* TODO!! replace with prototype - need data? *)
         Buffer.add_utf_8_uchar acc c;
       acc in
-    let buf = fold_uchars f (Buffer.create (String.length x)) x in
+    let buf = foldi_uchars ~f (Buffer.create (String.length x)) x in
     let x = Buffer.contents buf in
     let x = Uunf_string.normalize_utf_8 `NFD x in
     x in
@@ -98,7 +101,7 @@ let restriction_level x =
     let scripts =
       Uucp.Script.script_extensions c |> ScriptSet.of_list |> extended in
     scripts :: acc in
-  let soss = fold_uchars f [] x in
+  let soss = foldi_uchars ~f [] x in
   let resolved = List.fold_right ScriptSet.inter soss all in
   if not @@ ScriptSet.is_empty resolved then `Single
   else `Unrestricted (* TODO implement levels 3-5 *)

src/frontend/Identifiers.ml

@@ -38,7 +38,7 @@ let validate_utf8_id ~loc id =
       error ~loc
         (Fmt.str "Invalid character in identifier at offset %d: '%a'" pos
            pp_uchar uchar) in
-  iter_uchars id f;
+  iteri_uchars ~f id;
   id
 
 let validate loc id =

src/stan_math_backend/Cpp.ml

@@ -399,7 +399,7 @@ module Printing = struct
         let uchar_int = Uchar.to_scalar c in
         if uchar_int < 128 then Fmt.char ppf (Char.of_int_exn uchar_int)
         else Fmt.pf ppf "\\u%04X" (Uchar.to_scalar c) in
-      Common.Unicode.iter_uchars s f
+      Common.Unicode.iteri_uchars ~f s
 
   let rec pp_type_ ppf t =
     match t with