codegen.ml in trackler-2.0.0.10

- old
+ new
@@ -1,17 +1,24 @@
 open Core.Std
 
 open Model
 
-type fixup_function = key: string -> value: parameter -> string
+type fixup_parameter_function = key: string -> value: parameter -> string
 
+type edit_parameters_function = (string * string) list -> (string * string) list
+
+let parameters_to_string pp: string =
+  List.map ~f:(fun (k,v) -> "(" ^ k ^ "," ^ v ^ ")") pp
+  |> String.concat ~sep:";"
+
 let replace_key (key: string) (value: string) (target: string): string =
   String.substr_replace_all target ~pattern:("$" ^ key) ~with_:value
 
-let rec replace_keys (f: fixup_function) (s: string) (c: case): string =
-  let s = replace_key "name" c.name s in
+let rec replace_keys (f: fixup_parameter_function) (ed: edit_parameters_function) (s: string) (c: case): string =
+  let s = replace_key "description" c.description s in
   let expected = f ~key:"expected" ~value:c.expected in
   let s = replace_key "expected" expected s in
-  List.fold c.parameters ~init:s ~f:(fun s (k,v) -> replace_key k (parameter_to_string v) s)
+  let parameter_strings = ed @@ List.map ~f:(fun (k,p) -> (k,parameter_to_string p)) c.parameters in
+  List.fold parameter_strings ~init:s ~f:(fun s (k,v) -> replace_key k v s)
 
-let generate_code (f: fixup_function) template cases =
-  Ok (List.map cases ~f:(replace_keys f template))
+let generate_code (f: fixup_parameter_function) (ed: edit_parameters_function) template cases =
+  Ok (List.map cases ~f:(replace_keys f ed template))