From 7edf1d0df1c8aea8062c3d18a67b195ddace6fce Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 9 Nov 2011 21:21:00 +0000 Subject: [PATCH] fish: More informative documentation of optargs. (cherry picked from commit 271f8e4b70e4acf2db96f6fe6317fda327fa5f2e) --- generator/generator_fish.ml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/generator/generator_fish.ml b/generator/generator_fish.ml index 4fd7ac8..5c70bb3 100644 --- a/generator/generator_fish.ml +++ b/generator/generator_fish.ml @@ -30,6 +30,13 @@ open Generator_structs 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; @@ -122,7 +129,9 @@ let generate_fish_cmds () = (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 @@ -842,7 +851,8 @@ and generate_fish_actions_pod () = ) 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"; -- 1.8.3.1