in
List.iter (
- fun (_, style, _, _, _, _, _) ->
- match fst style with
+ fun (_, (ret, _, _), _, _, _, _, _) ->
+ match ret with
| RStruct (_, structname) -> update structname RStructOnly
| RStructList (_, structname) -> update structname RStructListOnly
| _ -> ()
let name_of_argt = function
| Pathname n | Device n | Dev_or_Path n | String n | OptString n
| StringList n | DeviceList n | Bool n | Int n | Int64 n
- | FileIn n | FileOut n | BufferIn n | Key n -> n
+ | FileIn n | FileOut n | BufferIn n | Key n | Pointer (_, n) -> n
let seq_of_test = function
| TestRun s | TestOutput (s, _) | TestOutputList (s, _)
| TestLastFail s -> s
let c_quote str =
+ let str = replace_str str "\\" "\\\\" in
let str = replace_str str "\r" "\\r" in
let str = replace_str str "\n" "\\n" in
let str = replace_str str "\t" "\\t" in
let str = replace_str str "\000" "\\0" in
+ let str = replace_str str "\"" "\\\"" in
str
(* Used to memoize the result of pod2text. *)
-let pod2text_memo_filename = "generator/.pod2text.data"
-let pod2text_memo : ((int * string * string), string list) Hashtbl.t =
+let pod2text_memo_filename = "generator/.pod2text.data.version.2"
+let pod2text_memo : ((int option * bool * bool * string * string), string list) Hashtbl.t =
try
let chan = open_in pod2text_memo_filename in
let v = input_value chan in
* Because this is very slow (the slowest part of autogeneration),
* we memoize the results.
*)
-let pod2text ~width name longdesc =
- let key = width, name, longdesc in
+let pod2text ?width ?(trim = true) ?(discard = true) name longdesc =
+ let key = width, trim, discard, name, longdesc in
try Hashtbl.find pod2text_memo key
with Not_found ->
let filename, chan = Filename.open_temp_file "gen" ".tmp" in
fprintf chan "=head1 %s\n\n%s\n" name longdesc;
close_out chan;
- let cmd = sprintf "pod2text -w %d %s" width (Filename.quote filename) in
+ let cmd =
+ match width with
+ | Some width ->
+ sprintf "pod2text -w %d %s" width (Filename.quote filename)
+ | None ->
+ sprintf "pod2text %s" (Filename.quote filename) in
let chan = open_process_in cmd in
let lines = ref [] in
let rec loop i =
let line = input_line chan in
- if i = 1 then (* discard the first line of output *)
+ if i = 1 && discard then (* discard the first line of output *)
loop (i+1)
else (
- let line = triml line in
+ let line = if trim then triml line else line in
lines := line :: !lines;
loop (i+1)
) in
(* Compare two actions (for sorting). *)
let action_compare (n1,_,_,_,_,_,_) (n2,_,_,_,_,_,_) = compare n1 n2
+
+let chars c n =
+ let str = String.create n in
+ for i = 0 to n-1 do
+ String.unsafe_set str i c
+ done;
+ str
+
+let spaces n = chars ' ' n