rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

throw instantiation_error when appropriate from parse_write_options_ (5.5.12 of the standard, #1965)

Browse Source
This commit is contained in:
Mark
2023-09-26 12:08:51 -06:00
parent 193bb313fd
commit 39934208c3
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib/builtins.pl
View File

@@ -574,26 +574,30 @@ parse_write_options(Options, OptionValues, Stub) :-
parse_write_options_(double_quotes(DoubleQuotes), double_quotes-DoubleQuotes) :- parse_write_options_(double_quotes(DoubleQuotes), double_quotes-DoubleQuotes) :-
( nonvar(DoubleQuotes), ( var(DoubleQuotes) ->
lists:member(DoubleQuotes, [true, false]), throw(error(instantiation_error, _))
; lists:member(DoubleQuotes, [true, false]),
! !
; throw(error(domain_error(write_option, double_quotes(DoubleQuotes)), _)) ; throw(error(domain_error(write_option, double_quotes(DoubleQuotes)), _))
). ).
parse_write_options_(ignore_ops(IgnoreOps), ignore_ops-IgnoreOps) :- parse_write_options_(ignore_ops(IgnoreOps), ignore_ops-IgnoreOps) :-
( nonvar(IgnoreOps), ( var(IgnoreOps) ->
lists:member(IgnoreOps, [true, false]), throw(error(instantiation_error, _))
; lists:member(IgnoreOps, [true, false]),
! !
; throw(error(domain_error(write_option, ignore_ops(IgnoreOps)), _)) ; throw(error(domain_error(write_option, ignore_ops(IgnoreOps)), _))
). ).
parse_write_options_(quoted(Quoted), quoted-Quoted) :- parse_write_options_(quoted(Quoted), quoted-Quoted) :-
( nonvar(Quoted), ( var(Quoted) ->
lists:member(Quoted, [true, false]), throw(error(instantiation_error, _))
; lists:member(Quoted, [true, false]),
! !
; throw(error(domain_error(write_option, quoted(Quoted)), _)) ; throw(error(domain_error(write_option, quoted(Quoted)), _))
). ).
parse_write_options_(numbervars(NumberVars), numbervars-NumberVars) :- parse_write_options_(numbervars(NumberVars), numbervars-NumberVars) :-
( nonvar(NumberVars), ( var(NumberVars) ->
lists:member(NumberVars, [true, false]), throw(error(instantiation_error, _))
; lists:member(NumberVars, [true, false]),
! !
; throw(error(domain_error(write_option, numbervars(NumberVars)), _)) ; throw(error(domain_error(write_option, numbervars(NumberVars)), _))
). ).
@@ -601,7 +605,9 @@ parse_write_options_(variable_names(VNNames), variable_names-VNNames) :-
must_be_var_names_list(VNNames), must_be_var_names_list(VNNames),
!. !.
parse_write_options_(max_depth(MaxDepth), max_depth-MaxDepth) :- parse_write_options_(max_depth(MaxDepth), max_depth-MaxDepth) :-
( integer(MaxDepth), ( var(MaxDepth) ->
throw(error(instantiation_error, _))
; integer(MaxDepth),
MaxDepth >= 0, MaxDepth >= 0,
! !
; throw(error(domain_error(write_option, max_depth(MaxDepth)), _)) ; throw(error(domain_error(write_option, max_depth(MaxDepth)), _))