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

correct error reporting for variable_names write option

Browse Source
This commit is contained in:
Mark Thom
2019-05-06 22:45:32 -04:00
parent da17d3070d
commit 6240f04769
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/prolog/lib/builtins.pl
View File

@@ -220,7 +220,7 @@ is_write_option(Functor) :-
Functor =.. [Name, Arg], Functor =.. [Name, Arg],
( Arg == true -> true ( Arg == true -> true
; Arg == false -> true ; Arg == false -> true
; Name == variable_names -> must_be_var_names_list(Arg) ; Name == variable_names -> must_be_var_names_list(Arg)
; var(Arg) -> throw(error(instantiation_error, write_term/2)) ; var(Arg) -> throw(error(instantiation_error, write_term/2))
; throw(error(domain_error(write_option, Functor), write_term/2)) ; throw(error(domain_error(write_option, Functor), write_term/2))
), % 8.14.2.3 e) ), % 8.14.2.3 e)
@@ -249,6 +249,7 @@ must_be_var_names_list_([]).
must_be_var_names_list_([VarName | VarNames]) :- must_be_var_names_list_([VarName | VarNames]) :-
( nonvar(VarName), VarName = (Atom = _) -> ( nonvar(VarName), VarName = (Atom = _) ->
( atom(Atom) -> must_be_var_names_list_(VarNames) ( atom(Atom) -> must_be_var_names_list_(VarNames)
; var(Atom) -> throw(error(instantiation_error, write_term/2))
; throw(error(domain_error(write_options, variable_names(VarName)), write_term/2)) ; throw(error(domain_error(write_options, variable_names(VarName)), write_term/2))
) )
; throw(error(domain_error(write_options, variable_names(VarName)), write_term/2)) ; throw(error(domain_error(write_options, variable_names(VarName)), write_term/2))