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

Revert "use new call_residue_vars/2 in toplevel.pl (#847)"

Browse Source 
This reverts commit 04ba9bc11a.
This commit is contained in:
Mark Thom
2023-03-14 21:34:48 -06:00
parent 04ba9bc11a
commit cc8bb38abc
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/atts.pl
View File

@@ -110,9 +110,6 @@ user:goal_expansion(Term, M:get_atts(Var, Attr)) :-
nonvar(Term), nonvar(Term),
Term = get_atts(Var, M, Attr). Term = get_atts(Var, M, Attr).
term_attributed_variables(Term, Vars) :-
'$term_attributed_variables'(Term, Vars).
:- meta_predicate call_residue_vars(0, ?). :- meta_predicate call_residue_vars(0, ?).
call_residue_vars(Goal, Vars) :- call_residue_vars(Goal, Vars) :-
@@ -121,3 +118,6 @@ call_residue_vars(Goal, Vars) :-
'$get_attr_var_queue_beyond'(B, AttrVars), '$get_attr_var_queue_beyond'(B, AttrVars),
'$project_atts':copy_term(AttrVars, AttrVars, Gs), '$project_atts':copy_term(AttrVars, AttrVars, Gs),
'$term_attributed_variables_without_attrs'(Gs, Vars). '$term_attributed_variables_without_attrs'(Gs, Vars).
term_attributed_variables(Term, Vars) :-
'$term_attributed_variables'(Term, Vars).

8
src/toplevel.pl
View File

@@ -1,7 +1,6 @@
:- 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)).
@@ -181,8 +180,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),
atts:call_residue_vars(user:Term, AttrVars), call(user:Term),
write_eqs_and_read_input(B, VarList, AttrVars), write_eqs_and_read_input(B, VarList),
!. !.
submit_query_and_print_results_(_, _) :- submit_query_and_print_results_(_, _) :-
( bb_get('$answer_count', 0) -> ( bb_get('$answer_count', 0) ->
@@ -287,10 +286,11 @@ 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, AttrVars) :- write_eqs_and_read_input(B, VarList) :-
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),