From 0179998d600ada75ae6b1365b0d4234b59100f1f Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Fri, 23 Oct 2009 14:22:17 +0100 Subject: [PATCH] change Heap.h to YapHeap.h rename $live to prolog/0 (for SWI compatibility). --- C/alloc.c | 2 +- C/arith0.c | 2 +- C/arith1.c | 2 +- C/arith2.c | 2 +- C/attvar.c | 2 +- C/bignum.c | 2 +- C/cdmgr.c | 2 +- C/cmppreds.c | 2 +- C/computils.c | 2 +- C/corout.c | 2 +- C/dlmalloc.c | 2 +- C/eval.c | 2 +- C/globals.c | 2 +- C/gmp_support.c | 2 +- C/grow.c | 2 +- C/iopreds.c | 2 +- C/load_coff.c | 2 +- C/load_dl.c | 2 +- C/load_dll.c | 2 +- C/load_dyld.c | 2 +- C/load_foreign.c | 2 +- C/load_none.c | 2 +- C/load_shl.c | 2 +- C/mavar.c | 2 +- C/modules.c | 2 +- C/other.c | 2 +- C/parser.c | 2 +- C/readutil.c | 2 +- C/scanner.c | 2 +- C/sort.c | 2 +- C/stdpreds.c | 2 +- C/threads.c | 2 +- C/tracer.c | 2 +- C/userpreds.c | 2 +- C/utilpreds.c | 2 +- C/write.c | 2 +- C/ypsocks.c | 2 +- H/{Heap.h => YapHeap.h} | 2 +- H/Yatom.h | 2 +- H/absmi.h | 2 +- H/clause.h | 2 +- Makefile.in | 2 +- OPTYap/opt.init.c | 2 +- OPTYap/opt.memory.c | 2 +- OPTYap/opt.preds.c | 2 +- OPTYap/or.cowengine.c | 2 +- OPTYap/or.cut.c | 2 +- OPTYap/or.engine.c | 2 +- OPTYap/or.sbaengine.c | 2 +- OPTYap/or.scheduler.c | 2 +- OPTYap/tab.suspend.c | 2 +- OPTYap/tab.tries.c | 2 +- console/yap.c | 13 +++++++++++-- include/SWI-Stream.h | 4 ---- misc/ATOMS | 1 - pl/boot.yap | 8 ++++---- 56 files changed, 67 insertions(+), 63 deletions(-) rename H/{Heap.h => YapHeap.h} (99%) diff --git a/C/alloc.c b/C/alloc.c index 3295c9b63..0cbb6ddfe 100644 --- 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 diff --git a/C/arith0.c b/C/arith0.c index 2e68c2375..8ac5fe065 100644 --- 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" diff --git a/C/arith1.c b/C/arith1.c index be765abe0..d99ae6a88 100644 --- 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 diff --git a/C/arith2.c b/C/arith2.c index bbeb381d9..720d0065c 100644 --- 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" diff --git a/C/attvar.c b/C/attvar.c index d2980544a..93447a08f 100644 --- 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 diff --git a/C/bignum.c b/C/bignum.c index 2b93b5c04..676626b12 100644 --- 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 diff --git a/C/cdmgr.c b/C/cdmgr.c index 3c4d46a9e..bfdce8072 100644 --- 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)); } diff --git a/C/cmppreds.c b/C/cmppreds.c index e4dff2d5b..3446919e8 100644 --- 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 diff --git a/C/computils.c b/C/computils.c index 1f4fbad93..fa566b447 100644 --- 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 diff --git a/C/corout.c b/C/corout.c index f9d7a605d..177e7be79 100644 --- 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 diff --git a/C/dlmalloc.c b/C/dlmalloc.c index 1d1c4eb88..3fc74edb5 100755 --- 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 #endif diff --git a/C/eval.c b/C/eval.c index af2a972ab..13b82a4db 100644 --- 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 diff --git a/C/globals.c b/C/globals.c index 8de5bd39e..314d556f4 100644 --- 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" diff --git a/C/gmp_support.c b/C/gmp_support.c index 10c35d112..409e076ce 100644 --- 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 diff --git a/C/grow.c b/C/grow.c index e51fbfbcf..fcebf5167 100644 --- 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" diff --git a/C/iopreds.c b/C/iopreds.c index d0f19b7db..d91a9b034 100755 --- 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 #if HAVE_STDARG_H diff --git a/C/load_coff.c b/C/load_coff.c index d7bbb0a78..a0f4bd7ca 100644 --- 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 diff --git a/C/load_dl.c b/C/load_dl.c index 49a360667..f785c359d 100644 --- 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" diff --git a/C/load_dll.c b/C/load_dll.c index 534e2e8cb..49a2e0e14 100755 --- 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" diff --git a/C/load_dyld.c b/C/load_dyld.c index f0ce51320..da93f4014 100644 --- 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" diff --git a/C/load_foreign.c b/C/load_foreign.c index a872f5fd6..c096c00a4 100755 --- 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 #if HAVE_STRING_H diff --git a/C/load_none.c b/C/load_none.c index a9ce611ba..515d21c51 100644 --- 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 #endif diff --git a/C/load_shl.c b/C/load_shl.c index 141f60f91..109680d76 100644 --- 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" diff --git a/C/mavar.c b/C/mavar.c index 6d8ca203a..a104cb7d2 100644 --- 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)); diff --git a/C/modules.c b/C/modules.c index 24215bba2..9c7c0276e 100644 --- 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)); diff --git a/C/other.c b/C/other.c index 8c08e058f..890863d6a 100644 --- 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 #endif diff --git a/C/parser.c b/C/parser.c index 39a8dbaf5..92b3878d8 100644 --- 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 diff --git a/C/readutil.c b/C/readutil.c index 52b910ea2..418290881 100644 --- 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" diff --git a/C/scanner.c b/C/scanner.c index 9deddaf68..25e639a2d 100644 --- 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" diff --git a/C/sort.c b/C/sort.c index 57e0a3e42..67f6be9e3 100644 --- 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 diff --git a/C/stdpreds.c b/C/stdpreds.c index 0b7337603..f0e0b9623 100644 --- 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 diff --git a/C/threads.c b/C/threads.c index 5861552da..d1824b55b 100644 --- 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 diff --git a/C/tracer.c b/C/tracer.c index 4b91937ed..54e333105 100644 --- 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" diff --git a/C/userpreds.c b/C/userpreds.c index 0ec1cbead..dc29f4ee8 100644 --- 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 diff --git a/C/utilpreds.c b/C/utilpreds.c index 061c45775..93d1b3e08 100644 --- 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" diff --git a/C/write.c b/C/write.c index 15f527c97..55b5bd347 100644 --- a/C/write.c +++ b/C/write.c @@ -21,7 +21,7 @@ static char SccsId[] = "%W% %G%"; #include #include "Yap.h" #include "Yatom.h" -#include "Heap.h" +#include "YapHeap.h" #include "yapio.h" #if COROUTINING #include "attvar.h" diff --git a/C/ypsocks.c b/C/ypsocks.c index 210ce8330..7b91b019d 100644 --- 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 diff --git a/H/Heap.h b/H/YapHeap.h similarity index 99% rename from H/Heap.h rename to H/YapHeap.h index ce826bc5e..9651236ce 100644 --- a/H/Heap.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 $ * diff --git a/H/Yatom.h b/H/Yatom.h index fd6063689..eeda5db04 100644 --- 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)); diff --git a/H/absmi.h b/H/absmi.h index 3a1bbb1a9..c3b0af3c3 100644 --- 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" diff --git a/H/clause.h b/H/clause.h index 49854c1f8..92edcd7ef 100644 --- a/H/clause.h +++ b/H/clause.h @@ -16,7 +16,7 @@ *************************************************************************/ #include "Yatom.h" -#include "Heap.h" +#include "YapHeap.h" /* consulting files */ diff --git a/Makefile.in b/Makefile.in index 78e8aa5d6..49299bf71 100644 --- 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 \ diff --git a/OPTYap/opt.init.c b/OPTYap/opt.init.c index 1b706b3c6..6e3e5dbbd 100644 --- 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 #include #ifdef YAPOR diff --git a/OPTYap/opt.memory.c b/OPTYap/opt.memory.c index 4591dd5d4..852eabe65 100644 --- a/OPTYap/opt.memory.c +++ b/OPTYap/opt.memory.c @@ -25,7 +25,7 @@ #include #include #include "Yatom.h" -#include "Heap.h" +#include "YapHeap.h" #include "alloc.h" #include "heapgc.h" diff --git a/OPTYap/opt.preds.c b/OPTYap/opt.preds.c index d5a8757b0..9f67de15f 100644 --- a/OPTYap/opt.preds.c +++ b/OPTYap/opt.preds.c @@ -20,7 +20,7 @@ #include #endif /* HAVE_STRING_H */ #include "Yatom.h" -#include "Heap.h" +#include "YapHeap.h" #include "yapio.h" #ifdef YAPOR #if HAVE_SYS_TIME_H diff --git a/OPTYap/or.cowengine.c b/OPTYap/or.cowengine.c index 2d855929e..0de2a4418 100644 --- a/OPTYap/or.cowengine.c +++ b/OPTYap/or.cowengine.c @@ -25,7 +25,7 @@ #include #include #include "Yatom.h" -#include "Heap.h" +#include "YapHeap.h" #include "or.macros.h" diff --git a/OPTYap/or.cut.c b/OPTYap/or.cut.c index 3286c66a1..695181ca5 100644 --- 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" diff --git a/OPTYap/or.engine.c b/OPTYap/or.engine.c index 648df1acc..a8bfe6a77 100644 --- a/OPTYap/or.engine.c +++ b/OPTYap/or.engine.c @@ -19,7 +19,7 @@ #include #endif /* HAVE_STRING_H */ #include "Yatom.h" -#include "Heap.h" +#include "YapHeap.h" #include "or.macros.h" #ifdef TABLING #include "tab.macros.h" diff --git a/OPTYap/or.sbaengine.c b/OPTYap/or.sbaengine.c index 46341e6f8..b57d602b2 100644 --- a/OPTYap/or.sbaengine.c +++ b/OPTYap/or.sbaengine.c @@ -23,7 +23,7 @@ #ifdef SBA #include #include "Yatom.h" -#include "Heap.h" +#include "YapHeap.h" #include "or.macros.h" #include "opt.mavar.h" diff --git a/OPTYap/or.scheduler.c b/OPTYap/or.scheduler.c index de22632c6..c77ee2d1e 100644 --- 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" diff --git a/OPTYap/tab.suspend.c b/OPTYap/tab.suspend.c index f36428513..8d0c27557 100644 --- 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" diff --git a/OPTYap/tab.tries.c b/OPTYap/tab.tries.c index db058fbd7..95d709bd0 100644 --- a/OPTYap/tab.tries.c +++ b/OPTYap/tab.tries.c @@ -20,7 +20,7 @@ #include #endif /* HAVE_STRING_H */ #include "Yatom.h" -#include "Heap.h" +#include "YapHeap.h" #include "yapio.h" #include "tab.macros.h" diff --git a/console/yap.c b/console/yap.c index d5f4f73fb..ce4653c97 100644 --- 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(); diff --git a/include/SWI-Stream.h b/include/SWI-Stream.h index 1b86bf1d8..9e5b1ad21 100755 --- 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 /******************************* diff --git a/misc/ATOMS b/misc/ATOMS index b544962f4..28756cbc3 100644 --- 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" diff --git a/pl/boot.yap b/pl/boot.yap index 30af14f6e..050730353 100644 --- 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),