CatalaLang/catala
1
1
Fork 0
mirror of https://github.com/CatalaLang/catala.git synced 2024-11-08 07:51:43 +03:00
Code Issues Projects Releases Wiki Activity

Cli: allow standard option --color=always|never|auto to control styling

Browse Source
This commit is contained in:
Louis Gesbert 2022-07-26 14:52:02 +02:00
parent 25a0464e93
commit 922b77abc7
3 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/catala_web_interpreter.ml
View File

@ -13,7 +13,7 @@ let _ =
(Contents (Js.to_string contents))
{
Utils.Cli.debug = false;
unstyled = false;
color = Never;
wrap_weaved_output = false;
avoid_exceptions = false;
backend = "Interpret";

32
compiler/utils/cli.ml
View File

@ -94,11 +94,26 @@ let file =
let debug =
Arg.(value & flag & info ["debug"; "d"] ~doc:"Prints debug information.")
type when_enum = Auto | Always | Never
let when_opt = Arg.enum ["auto", Auto; "always", Always; "never", Never]
let color =
Arg.(
value
& opt ~vopt:Always when_opt Auto
& info ["color"]
~doc:
"Allow output of colored and styled text. If set to $(i,auto), \
enabled when the standard output is to a terminal.")
let unstyled =
Arg.(
value & flag
& info ["unstyled"; "u"]
~doc:"Removes styling (colors, etc.) from terminal output.")
~doc:
"Removes styling (colors, etc.) from terminal output. Equivalent to \
$(b,--color=never)")
let optimize =
Arg.(value & flag & info ["optimize"; "O"] ~doc:"Run compiler optimizations.")
@ -200,7 +215,7 @@ let output =
type options = {
debug : bool;
unstyled : bool;
color : when_enum;
wrap_weaved_output : bool;
avoid_exceptions : bool;
backend : string;
@ -219,6 +234,7 @@ type options = {
let options =
let make
debug
color
unstyled
wrap_weaved_output
avoid_exceptions
@ -235,7 +251,7 @@ let options =
print_only_law : options =
{
debug;
unstyled;
color = (if unstyled then Never else color);
wrap_weaved_output;
avoid_exceptions;
backend;
@ -252,8 +268,8 @@ let options =
}
in
Term.(
const make $ debug $ unstyled $ wrap_weaved_output $ avoid_exceptions
$ closure_conversion $ backend $ plugins_dirs $ language
const make $ debug $ color $ unstyled $ wrap_weaved_output
$ avoid_exceptions $ closure_conversion $ backend $ plugins_dirs $ language
$ max_prec_digits_opt $ trace_opt $ disable_counterexamples_opt $ optimize
$ ex_scope $ output $ print_only_law)
@ -261,7 +277,11 @@ let catala_t f = Term.(const f $ file $ options)
let set_option_globals options : unit =
debug_flag := options.debug;
style_flag := not options.unstyled;
(style_flag :=
match options.color with
| Always -> true
| Never -> false
| Auto -> Unix.isatty Unix.stdout);
trace_flag := options.trace;
optimize_flag := options.optimize;
disable_counterexamples := options.disable_counterexamples;

5
compiler/utils/cli.mli
View File

@ -81,9 +81,12 @@ val max_prec_digits_opt : int option Cmdliner.Term.t
val ex_scope : string option Cmdliner.Term.t
val output : string option Cmdliner.Term.t
(** The usual auto/always/never option argument *)
type when_enum = Auto | Always | Never
type options = {
debug : bool;
unstyled : bool;
color : when_enum;
wrap_weaved_output : bool;
avoid_exceptions : bool;
backend : string;