change Heap.h to YapHeap.h

rename $live to prolog/0 (for SWI compatibility).
2009-10-23 14:22:17 +01:00 · 2009-10-23 14:22:17 +01:00 · 0179998d60
commit 0179998d60
parent 253444d7ca
56 changed files with 67 additions and 63 deletions
--- a/C/alloc.c
+++ b/C/alloc.c
@ -21,7 +21,7 @@ static char SccsId[] = "%W% %G%";

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "alloc.h"
 #include "yapio.h"
 #if HAVE_STRING_H
--- a/C/arith0.c
+++ b/C/arith0.c
@ -25,7 +25,7 @@ static char     SccsId[] = "%W% %G%";

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "eval.h"


--- a/C/arith1.c
+++ b/C/arith1.c
@ -25,7 +25,7 @@ static char     SccsId[] = "%W% %G%";

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "eval.h"

 static Term
--- a/C/arith2.c
+++ b/C/arith2.c
@ -25,7 +25,7 @@ static char     SccsId[] = "%W% %G%";

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "eval.h"

 #include "arith2.h"
--- a/C/attvar.c
+++ b/C/attvar.c
@ -21,7 +21,7 @@ static char SccsId[]="%W% %G%";
 #include "Yap.h"

 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "heapgc.h"
 #include "attvar.h"
 #ifndef NULL
--- a/C/bignum.c
+++ b/C/bignum.c
@ -23,7 +23,7 @@ static char     SccsId[] = "%W% %G%";

 #ifdef USE_GMP

-#include "Heap.h"
+#include "YapHeap.h"
 #include "eval.h"
 #include "alloc.h"
 #if HAVE_STRING_H
--- a/C/cdmgr.c
+++ b/C/cdmgr.c
@ -5543,7 +5543,7 @@ p_choicepoint_info(void)
      break;
    case _Nstop:
      { 
-	Atom at = AtomLive;
+	Atom at = AtomProlog;
 	t = MkAtomTerm(at);
 	pe = RepPredProp(PredPropByAtom(at, CurrentModule));
      }
--- a/C/cmppreds.c
+++ b/C/cmppreds.c
@ -20,7 +20,7 @@ static char     SccsId[] = "%W% %G%";

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "eval.h"
 #if HAVE_STRING_H
 #include <string.h>
--- a/C/computils.c
+++ b/C/computils.c
@ -59,7 +59,7 @@ static char SccsId[] = "%W% %G%";

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "compile.h"
 #include "yapio.h"
 #if HAVE_STRING_H
--- a/C/corout.c
+++ b/C/corout.c
@ -20,7 +20,7 @@ static char SccsId[]="%W% %G%";

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "heapgc.h"
 #include "attvar.h"
 #ifndef NULL
--- a/C/dlmalloc.c
+++ b/C/dlmalloc.c
@ -2,7 +2,7 @@

 #if USE_DL_MALLOC

-#include "Heap.h"
+#include "YapHeap.h"
 #if HAVE_STRING_H
 #include <string.h>
 #endif
--- a/C/eval.c
+++ b/C/eval.c
@ -24,7 +24,7 @@ static char     SccsId[] = "%W% %G%";
 */
 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "eval.h"
 #if HAVE_STDARG_H
 #include <stdarg.h>
--- a/C/globals.c
+++ b/C/globals.c
@ -20,7 +20,7 @@ static char SccsId[] = "%W% %G%";

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "yapio.h"
 #include "iopreds.h"
 #include "attvar.h"
--- a/C/gmp_support.c
+++ b/C/gmp_support.c
@ -17,7 +17,7 @@

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "eval.h"

 #if USE_GMP
--- a/C/grow.c
+++ b/C/grow.c
@ -16,7 +16,7 @@
 *************************************************************************/

 #include "absmi.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "yapio.h"
 #include "alloc.h"
 #include "sshift.h"
--- a/C/iopreds.c
+++ b/C/iopreds.c
@ -26,7 +26,7 @@ static char SccsId[] = "%W% %G%";

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "yapio.h"
 #include <stdlib.h>
 #if HAVE_STDARG_H
--- a/C/load_coff.c
+++ b/C/load_coff.c
@ -15,7 +15,7 @@

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "Foreign.h"

 #ifdef COFF
--- a/C/load_dl.c
+++ b/C/load_dl.c
@ -15,7 +15,7 @@

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "yapio.h"
 #include "Foreign.h"

--- a/C/load_dll.c
+++ b/C/load_dll.c
@ -15,7 +15,7 @@

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "yapio.h"
 #include "Foreign.h"

