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

Merge pull request #1769 from triska/show_pending_constraints

Browse Source 
ENHANCED: use call_residue_vars/2 to show all pending constraints
This commit is contained in:
Mark Thom
2023-03-31 04:51:34 +02:00
committed by GitHub
parent adc77985d7 8ab1155fc5
commit c7759aa737
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/toplevel.pl
View File

@@ -1,6 +1,7 @@
:- module('$toplevel', [argv/1, :- module('$toplevel', [argv/1,
copy_term/3]). copy_term/3]).
:- use_module(library(atts), [call_residue_vars/2]).
:- use_module(library(charsio)). :- use_module(library(charsio)).
:- use_module(library(error)). :- use_module(library(error)).
:- use_module(library(files)). :- use_module(library(files)).
@@ -180,8 +181,8 @@ submit_query_and_print_results_(Term, VarList) :-
'$get_b_value'(B), '$get_b_value'(B),
bb_put('$report_all', false), bb_put('$report_all', false),
bb_put('$report_n_more', 0), bb_put('$report_n_more', 0),
call(user:Term), atts:call_residue_vars(user:Term, AttrVars),
write_eqs_and_read_input(B, VarList), write_eqs_and_read_input(B, VarList, AttrVars),
!. !.
submit_query_and_print_results_(_, _) :- submit_query_and_print_results_(_, _) :-
( bb_get('$answer_count', 0) -> ( bb_get('$answer_count', 0) ->
@@ -286,11 +287,10 @@ trailing_period_is_ambiguous(Value) :-
term_variables_under_max_depth(Term, MaxDepth, Vars) :- term_variables_under_max_depth(Term, MaxDepth, Vars) :-
'$term_variables_under_max_depth'(Term, MaxDepth, Vars). '$term_variables_under_max_depth'(Term, MaxDepth, Vars).
write_eqs_and_read_input(B, VarList) :- write_eqs_and_read_input(B, VarList, AttrVars) :-
gather_query_vars(VarList, OrigVars), gather_query_vars(VarList, OrigVars),
% one layer of depth added for (=/2) functor % one layer of depth added for (=/2) functor
'$term_variables_under_max_depth'(OrigVars, 22, Vars0), '$term_variables_under_max_depth'(OrigVars, 22, Vars0),
'$term_attributed_variables'(VarList, AttrVars),
'$project_atts':project_attributes(Vars0, AttrVars), '$project_atts':project_attributes(Vars0, AttrVars),
copy_term(AttrVars, AttrVars, AttrGoals), copy_term(AttrVars, AttrVars, AttrGoals),
term_variables(AttrGoals, AttrGoalVars), term_variables(AttrGoals, AttrGoalVars),