- | EGoal (loc, (params, patterns, exprs, code)) ->
- fprintf fp "goal %s (%s) =\n" name (String.concat ", " params);
- fprintf fp " ";
- iter_with_commas fp print_pattern patterns;
- fprintf fp " : ";
- iter_with_commas fp print_expr exprs;
- (match code with
- | None -> ()
- | Some code ->
- fprintf fp " {\n";
- print_code fp code;
- fprintf fp "\n }"
- );
- fprintf fp "\n"
- | expr ->
- fprintf fp "let %s = " name;
- print_expr fp expr;
- fprintf fp "\n"
+ | EGoal (loc, goal) -> string_goal () (Some name, goal) ^ "\n"
+ | expr -> sprintf "let %s = %a\n" name string_expr expr;
+
+and print_def fp name expr = output_string fp (string_def () (name, expr))
+
+and string_goal () (name, (param_decls, patterns, exprs, code)) =
+ sprintf "goal%s (%s) = %s : %s%s"
+ (match name with None -> "" | Some name -> " " ^ name)
+ (String.concat ", " (List.map (string_param_decl ()) param_decls))
+ (String.concat ", " (List.map (string_pattern ()) patterns))
+ (String.concat ", " (List.map (string_expr ()) exprs))
+ (match code with None -> "" | Some code -> " = { ... }")
+
+and string_param_decl () name = name