From 615f504a5f02bbde4fb508fac4e816305688b08c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 9 Nov 2011 17:48:42 +0000 Subject: [PATCH] ocaml: Fix bindings when a function takes more than 10 parameters. If any function had more than 10 required + optional parameters, OCaml bindings could not be generated. Currently there are no such functions. (cherry picked from commit 29172e7c4878085a680812f7f3b8ad6ea5f1193c) --- generator/generator_ocaml.ml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/generator/generator_ocaml.ml b/generator/generator_ocaml.ml index 51bc3d6..4f7548c 100644 --- a/generator/generator_ocaml.ml +++ b/generator/generator_ocaml.ml @@ -440,13 +440,23 @@ copy_table (char * const * argv) pr ")\n"; pr "{\n"; + (* CAMLparam can only take up to 5 parameters. Further parameters + * have to be passed in groups of 5 to CAMLxparam calls. + *) (match params with - | [p1; p2; p3; p4; p5] -> - pr " CAMLparam5 (%s);\n" (String.concat ", " params) | p1 :: p2 :: p3 :: p4 :: p5 :: rest -> pr " CAMLparam5 (%s);\n" (String.concat ", " [p1; p2; p3; p4; p5]); - pr " CAMLxparam%d (%s);\n" - (List.length rest) (String.concat ", " rest) + let rec loop = function + | [] -> () + | p1 :: p2 :: p3 :: p4 :: p5 :: rest -> + pr " CAMLxparam5 (%s);\n" + (String.concat ", " [p1; p2; p3; p4; p5]); + loop rest + | rest -> + pr " CAMLxparam%d (%s);\n" + (List.length rest) (String.concat ", " rest) + in + loop rest | ps -> pr " CAMLparam%d (%s);\n" (List.length ps) (String.concat ", " ps) ); -- 1.8.3.1