correct unexpected bad variables while ensuring better names are generated in order...

diff --git a/src/prolog/toplevel.pl b/src/prolog/toplevel.pl
index f3d6bc123495b18a524472935997940fad1e40f8..f07b30d48bcb33cd631cfaffaaf5e0fd8c91ae2f 100644 (file)
--- a/src/prolog/toplevel.pl
+++ b/src/prolog/toplevel.pl
@@ -234,13 +234,15 @@ write_eqs_and_read_input(B, VarList) :-
     '$term_attributed_variables'(VarList, AttrVars),
     copy_term(AttrVars, AttrVars, AttrGoals),
     term_variables(AttrGoals, AttrGoalVars),
-    append([Vars0, AttrVars, AttrGoalVars], Vars),
+    append([Vars0, AttrGoalVars, AttrVars], Vars),
     charsio:extend_var_list(Vars, VarList, NewVarList, fabricated),
     '$get_b_value'(B0),
     gather_query_vars(VarList, OrigVars),
     gather_equations(NewVarList, OrigVars, Equations),
     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) ->
         write('   '),
         bb_put('$first_answer', false)
@@ -293,7 +295,8 @@ gather_query_vars([_ = Var | Vars], QueryVars) :-
     (  var(Var) ->
        QueryVars = [Var | QueryVars0],
        gather_query_vars(Vars, QueryVars0)
-    ;  gather_query_vars(Vars, QueryVars)
+    ;
+       gather_query_vars(Vars, QueryVars)
     ).
 gather_query_vars([], []).