From f31e15deb82fd58d00a3888c22a59fa451fd0ebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= <vsc@xato.(none)>
Date: Fri, 18 Mar 2011 19:34:19 +0000
Subject: [PATCH] SWI compat: use $VAR(ATOM) for names

---
 pl/boot.yap | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pl/boot.yap b/pl/boot.yap
index 6e6ca9080..750fee373 100755
--- a/pl/boot.yap
+++ b/pl/boot.yap
@@ -781,17 +781,19 @@ true :- true.
 	'$name_vars_in_goals1'(GVL, 0, _).
 
 '$name_well_known_vars'([]).
-'$name_well_known_vars'([[Name|V]|NVL0]) :-
+'$name_well_known_vars'([[SName|V]|NVL0]) :-
 	var(V), !,
+	atom_codes(Name, SName),
 	V = '$VAR'(Name),
 	'$name_well_known_vars'(NVL0).
 '$name_well_known_vars'([_|NVL0]) :-
 	'$name_well_known_vars'(NVL0).
 
 '$name_vars_in_goals1'([], I, I).
-'$name_vars_in_goals1'(['$VAR'([95|Name])|NGVL], I0, IF) :-
+'$name_vars_in_goals1'(['$VAR'(Name)|NGVL], I0, IF) :-
 	I is I0+1,
-	'$gen_name_string'(I0,[],Name), !,
+	'$gen_name_string'(I0,[],SName), !,
+	atom_codes(Name, [95|SName]),
 	'$name_vars_in_goals1'(NGVL, I, IF).
 '$name_vars_in_goals1'([NV|NGVL], I0, IF) :-
 	nonvar(NV),