From: Bennet Bleßmann Date: Sat, 26 Jul 2025 20:08:58 +0000 (+0200) Subject: address comment by triska X-Git-Tag: v0.10.0~35^2^2~8 X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=d0a6dc9df2b2a33bef002f34a19ec079537c4452;p=scryer-prolog.git address comment by triska https://github.com/mthom/scryer-prolog/pull/3009#discussion_r2233221091 --- diff --git a/src/lib/process.pl b/src/lib/process.pl index 2f8ceec1..fcc17491 100644 --- a/src/lib/process.pl +++ b/src/lib/process.pl @@ -51,12 +51,12 @@ process_create(Exe, Args, Options) :- must_be_known_options([stdin, stdout, stderr, env, environment, process, cwd], [], Options), check_options( [ - ([stdin], valid_stdio, stdin(std), stdin(Stdin)), - ([stdout], valid_stdio, stdout(std), stdout(Stdout)), - ([stderr], valid_stdio, stderr(std), stderr(Stderr)), - ([env, environment], valid_env, environment([]), Env), - ([process], valid_uninit_process, process(_), process(Process)), - ([cwd], valid_cwd, cwd("."), cwd(Cwd)) + option([stdin], valid_stdio, stdin(std), stdin(Stdin)), + option([stdout], valid_stdio, stdout(std), stdout(Stdout)), + option([stderr], valid_stdio, stderr(std), stderr(Stderr)), + option([env, environment], valid_env, environment([]), Env), + option([process], valid_uninit_process, process(_), process(Process)), + option([cwd], valid_cwd, cwd("."), cwd(Cwd)) ], Options ), @@ -102,7 +102,7 @@ process_wait(Process, Status, Options) :- valid_process(Process, process_wait/3), must_be_known_options([timeout], [], Options),check_options( [ - ([timeout], valid_timeout, timeout(infinite), timeout(Timeout)) + option([timeout], valid_timeout, timeout(infinite), timeout(Timeout)) ], Options ), @@ -147,7 +147,7 @@ must_be_known_options(Valid, Found, [X|XS]) :- check_options([], _). check_options([X | XS], Options) :- - (Kinds, Pred, Default, Choice) = X, + option(Kinds, Pred, Default, Choice) = X, tfilter(find_option(Kinds), Options, Solutions), ( Solutions = [] -> Choice = Default ; Solutions = [Provided] -> call(Pred, Provided), Choice = Provided