--- a/C/load_dyld.c
+++ b/C/load_dyld.c
@ -15,7 +15,7 @@

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "yapio.h"
 #include "Foreign.h"

--- a/C/load_foreign.c
+++ b/C/load_foreign.c
@ -19,7 +19,7 @@ static char     SccsId[] = "%W% %G%.2";

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "yapio.h"
 #include <stdlib.h>
 #if HAVE_STRING_H
--- a/C/load_none.c
+++ b/C/load_none.c
@ -15,7 +15,7 @@
 #include "Yap.h"
 #include "Foreign.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
--- a/C/load_shl.c
+++ b/C/load_shl.c
@ -1,7 +1,7 @@

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "yapio.h"
 #include "Foreign.h"

--- a/C/mavar.c
+++ b/C/mavar.c
@ -20,7 +20,7 @@
 #ifdef MULTI_ASSIGNMENT_VARIABLES

 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "eval.h"

 STD_PROTO(static Int p_setarg, (void));
--- a/C/modules.c
+++ b/C/modules.c
@ -20,7 +20,7 @@ static char     SccsId[] = "%W% %G%";

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"

 STATIC_PROTO(Int p_current_module, (void));
 STATIC_PROTO(Int p_current_module1, (void));
--- a/C/other.c
+++ b/C/other.c
@ -21,7 +21,7 @@ static char     SccsId[] = "%W% %G%";

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #if HAVE_STRING_H
 #include <string.h>
 #endif
--- a/C/parser.c
+++ b/C/parser.c
@ -48,7 +48,7 @@ static char SccsId[] = "%W% %G%";

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "yapio.h"
 #if HAVE_STRING_H
 #include <string.h>
--- a/C/readutil.c
+++ b/C/readutil.c
@ -20,7 +20,7 @@ static char SccsId[] = "%W% %G%";

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "yapio.h"
 #include "iopreds.h"

--- a/C/scanner.c
+++ b/C/scanner.c
@ -34,7 +34,7 @@

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "yapio.h"
 #include "alloc.h"
 #include "eval.h"
--- a/C/sort.c
+++ b/C/sort.c
@ -19,7 +19,7 @@

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #ifndef NULL
 #define NULL (void *)0
 #endif
--- a/C/stdpreds.c
+++ b/C/stdpreds.c
@ -270,7 +270,7 @@ static char     SccsId[] = "%W% %G%";

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "eval.h"
 #include "yapio.h"
 #include <stdio.h>
--- a/C/threads.c
+++ b/C/threads.c
@ -20,7 +20,7 @@ static char     SccsId[] = "%W% %G%";

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "eval.h"
 #include "yapio.h"
 #include <stdio.h>
--- a/C/tracer.c
+++ b/C/tracer.c
@ -20,7 +20,7 @@
 #ifdef LOW_LEVEL_TRACER

 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "attvar.h"
 #include "yapio.h"
 #include "tracer.h"
--- a/C/userpreds.c
+++ b/C/userpreds.c
@ -40,7 +40,7 @@ static char     SccsId[] = "%W% %G%";

 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #if EUROTRA
 #include "yapio.h"
 #if HAVE_UNISTD_H
--- a/C/utilpreds.c
+++ b/C/utilpreds.c
@ -20,7 +20,7 @@ static char     SccsId[] = "@(#)utilpreds.c	1.3";

 #include "Yap.h"
 #include "clause.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "yapio.h"
 #include "eval.h"
 #include "attvar.h"
--- a/C/write.c
+++ b/C/write.c
@ -21,7 +21,7 @@ static char     SccsId[] = "%W% %G%";
 #include <stdlib.h>
 #include "Yap.h"
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "yapio.h"
 #if COROUTINING
 #include "attvar.h"
--- a/C/ypsocks.c
+++ b/C/ypsocks.c
@ -19,7 +19,7 @@
 #include "Yap.h"

 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "yapio.h"

 #if   USE_SOCKET
--- a/H/YapHeap.h
+++ b/H/YapHeap.h
@ -7,7 +7,7 @@
 *									 *
 **************************************************************************
 *									 *
-* File:		Heap.h         						 *
+* File:		YapHeap.h      						 *
 * mods:									 *
 * comments:	Heap Init Structure					 *
 * version:      $Id: Heap.h,v 1.136 2008-08-08 14:05:34 vsc Exp $	 *
--- a/H/Yatom.h
+++ b/H/Yatom.h
@ -1383,7 +1383,7 @@ typedef enum
  TERMS_MODULE = 5
 } default_modules;

