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

merge with master

Browse Source
This commit is contained in:
Mark Thom
2020-05-03 18:49:15 -06:00
parent b8400e0c92
commit b5368207d6
18 changed files with 852 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -420,25 +420,16 @@ parse_read_term_options(Options, OptionValues, Stub) :-
parse_options_list(Options, parse_read_term_options_, DefaultOptions, OptionValues, Stub).
parse_read_term_options_(singletons(Vars), singletons-Vars) :-
( '$skip_max_list'(Vars, _, -1, Tail), Tail == [], !
;
throw(error(domain_error(read_option, singletons(Vars)), _))
).
parse_read_term_options_(variables(Vars), variables-Vars) :-
( '$skip_max_list'(Vars, _, -1, Tail), Tail == [], !
;
throw(error(domain_error(read_option, variables(Vars)), _))
).
parse_read_term_options_(variable_names(Vars), variable_names-Vars) :-
( '$skip_max_list'(Vars, _, -1, Tail), Tail == [], !
;
throw(error(domain_error(read_option, variable_names(Vars)), _))
).
parse_read_term_options_(singletons(Vars), singletons-Vars).
parse_read_term_options_(variables(Vars), variables-Vars).
parse_read_term_options_(variable_names(Vars), variable_names-Vars).
parse_read_term_options_(E,_) :-
throw(error(domain_error(read_option, E), _)).
read_term(Stream, Term, Options) :-
parse_read_term_options(Options, [Singletons, Variables, VariableNames], read_term/3),
parse_read_term_options(Options, [Singletons, VariableNames, Variables], read_term/3),
'$read_term'(Stream, Term, Singletons, Variables, VariableNames).
read_term(Term, Options) :-