git.annexia.org
/
libguestfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
145ed04
)
fish: More informative documentation of optargs.
author
Richard W.M. Jones
<rjones@redhat.com>
Wed, 9 Nov 2011 21:21:00 +0000
(21:21 +0000)
committer
Richard W.M. Jones
<rjones@redhat.com>
Wed, 9 Nov 2011 21:21:48 +0000
(21:21 +0000)
generator/generator_fish.ml
patch
|
blob
|
history
diff --git
a/generator/generator_fish.ml
b/generator/generator_fish.ml
index
6d6a571
..
4111be5
100644
(file)
--- a/
generator/generator_fish.ml
+++ b/
generator/generator_fish.ml
@@
-30,6
+30,13
@@
open Generator_structs
open Generator_prepopts
open Generator_c
open Generator_prepopts
open Generator_c
+let doc_opttype_of = function
+ | Bool n -> "true|false"
+ | Int n
+ | Int64 n -> "N"
+ | String n -> ".."
+ | _ -> assert false
+
(* Generate a lot of different functions for guestfish. *)
let generate_fish_cmds () =
generate_header CStyle GPLv2plus;
(* Generate a lot of different functions for guestfish. *)
let generate_fish_cmds () =
generate_header CStyle GPLv2plus;
@@
-122,7
+129,9
@@
let generate_fish_cmds () =
(String.concat ""
(List.map (fun arg -> " " ^ name_of_argt arg) args))
(String.concat ""
(String.concat ""
(List.map (fun arg -> " " ^ name_of_argt arg) args))
(String.concat ""
- (List.map (fun arg -> sprintf " [%s:..]" (name_of_argt arg)) optargs)) in
+ (List.map (fun arg ->
+ sprintf " [%s:%s]" (name_of_argt arg) (doc_opttype_of arg)
+ ) optargs)) in
let warnings =
if List.exists (function Key _ -> true | _ -> false) args then
let warnings =
if List.exists (function Key _ -> true | _ -> false) args then
@@
-834,7
+843,8
@@
and generate_fish_actions_pod () =
) args;
List.iter (
function
) args;
List.iter (
function
- | Bool n | Int n | Int64 n | String n -> pr " [%s:..]" n
+ | (Bool n | Int n | Int64 n | String n) as arg ->
+ pr " [%s:%s]" n (doc_opttype_of arg)
| _ -> assert false
) optargs;
pr "\n";
| _ -> assert false
) optargs;
pr "\n";