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

correct unexpected bad variables while ensuring better names are generated in order (#571)

Browse Source
This commit is contained in:
Mark Thom
2020-05-30 00:17:34 -06:00
parent eebcdfb24f
commit 1d44d99875
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/prolog/toplevel.pl
View File

@@ -234,13 +234,15 @@ write_eqs_and_read_input(B, VarList) :-
'$term_attributed_variables'(VarList, AttrVars), '$term_attributed_variables'(VarList, AttrVars),
copy_term(AttrVars, AttrVars, AttrGoals), copy_term(AttrVars, AttrVars, AttrGoals),
term_variables(AttrGoals, AttrGoalVars), term_variables(AttrGoals, AttrGoalVars),
append([Vars0, AttrVars, AttrGoalVars], Vars), append([Vars0, AttrGoalVars, AttrVars], Vars),
charsio:extend_var_list(Vars, VarList, NewVarList, fabricated), charsio:extend_var_list(Vars, VarList, NewVarList, fabricated),
'$get_b_value'(B0), '$get_b_value'(B0),
gather_query_vars(VarList, OrigVars), gather_query_vars(VarList, OrigVars),
gather_equations(NewVarList, OrigVars, Equations), gather_equations(NewVarList, OrigVars, Equations),
append(Equations, AttrGoals, Goals), append(Equations, AttrGoals, Goals),
charsio:extend_var_list(AttrGoalVars, VarList, NewVarList0, fabricated), term_variables(Equations, EquationVars),
append([AttrGoalVars, EquationVars], Vars1),
charsio:extend_var_list(Vars1, VarList, NewVarList0, fabricated),
( bb_get('$first_answer', true) -> ( bb_get('$first_answer', true) ->
write(' '), write(' '),
bb_put('$first_answer', false) bb_put('$first_answer', false)
@@ -293,7 +295,8 @@ gather_query_vars([_ = Var | Vars], QueryVars) :-
( var(Var) -> ( var(Var) ->
QueryVars = [Var | QueryVars0], QueryVars = [Var | QueryVars0],
gather_query_vars(Vars, QueryVars0) gather_query_vars(Vars, QueryVars0)
; gather_query_vars(Vars, QueryVars) ;
gather_query_vars(Vars, QueryVars)
). ).
gather_query_vars([], []). gather_query_vars([], []).