From d49a7387ef35b37a534350361bee836cb8815745 Mon Sep 17 00:00:00 2001 From: vscosta Date: Sat, 2 Sep 2017 23:43:08 +0100 Subject: [PATCH] inform that we started from restore --- C/save.c | 1 + H/YapFlags.h | 6 +++++- H/YapGFlagInfo.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/C/save.c b/C/save.c index 920af8be9..3e04c8052 100755 --- a/C/save.c +++ b/C/save.c @@ -1430,6 +1430,7 @@ OpenRestore(const char *inpf, const char *YapLibDir, CELL *Astate, CELL *ATrail, return FAIL_RESTORE; if (fname[0] && (mode = try_open(fname,Astate,ATrail,AStack,AHeap,streamp)) != FAIL_RESTORE) { + setAtomicGlobalPrologFlag( RESOURCE_DATABASE_FLAG, MkAtomTerm(Yap_LookupAtom(fname)) ); return mode; } /* try to open from current directory */ diff --git a/H/YapFlags.h b/H/YapFlags.h index d16dbe9bb..c0b4e5325 100644 --- a/H/YapFlags.h +++ b/H/YapFlags.h @@ -300,7 +300,7 @@ static inline bool trueLocalPrologFlag(int id) { return LOCAL_Flags[id].at == TermTrue; } -static inline bool falsePrologFlag(int id) { +static inline bool falseLocalPrologFlag(int id) { CACHE_REGS return LOCAL_Flags[id].at == TermFalse; } @@ -317,6 +317,10 @@ static inline bool silentMode(void) { return GLOBAL_Flags[VERBOSE_FLAG].at == TermSilent; } +static inline bool verboseMode(void) { + return GLOBAL_Flags[VERBOSE_FLAG].at != TermSilent; +} + static inline void setVerbosity(Term val) { GLOBAL_Flags[VERBOSE_FLAG].at = val; } diff --git a/H/YapGFlagInfo.h b/H/YapGFlagInfo.h index 6dc47f309..af80d3d40 100644 --- a/H/YapGFlagInfo.h +++ b/H/YapGFlagInfo.h @@ -358,7 +358,7 @@ call_count_data/3 built-in. YAP_FLAG(REPORT_ERROR_FLAG, "report_error", true, booleanFlag, "true", NULL), YAP_FLAG(RESOURCE_DATABASE_FLAG, "resource_database", false, isatom, - "boot.yap", NULL), + "pl/boot.yap", NULL), /**<`resource_database` Name of the resource file (saved-state or Prolog file) used to construct the YAP