-#include "Heap.h"
+#include "YapHeap.h"

 EXTERN inline UInt STD_PROTO(PRED_HASH, (FunctorEntry *, Term, UInt));

--- a/H/absmi.h
+++ b/H/absmi.h
@ -148,7 +148,7 @@ register struct yami* P1REG asm ("bp"); /* can't use yamop before Yap.h */
 #include "or.macros.h"
 #endif	/* YAPOR */
 #ifdef USE_SYSTEM_MALLOC
-#include "Heap.h"
+#include "YapHeap.h"
 #endif
 #ifdef TABLING
 #include "tab.macros.h"
--- a/H/clause.h
+++ b/H/clause.h
@ -16,7 +16,7 @@
 *************************************************************************/

 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"

 /* consulting files */

--- a/Makefile.in
+++ b/Makefile.in
@ -118,7 +118,7 @@ HEADERS = \
 	$(srcdir)/H/Tags_32LowTag.h $(srcdir)/H/Tags_64bits.h \
 	$(srcdir)/H/Tags_24bits.h $(srcdir)/H/sshift.h \
 	$(srcdir)/H/Yap.h $(srcdir)/H/Yatom.h \
-	$(srcdir)/H/Heap.h \
+	$(srcdir)/H/YapHeap.h \
 	$(srcdir)/H/Regs.h $(srcdir)/H/Yapproto.h \
 	$(srcdir)/H/absmi.h  $(srcdir)/H/alloc.h \
 	$(srcdir)/H/amidefs.h $(srcdir)/H/amiops.h $(srcdir)/H/arrays.h \
--- a/OPTYap/opt.init.c
+++ b/OPTYap/opt.init.c
@ -17,7 +17,7 @@
 #if defined(YAPOR) || defined(TABLING)
 #define OPT_MAVAR_STATIC
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include <unistd.h>
 #include <signal.h>
 #ifdef YAPOR
--- a/OPTYap/opt.memory.c
+++ b/OPTYap/opt.memory.c
@ -25,7 +25,7 @@
 #include <sys/shm.h>
 #include <sys/mman.h>
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "alloc.h"
 #include "heapgc.h"

--- a/OPTYap/opt.preds.c
+++ b/OPTYap/opt.preds.c
@ -20,7 +20,7 @@
 #include <string.h>
 #endif /* HAVE_STRING_H */
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "yapio.h"
 #ifdef YAPOR
 #if HAVE_SYS_TIME_H
--- a/OPTYap/or.cowengine.c
+++ b/OPTYap/or.cowengine.c
@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "or.macros.h"


--- a/OPTYap/or.cut.c
+++ b/OPTYap/or.cut.c
@ -16,7 +16,7 @@
 #include "Yap.h"
 #ifdef YAPOR
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "or.macros.h"
 #ifdef TABLING
 #include "tab.macros.h"
--- a/OPTYap/or.engine.c
+++ b/OPTYap/or.engine.c
@ -19,7 +19,7 @@
 #include <string.h>
 #endif /* HAVE_STRING_H */
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "or.macros.h"
 #ifdef TABLING
 #include "tab.macros.h"
--- a/OPTYap/or.sbaengine.c
+++ b/OPTYap/or.sbaengine.c
@ -23,7 +23,7 @@
 #ifdef SBA
 #include <stdio.h>
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "or.macros.h"
 #include "opt.mavar.h"

--- a/OPTYap/or.scheduler.c
+++ b/OPTYap/or.scheduler.c
@ -16,7 +16,7 @@
 #include "Yap.h"
 #ifdef YAPOR
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "or.macros.h"
 #ifdef TABLING
 #include "tab.macros.h"
--- a/OPTYap/tab.suspend.c
+++ b/OPTYap/tab.suspend.c
@ -16,7 +16,7 @@
 #include "Yap.h"
 #if defined(TABLING) && defined(YAPOR)
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "tab.macros.h"
 #include "or.macros.h"

--- a/OPTYap/tab.tries.c
+++ b/OPTYap/tab.tries.c
@ -20,7 +20,7 @@
 #include <string.h>
 #endif /* HAVE_STRING_H */
 #include "Yatom.h"
-#include "Heap.h"
+#include "YapHeap.h"
 #include "yapio.h"
 #include "tab.macros.h"

--- a/console/yap.c
+++ b/console/yap.c
@ -224,6 +224,7 @@ print_usage(void)
  fprintf(stderr,"\n[ Valid switches for command line arguments: ]\n");
  fprintf(stderr,"  -?   Shows this screen\n");
  fprintf(stderr,"  -b   Boot file \n");
