codegen.ml in trackler-2.0.3.3

- old
+ new
@@ -1,25 +1,29 @@
 open Core.Std
 
 open Model
 
-type fixup_parameter_function = key: string -> value: parameter -> string
+type edit_expected_function = value: parameter -> string
 
 type edit_parameters_function = (string * string) list -> (string * string) list
 
 type subst = Subst of string [@@deriving eq, show]
 
 let subst_to_string (Subst s) = s
 
+let map_subst (s: subst) ~(f: string -> string): subst =
+  Subst (subst_to_string s |> f)
+
 let replace_key (key: string) (value: string) (target: string): string =
   let replace = String.substr_replace_all ~with_:value in
   replace ~pattern:("$" ^ key) target |> replace ~pattern:("$(" ^ key ^ ")")
 
-let rec replace_keys (f: fixup_parameter_function) (ed: edit_parameters_function) (s: string) (c: case): subst =
+let rec replace_keys (f: edit_expected_function) (ed: edit_parameters_function) (s: string) (suite_name: string) (c: case): subst =
   let s = replace_key "description" c.description s in
-  let expected = f ~key:"expected" ~value:c.expected in
+  let expected = f ~value:c.expected in
   let s = replace_key "expected" expected s in
+  let s = replace_key "suite-name" suite_name s in
   let parameter_strings = ed @@ List.map ~f:(fun (k,p) -> (k,parameter_to_string p)) c.parameters in
   List.fold parameter_strings ~init:(Subst s) ~f:(fun (Subst s) (k,v) -> Subst (replace_key k v s))
 
-let generate_code (f: fixup_parameter_function) (ed: edit_parameters_function) template cases =
-  Ok (List.map cases ~f:(replace_keys f ed template))
+let fill_in_template (f: edit_expected_function) (ed: edit_parameters_function) test_template suite_name cases =
+  List.map cases ~f:(replace_keys f ed test_template suite_name)