From 863747da7bcd335f7cb40d63f8b9938254ada241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= <vsc@xato.(none)>
Date: Mon, 29 Nov 2010 18:08:11 +0000
Subject: [PATCH] fix save/1 and save/2 to at least work now.

---
 C/save.c     | 45 ++++++++++++++++-----------------------------
 pl/utils.yap |  9 +++------
 2 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/C/save.c b/C/save.c
index 30b06ff9e..dcb3b7600 100755
--- a/C/save.c
+++ b/C/save.c
@@ -97,7 +97,7 @@ STATIC_PROTO(int   save_heap, (void));
 STATIC_PROTO(int   save_stacks, (int));
 STATIC_PROTO(int   save_crc, (void));
 STATIC_PROTO(Int   do_save, (int));
-STATIC_PROTO(Int   p_save, (void));
+STATIC_PROTO(Int   p_save2, (void));
 STATIC_PROTO(Int   p_save_program, (void));
 STATIC_PROTO(int   check_header, (CELL *, CELL *, CELL *, CELL *));
 STATIC_PROTO(int   get_heap_info, (void));
@@ -606,49 +606,36 @@ do_save(int mode) {
 
 /* Saves a complete prolog environment */
 static Int 
-p_save(void)
+p_save2(void)
 {
   Int res;
 
+  Term t;
 #if defined(YAPOR) && !defined(THREADS)
   if (number_workers != 1) {
-    Yap_Error(SYSTEM_ERROR,TermNil,"cannot perform save: more than a worker/thread running");
+    Yap_Error(SYSTEM_ERROR,TermNil,
+	       "cannot perform save: more than a worker/thread running");
     return(FALSE);
   }
 #elif defined(THREADS)
   if (NOfThreads != 1) {
-    Yap_Error(SYSTEM_ERROR,TermNil,"cannot perform save: more than a worker/thread running");
+    Yap_Error(SYSTEM_ERROR,TermNil,
+	       "cannot perform save: more than a worker/thread running");
     return(FALSE);
   }
 #endif
-  which_save = 1;
+  /* avoid double saves */
+  if (IsNonVarTerm(t = Deref(ARG2)))
+    return TRUE;
+  if (!Yap_unify(ARG2,MkIntTerm(1)))
+    return FALSE;
+  which_save = 2;
   Yap_StartSlots();
   res = do_save(DO_EVERYTHING);
   Yap_CloseSlots();
   return res;
 }
 
-/* Saves a complete prolog environment */
-static Int 
-p_save2(void)
-{
-#if defined(YAPOR) && !defined(THREADS)
-  if (number_workers != 1) {
-    Yap_Error(SYSTEM_ERROR,TermNil,
-	       "cannot perform save: more than a worker/thread running");
-    return(FALSE);
-  }
-#elif defined(THREADS)
-  if (NOfThreads != 1) {
-    Yap_Error(SYSTEM_ERROR,TermNil,
-	       "cannot perform save: more than a worker/thread running");
-    return(FALSE);
-  }
-#endif
-  which_save = 2;
-  return(do_save(DO_EVERYTHING) && Yap_unify(ARG2,MkIntTerm(1)));
-}
-
 /* Just save the program, not the stacks */
 static Int 
 p_save_program(void)
@@ -1778,6 +1765,7 @@ static Int
 p_restore(void)
 {
   int mode;
+  char s[YAP_FILENAME_MAX+1];
 
   Term t1 = Deref(ARG1);
 #if defined(YAPOR) && !defined(THREADS)
@@ -1791,11 +1779,11 @@ p_restore(void)
     return(FALSE);
   }
 #endif
-  if (!Yap_GetName(Yap_FileNameBuf, YAP_FILENAME_MAX, t1)) {
+  if (!Yap_GetName(s, YAP_FILENAME_MAX, t1)) {
     Yap_Error(TYPE_ERROR_LIST,t1,"restore/1");
     return(FALSE);
   }
-  if ((mode = Restore(Yap_FileNameBuf, NULL)) == DO_ONLY_CODE) {
+  if ((mode = Restore(s, NULL)) == DO_ONLY_CODE) {
 #if PUSH_REGS
     restore_absmi_regs(&Yap_standard_regs);
 #endif
@@ -1808,7 +1796,6 @@ p_restore(void)
 void 
 Yap_InitSavePreds(void)
 {
-  Yap_InitCPred("$save", 1, p_save, SyncPredFlag|HiddenPredFlag);
   Yap_InitCPred("$save", 2, p_save2, SyncPredFlag|HiddenPredFlag);
   Yap_InitCPred("$save_program", 1, p_save_program, SyncPredFlag|HiddenPredFlag);
   Yap_InitCPred("$restore", 1, p_restore, SyncPredFlag|HiddenPredFlag);
diff --git a/pl/utils.yap b/pl/utils.yap
index bf31e3640..798450484 100644
--- a/pl/utils.yap
+++ b/pl/utils.yap
@@ -307,19 +307,16 @@ getenv(Na,Val) :-
 
 %%% Saving and restoring a computation
 
-save(A) :- var(A), !,
-	'$do_error'(instantiation_error,save(A)).
-save(A) :- atom(A), !, name(A,S), '$save'(S).
-save(S) :- '$save'(S).
+save(A) :- save(A,_).
 
 save(A,_) :- var(A), !,
 	'$do_error'(instantiation_error,save(A)).
-save(A,OUT) :- atom(A), !, name(A,S), '$save'(S,OUT).
+save(A,OUT) :- atom(A), !, atom_codes(A,S), '$save'(S,OUT).
 save(S,OUT) :- '$save'(S,OUT).
 
 save_program(A) :- var(A), !,
 	'$do_error'(instantiation_error,save_program(A)).
-save_program(A) :- atom(A), !, name(A,S), '$save_program'(S).
+save_program(A) :- atom(A), !, atom_codes(A,S), '$save_program'(S).
 save_program(S) :- '$save_program'(S).
 
 save_program(A, G) :- var(A), !,