Skip to content

Fix build with OCaml 4.06 (and -safe-string) #580

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.

Sign up for GitHub

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

Merged
djs55 merged 1 commit into from
Nov 4, 2017
Merged

Fix build with OCaml 4.06 (and -safe-string) #580

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions cohttp/scripts/generate.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,13 @@ type section = {
}

let normalize s =
let b = Bytes.of_string s in
Bytes.iteri (fun i -> function
| 'A'..'Z' as c -> if i > 1 then Bytes.set s i (Char.lowercase_ascii c)
| ' '|'-'|'\'' -> Bytes.set s i '_'
| 'A'..'Z' as c -> if i > 1 then Bytes.set b i (Char.lowercase_ascii c)
| ' '|'-'|'\'' -> Bytes.set b i '_'
| _ -> ()
) s
) (Bytes.of_string s);
Bytes.to_string b

let read ic =
let json = of_channel ic in
Expand All @@ -142,8 +144,7 @@ let read ic =
match List.assoc "class" o with
| `O o ->
let s = String.uncapitalize_ascii (to_string (List.assoc "title" o)) in
normalize s;
s
normalize s
| _ -> assert false in

let codes =
Expand All @@ -164,9 +165,9 @@ let read ic =
let i = String.index descr '(' in
String.sub descr 0 (i-1)
with Not_found ->
Bytes.copy descr
descr
) in
normalize constr;
let constr = normalize constr in
(* XXX: dirty hack *)
let constr = if constr = "`Ok" then "`OK" else constr in
let doc = to_string (List.assoc "summary" o) in
Expand Down