+  fprintf(stderr,"  -dump-runtime-variables\n");
  fprintf(stderr,"  -f   initialization file or \"none\"\n");
  fprintf(stderr,"  -g   Run Goal Before Top-Level \n");
  fprintf(stderr,"  -z   Run Goal Before Top-Level \n");
@ -295,6 +296,13 @@ add_end_dot(char arg[])
 static int
 dump_runtime_variables(void)
 {
+  fprintf(stderr,"CC=\"%s\"\n",YAP_CC);
+  fprintf(stderr,"YAP_ROOTDIR=\"%s\"\n",YAP_ROOTDIR);
+  fprintf(stderr,"YAP_LIBS=\"%s\"\n",YAP_LIBS);
+  fprintf(stderr,"YAP_SHLIB_SUFFIX=\"%s\"\n",YAP_SHLIB_SUFFIX);
+  fprintf(stderr,"YAP_VERSION=%d\n",YAP_VERSION);
+  exit(0);
+  return 1;
 }

 /*
@ -346,6 +354,7 @@ parse_yap_arguments(int argc, char *argv[], YAP_init_args *iap)
            ssize = &(iap->DelayedReleaseLoad);
 	    goto GetSize;
 #else
+          case 'd':
 	    if (!strcmp("dump-runtime-variables",p))
 		return dump_runtime_variables();
 #endif /* ENV_COPY || ACOW || SBA */
@ -807,7 +816,7 @@ exec_top_level(int BootMode, YAP_init_args *iap)
      YAP_Atom livegoal;
      /* read the bootfile */
      do_bootfile (iap->YapPrologBootFile ? iap->YapPrologBootFile : BootFile);
-      livegoal = YAP_FullLookupAtom("$live");
+      livegoal = YAP_FullLookupAtom("prolog");
      /* initialise the top-level */
      if (BootMode == YAP_FULL_BOOT_FROM_PROLOG) {
 	char init_file[256];
@ -846,7 +855,7 @@ exec_top_level(int BootMode, YAP_init_args *iap)
  /* read it before case someone, that is, Ashwin, hides
     the atom false away ;-).
  */
-  livegoal = YAP_FullLookupAtom("$live");
+  livegoal = YAP_FullLookupAtom("prolog");
  atomfalse = YAP_MkAtomTerm (YAP_FullLookupAtom("$false"));
  while (YAP_GetValue (livegoal) != atomfalse) {
    YAP_Reset();
--- a/include/SWI-Stream.h
+++ b/include/SWI-Stream.h
@ -59,10 +59,6 @@ typedef intptr_t ssize_t;		/* signed version of size_t */

 #ifdef __cplusplus
 extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
 #endif

 		 /*******************************
--- a/misc/ATOMS
+++ b/misc/ATOMS
@ -149,7 +149,6 @@ A	LT			N	"<"
 A	LastExecuteWithin	F	"$last_execute_within"
 A	Leash			F	"$leash"
 A	List			N	"list"
-A	Live			F	"$live"
 A	LoadAnswers		N	"load_answers"
 A	Local			N	"local_sp"
 A	LocalA			N	"local"
--- a/pl/boot.yap
+++ b/pl/boot.yap
@ -21,7 +21,7 @@

 true :- true.

-'$live' :-
+prolog :-
 	'$init_system',
        '$do_live'.

@ -161,7 +161,7 @@ true :- true.
 	get_value('$top_level_goal',GA), GA \= [], !,
 	set_value('$top_level_goal',[]),
 	'$run_atom_goal'(GA),
-	set_value('$live','$false').
+	set_value(prolog,'$false').
 '$enter_top_level' :-
 	prompt(_,'   ?- '),
 	prompt('   | '),
@ -174,7 +174,7 @@ true :- true.
 	prompt(_,'   |: '),
 	'$command'((?-Command),Varnames,Pos,top),
 	'$sync_mmapped_arrays',
-	set_value('$live','$false').
+	set_value(prolog,'$false').

 '$startup_goals' :-
 	get_value('$extend_file_search_path',P), P \= [],
@ -958,7 +958,7 @@ break :-
 	format(user_error, '% Break (level ~w)~n', [NBL]),
 	'$do_live',
 	!,
-	set_value('$live','$true'),
+	set_value(prolog,'$true'),
 	b_setval('$spy_glist',GList),
 	nb_setval('$spy_gn',SPY_GN),
 	'$set_input'(InpStream), '$set_output'(OutStream),