From ef586e264e941fdfbdc17f40630f06a6f12f7cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Mon, 13 Apr 2015 13:28:17 +0100 Subject: [PATCH] android debugging plus clean-ups --- C/absmi.c | 2 +- C/cdmgr.c | 395 ++++--- C/fli_absmi_insts.h | 6 +- C/iopreds.c | 16 +- C/parser.c | 8 +- C/pl-yap.c | 107 +- C/qlyr.c | 75 +- C/save.c | 13 - C/stdpreds.c | 138 +-- C/sysbits.c | 467 ++++++-- C/text.c | 73 +- C/tracer.c | 14 + C/write.c | 6 +- C/yap-args.c | 5 +- CXX/yapdb.hh | 65 +- CXX/yapi.cpp | 254 +++-- CXX/yapi.hh | 5 +- CXX/yapq.hh | 45 +- CXX/yapt.hh | 51 +- H/Atoms.h | 2 +- H/Regs.h | 18 +- H/Yap.h | 49 +- H/YapHandles.h | 35 +- H/Yapproto.h | 12 +- H/Yatom.h | 25 +- H/amidefs.h | 2 - H/arrays.h | 3 +- H/clause.h | 21 +- H/dglobals.h | 1 + H/hglobals.h | 1 + H/iglobals.h | 3 +- H/pl-codelist.h | 6 +- H/pl-global.h | 7 +- H/pl-incl.h | 18 +- H/pl-yap.h | 14 +- H/rglobals.h | 1 + Makefile.in | 69 +- config.h.in | 37 +- configure | 774 ++----------- configure.in | 50 +- include/YapDefs.h | 29 +- include/YapInterface.h | 154 +-- library/dialect/swi/fli/blobs.c | 22 +- library/dialect/swi/fli/swi.c | 284 +++-- library/dialect/swi/fli/swi.h | 16 +- man/pl.bib | 3 +- misc/GLOBALS | 3 +- misc/mkandroid | 49 +- os/SWI-Stream.h | 5 +- os/pl-file.c | 212 ++-- os/pl-files.c | 180 +-- os/pl-os.c | 1195 +------------------- os/pl-privitf.c | 6 +- os/pl-read.c | 33 +- os/pl-stream.c | 124 +- os/pl-util.c | 5 +- os/pl-write.c | 18 +- packages/gecode/clpfd.yap | 68 +- packages/myddas/Makefile.in | 4 +- packages/myddas/configure.in | 6 +- packages/myddas/myddas_shared.c | 2 +- packages/swig/Android.mk.in | 3 +- packages/swig/Makefile.in | 15 +- packages/swig/android/JavaYap.java | 34 +- packages/swig/android/jni/sqlite/sqlite3.c | 44 +- packages/swig/android/jni/sqlite/sqlite3.h | 549 +++++---- packages/swig/configure.in | 3 +- packages/swig/python/demo.py | 39 +- packages/swig/yap.i | 21 +- pl/consult.yap | 3 +- pl/init.yap | 36 +- pl/modules.yap | 23 +- pl/preddecls.yap | 17 +- pl/preds.yap | 242 ++-- pl/setof.yap | 29 +- pl/sort.yap | 29 +- swi/console/edit.c | 2 - 77 files changed, 2346 insertions(+), 4054 deletions(-) mode change 100644 => 100755 C/stdpreds.c diff --git a/C/absmi.c b/C/absmi.c index 9a48e6bfd..c24cf3988 100755 --- a/C/absmi.c +++ b/C/absmi.c @@ -3,7 +3,7 @@ * Yap Prolog * * * * Yap Prolog was developed at NCCUP - Universidade do Porto * -* * +* \z * * Copyright L.Damas, V.S.Costa and Universidade do Porto 1985-1997 * * * ************************************************************************** diff --git a/C/cdmgr.c b/C/cdmgr.c index f133dd313..db8e00f6b 100644 --- a/C/cdmgr.c +++ b/C/cdmgr.c @@ -660,13 +660,13 @@ Yap_ResetConsultStack( void ) /****************************************************************** - + EXECUTING PROLOG CLAUSES - + ******************************************************************/ -static int +static int static_in_use(PredEntry *p, int check_everything) { #if defined(YAPOR) || defined(THREADS) @@ -686,9 +686,9 @@ static_in_use(PredEntry *p, int check_everything) } /****************************************************************** - + ADDING AND REMOVE INFO TO A PROCEDURE - + ******************************************************************/ @@ -697,7 +697,7 @@ static_in_use(PredEntry *p, int check_everything) * static CompiledPredFlag fast FastPredFlag all the * database predicates are supported for dynamic predicates only abolish and * assertz are supported for static predicates no database predicates are - * supportted for fast predicates + * supportted for fast predicates */ #define is_dynamic(pe) (pe->PredFlags & DynamicPredFlag) @@ -725,7 +725,7 @@ get_pred(Term t, Term tmod, char *pname) Functor fun = FunctorOfTerm(t); if (IsExtensionFunctor(fun)) { Yap_Error(TYPE_ERROR_CALLABLE, Yap_PredicateIndicator(t, tmod), pname); - return NULL; + return NULL; } if (fun == FunctorModule) { Term tmod = ArgOfTerm(1, t); @@ -748,12 +748,12 @@ get_pred(Term t, Term tmod, char *pname) /****************************************************************** Mega Clauses - + ******************************************************************/ -#define OrArgAdjust(P) -#define TabEntryAdjust(P) +#define OrArgAdjust(P) +#define TabEntryAdjust(P) #define DoubleInCodeAdjust(D) #define IntegerInCodeAdjust(D) #define IntegerAdjust(D) (D) @@ -773,7 +773,7 @@ get_pred(Term t, Term tmod, char *pname) #define OpcodeAdjust(X) (X) #define ModuleAdjust(X) (X) #define ExternalFunctionAdjust(X) (X) -#define AdjustSwitchTable(X,Y,Z) +#define AdjustSwitchTable(X,Y,Z) #define DBGroundTermAdjust(X) (X) #define rehash(A,B,C) @@ -955,15 +955,15 @@ split_megaclause(PredEntry *ap) /****************************************************************** - + Indexation Info - + ******************************************************************/ #define ByteAdr(X) ((Int) &(X)) /* Index a prolog pred, given its predicate entry */ /* ap is already locked. */ -static void +static void IPred(PredEntry *ap, UInt NSlots, yamop *next_pc) { yamop *BaseAddr; @@ -1016,13 +1016,13 @@ IPred(PredEntry *ap, UInt NSlots, yamop *next_pc) } if (ap->PredFlags & (SpiedPredFlag|CountPredFlag|ProfiledPredFlag)) { ap->OpcodeOfPred = Yap_opcode(_spy_pred); - ap->CodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); + ap->CodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); #if defined(YAPOR) || defined(THREADS) } else if (ap->PredFlags & LogUpdatePredFlag && !(ap->PredFlags & ThreadLocalPredFlag) && ap->ModuleOfPred != IDB_MODULE) { ap->OpcodeOfPred = LOCKPRED_OPCODE; - ap->CodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); + ap->CodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); #endif } else { ap->CodeOfPred = ap->cs.p_code.TrueCodeOfPred; @@ -1034,7 +1034,7 @@ IPred(PredEntry *ap, UInt NSlots, yamop *next_pc) #endif } -void +void Yap_IPred(PredEntry *p, UInt NSlots, yamop *next_pc) { IPred(p, NSlots, next_pc); @@ -1056,14 +1056,14 @@ RemoveMainIndex(PredEntry *ap) } if (First != NULL && spied) { ap->OpcodeOfPred = Yap_opcode(_spy_pred); - ap->CodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); + ap->CodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); } else if (ap->cs.p_code.NOfClauses > 1 #ifdef TABLING ||ap->PredFlags & TabledPredFlag #endif /* TABLING */ ) { ap->OpcodeOfPred = INDEX_OPCODE; - ap->CodeOfPred = ap->cs.p_code.TrueCodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); + ap->CodeOfPred = ap->cs.p_code.TrueCodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); } else { ap->OpcodeOfPred = ap->cs.p_code.TrueCodeOfPred->opc; ap->CodeOfPred = ap->cs.p_code.TrueCodeOfPred; @@ -1073,8 +1073,8 @@ RemoveMainIndex(PredEntry *ap) !(ap->PredFlags & ThreadLocalPredFlag) && ap->ModuleOfPred != IDB_MODULE) { ap->OpcodeOfPred = LOCKPRED_OPCODE; - ap->CodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); - } + ap->CodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); + } #endif } @@ -1287,7 +1287,7 @@ cleanup_dangling_indices(yamop *ipc, yamop *beg, yamop *end, yamop *suspend_code } #if defined(YAPOR) || defined(THREADS) ipc = (yamop *)((CELL)ipc & ~1); -#endif +#endif } } @@ -1438,7 +1438,7 @@ kill_first_log_iblock(LogUpdIndex *c, LogUpdIndex *parent, PredEntry *ap) /* try to move up, so that we don't hold a switch table */ if (parent != NULL && parent->ClFlags & SwitchTableMask) { - + c->ParentIndex = parent->ParentIndex; parent->ParentIndex->ClRefCount++; parent->ClRefCount--; @@ -1524,9 +1524,9 @@ Yap_ErLogUpdIndex(LogUpdIndex *clau) /* Routine used when wanting to remove the indexation */ /* ap is known to already have been locked for WRITING */ -static int +static int RemoveIndexation(PredEntry *ap) -{ +{ if (ap->OpcodeOfPred == INDEX_OPCODE) { return TRUE; } @@ -1537,21 +1537,21 @@ RemoveIndexation(PredEntry *ap) cl = ClauseCodeToStaticIndex(ap->cs.p_code.TrueCodeOfPred); - kill_top_static_iblock(cl, ap); - + kill_top_static_iblock(cl, ap); + } return TRUE; } -int +int Yap_RemoveIndexation(PredEntry *ap) { return RemoveIndexation(ap); } /****************************************************************** - + Adding clauses - + ******************************************************************/ @@ -1560,21 +1560,21 @@ Yap_RemoveIndexation(PredEntry *ap) #define asserta 2 /* p is already locked */ -static void +static void retract_all(PredEntry *p, int in_use) { yamop *q; q = p->cs.p_code.FirstClause; if (q != NULL) { - if (p->PredFlags & LogUpdatePredFlag) { + if (p->PredFlags & LogUpdatePredFlag) { LogUpdClause *cl = ClauseCodeToLogUpdClause(q); do { LogUpdClause *ncl = cl->ClNext; Yap_ErLogUpdCl(cl); cl = ncl; } while (cl != NULL); - } else if (p->PredFlags & MegaClausePredFlag) { + } else if (p->PredFlags & MegaClausePredFlag) { MegaClause *cl = ClauseCodeToMegaClause(q); if (in_use || cl->ClFlags & HasBlobsMask) { @@ -1648,7 +1648,7 @@ source_pred(PredEntry *p, yamop *q) } /* p is already locked */ -static void +static void add_first_static(PredEntry *p, yamop *cp, int spy_flag) { CACHE_REGS @@ -1663,7 +1663,7 @@ add_first_static(PredEntry *p, yamop *cp, int spy_flag) #ifdef TABLING if (is_tabled(p)) { p->OpcodeOfPred = INDEX_OPCODE; - p->cs.p_code.TrueCodeOfPred = p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); + p->cs.p_code.TrueCodeOfPred = p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); } #endif /* TABLING */ } @@ -1675,7 +1675,7 @@ add_first_static(PredEntry *p, yamop *cp, int spy_flag) !(p->PredFlags & ThreadLocalPredFlag) && p->ModuleOfPred != IDB_MODULE) { p->OpcodeOfPred = LOCKPRED_OPCODE; - p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); + p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); } else #endif p->CodeOfPred = pt; @@ -1697,7 +1697,7 @@ add_first_static(PredEntry *p, yamop *cp, int spy_flag) } if (spy_flag) { p->OpcodeOfPred = Yap_opcode(_spy_pred); - p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); + p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); } if (source_pred(p, cp)) { p->PredFlags |= SourcePredFlag; @@ -1709,7 +1709,7 @@ add_first_static(PredEntry *p, yamop *cp, int spy_flag) } /* p is already locked */ -static void +static void add_first_dynamic(PredEntry *p, yamop *cp, int spy_flag) { CACHE_REGS @@ -1772,7 +1772,7 @@ add_first_dynamic(PredEntry *p, yamop *cp, int spy_flag) !(p->PredFlags & ThreadLocalPredFlag) && p->ModuleOfPred != IDB_MODULE) { p->OpcodeOfPred = LOCKPRED_OPCODE; - p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); + p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); } #endif /* set the first clause to have a retry and mark which will @@ -1810,7 +1810,7 @@ add_first_dynamic(PredEntry *p, yamop *cp, int spy_flag) } /* p is already locked */ -static void +static void asserta_stat_clause(PredEntry *p, yamop *q, int spy_flag) { StaticClause *cl = ClauseCodeToStaticClause(q); @@ -1826,16 +1826,16 @@ asserta_stat_clause(PredEntry *p, yamop *q, int spy_flag) p->cs.p_code.FirstClause = q; if (p->PredFlags & (SpiedPredFlag|CountPredFlag|ProfiledPredFlag)) { p->OpcodeOfPred = Yap_opcode(_spy_pred); - p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); + p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); } else if (!(p->PredFlags & IndexedPredFlag)) { p->OpcodeOfPred = INDEX_OPCODE; - p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); + p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); } #if defined(YAPOR) || defined(THREADS) if (p->ModuleOfPred != IDB_MODULE && !(p->PredFlags & ThreadLocalPredFlag)) { p->OpcodeOfPred = LOCKPRED_OPCODE; - p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); + p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); } #endif return; @@ -1845,15 +1845,15 @@ asserta_stat_clause(PredEntry *p, yamop *q, int spy_flag) p->cs.p_code.TrueCodeOfPred = q; if (p->PredFlags & (SpiedPredFlag|CountPredFlag|ProfiledPredFlag)) { p->OpcodeOfPred = Yap_opcode(_spy_pred); - p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); + p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); } else if (!(p->PredFlags & IndexedPredFlag)) { p->OpcodeOfPred = INDEX_OPCODE; - p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); + p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); } } /* p is already locked */ -static void +static void asserta_dynam_clause(PredEntry *p, yamop *cp) { yamop *q; @@ -1885,7 +1885,7 @@ asserta_dynam_clause(PredEntry *p, yamop *cp) } /* p is already locked */ -static void +static void assertz_stat_clause(PredEntry *p, yamop *cp, int spy_flag) { yamop *pt; @@ -1903,19 +1903,19 @@ assertz_stat_clause(PredEntry *p, yamop *cp, int spy_flag) p->cs.p_code.LastClause = cp; if (!(p->PredFlags & IndexedPredFlag)) { p->OpcodeOfPred = INDEX_OPCODE; - p->cs.p_code.TrueCodeOfPred = p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); + p->cs.p_code.TrueCodeOfPred = p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); } #if defined(YAPOR) || defined(THREADS) if (p->ModuleOfPred != IDB_MODULE && !(p->PredFlags & ThreadLocalPredFlag)) { p->OpcodeOfPred = LOCKPRED_OPCODE; - p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); + p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); } #endif if (p->PredFlags & (SpiedPredFlag|CountPredFlag|ProfiledPredFlag)) { p->OpcodeOfPred = Yap_opcode(_spy_pred); - p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); - } + p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); + } return; } else { StaticClause *cl = ClauseCodeToStaticClause(pt); @@ -1925,14 +1925,14 @@ assertz_stat_clause(PredEntry *p, yamop *cp, int spy_flag) if (p->cs.p_code.FirstClause == p->cs.p_code.LastClause) { if (!(p->PredFlags & (SpiedPredFlag|CountPredFlag|ProfiledPredFlag))) { p->OpcodeOfPred = INDEX_OPCODE; - p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); + p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); } } p->cs.p_code.LastClause = cp; } /* p is already locked */ -static void +static void assertz_dynam_clause(PredEntry *p, yamop *cp) { yamop *q; @@ -1959,7 +1959,7 @@ assertz_dynam_clause(PredEntry *p, yamop *cp) p->cs.p_code.NOfClauses++; } -void +void Yap_AssertzClause(PredEntry *p, yamop *cp) { if (p->PredFlags & DynamicPredFlag) { @@ -2007,7 +2007,7 @@ static void expand_consult( void ) LOCAL_ConsultLow = new_cl; } -static int +static int not_was_reconsulted(PredEntry *p, Term t, int mode) { CACHE_REGS @@ -2030,7 +2030,7 @@ not_was_reconsulted(PredEntry *p, Term t, int mode) if (fp != LOCAL_ConsultBase) { return FALSE; } else if (mode) { // consulting again a predicate in the original file. - if ((p->cs.p_code.NOfClauses && + if ((p->cs.p_code.NOfClauses && p->src.OwnerFile == Yap_ConsultingFile( PASS_REGS1 ) && p->src.OwnerFile != AtomNil && !(p->PredFlags & MultiFileFlag) && @@ -2049,7 +2049,7 @@ not_was_reconsulted(PredEntry *p, Term t, int mode) } --LOCAL_ConsultSp; LOCAL_ConsultSp->p = p0; - if (LOCAL_ConsultBase[1].mode && + if (LOCAL_ConsultBase[1].mode && !(p->PredFlags & MultiFileFlag)) /* we are in reconsult mode */ { retract_all(p, static_in_use(p,TRUE)); } @@ -2059,7 +2059,7 @@ not_was_reconsulted(PredEntry *p, Term t, int mode) } static void -addcl_permission_error(AtomEntry *ap, Int Arity, int in_use) +addcl_permission_error(AtomEntry *ap, Int Arity, int in_use) { CACHE_REGS Term t, ti[2]; @@ -2158,7 +2158,7 @@ Yap_multiple( PredEntry *ap USES_REGS ) return FALSE; if (ap == LOCAL_LastAssertedPred) return FALSE; - return + return ap->cs.p_code.NOfClauses > 0 && Yap_ConsultingFile( PASS_REGS1 ) != ap->src.OwnerFile; } @@ -2192,7 +2192,7 @@ mark_preds_with_this_func(Functor f, Prop p0) while (p) { Prop nextp = p->NextOfPE; if (p->FunctorOfPred == f) - p->PredFlags |= GoalExPredFlag; + p->PredFlags |= GoalExPredFlag; p = RepPredProp(nextp); } } @@ -2204,7 +2204,7 @@ mark_preds_with_this_atom(Prop p) while (p) { Prop nextp = p->NextOfPE; if (p->KindOfPE == PEProp) - RepPredProp(p)->PredFlags |= GoalExPredFlag; + RepPredProp(p)->PredFlags |= GoalExPredFlag; p = nextp; } } @@ -2219,7 +2219,7 @@ goal_expansion_support(PredEntry *p, Term tf) if (IsVarTerm(tg) || IsVarTerm(tm)) { if (!IsVarTerm(tg)) { /* this is the complicated case, first I need to inform - predicates for this functor */ + predicates for this functor */ PRED_GOAL_EXPANSION_FUNC = TRUE; if (IsAtomTerm(tg)) { AtomEntry *ae = RepAtom(AtomOfTerm(tg)); @@ -2236,7 +2236,7 @@ goal_expansion_support(PredEntry *p, Term tf) } if (!found) { PredEntry *npe = RepPredProp(PredPropByAtom(AtomOfTerm(tg),IDB_MODULE)); - npe->PredFlags |= GoalExPredFlag; + npe->PredFlags |= GoalExPredFlag; } } else if (IsApplTerm(tg)) { FunctorEntry *fe = (FunctorEntry *)FunctorOfTerm(tg); @@ -2252,7 +2252,7 @@ goal_expansion_support(PredEntry *p, Term tf) if (CurrentModule == PROLOG_MODULE) mod = IDB_MODULE; npe = RepPredProp(PredPropByFunc(fe,mod)); - npe->PredFlags |= GoalExPredFlag; + npe->PredFlags |= GoalExPredFlag; } } } else { @@ -2285,7 +2285,7 @@ goal_expansion_support(PredEntry *p, Term tf) PRED_GOAL_EXPANSION_FUNC = TRUE; } npe = RepPredProp(PredPropByFunc(fe,p->ModuleOfPred)); - npe->PredFlags |= GoalExPredFlag; + npe->PredFlags |= GoalExPredFlag; } else if (IsAtomTerm(tg)) { Atom at = AtomOfTerm(tg); Prop p0; @@ -2297,7 +2297,7 @@ goal_expansion_support(PredEntry *p, Term tf) PRED_GOAL_EXPANSION_FUNC = TRUE; } npe = RepPredProp(PredPropByAtom(at,p->ModuleOfPred)); - npe->PredFlags |= GoalExPredFlag; + npe->PredFlags |= GoalExPredFlag; } } } @@ -2342,7 +2342,7 @@ addclause(Term t, yamop *cp, int mode, Term mod, Term *t4ref) if (!(p->PredFlags & SysExportPredFlag) && ( (pflags & (UserCPredFlag|CArgsPredFlag|NumberDBPredFlag|AtomDBPredFlag|TestPredFlag|AsmPredFlag|CPredFlag|BinaryPredFlag)) || - (p->ModuleOfPred == PROLOG_MODULE && + (p->ModuleOfPred == PROLOG_MODULE && mod != TermProlog && mod) ) ) { @@ -2364,7 +2364,7 @@ addclause(Term t, yamop *cp, int mode, Term mod, Term *t4ref) if (pflags & (SpiedPredFlag|CountPredFlag|ProfiledPredFlag)) spy_flag = TRUE; goal_expansion_support(p, tf); - if (mode == consult) + if (mode == consult) not_was_reconsulted(p, t, TRUE); /* always check if we have a valid error first */ if (LOCAL_ErrorMessage && LOCAL_Error_TYPE == PERMISSION_ERROR_MODIFY_STATIC_PROCEDURE) { @@ -2409,7 +2409,7 @@ addclause(Term t, yamop *cp, int mode, Term mod, Term *t4ref) !(p->PredFlags & ThreadLocalPredFlag) && p->ModuleOfPred != IDB_MODULE) { p->OpcodeOfPred = LOCKPRED_OPCODE; - p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); + p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); } #endif } else { @@ -2434,7 +2434,7 @@ addclause(Term t, yamop *cp, int mode, Term mod, Term *t4ref) !(p->PredFlags & ThreadLocalPredFlag) && p->ModuleOfPred != IDB_MODULE) { p->OpcodeOfPred = LOCKPRED_OPCODE; - p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); + p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred)); } #endif } @@ -2501,7 +2501,7 @@ Yap_EraseStaticClause(StaticClause *cl, PredEntry *ap, Term mod) { ap->cs.p_code.LastClause = ap->cs.p_code.FirstClause = NULL; ap->OpcodeOfPred = UNDEF_OPCODE; ap->cs.p_code.TrueCodeOfPred = - (yamop *)(&(ap->OpcodeOfPred)); + (yamop *)(&(ap->OpcodeOfPred)); } else { yamop *ncl = cl->ClNext->ClCode; ap->cs.p_code.FirstClause = ncl; @@ -2539,14 +2539,14 @@ Yap_EraseStaticClause(StaticClause *cl, PredEntry *ap, Term mod) { Yap_FreeCodeSpace((char *)cl); } if (ap->cs.p_code.NOfClauses == 0) { - ap->CodeOfPred = + ap->CodeOfPred = ap->cs.p_code.TrueCodeOfPred; } else if (ap->cs.p_code.NOfClauses > 1) { ap->OpcodeOfPred = INDEX_OPCODE; - ap->CodeOfPred = ap->cs.p_code.TrueCodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); + ap->CodeOfPred = ap->cs.p_code.TrueCodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); } else if (ap->PredFlags & (SpiedPredFlag|CountPredFlag|ProfiledPredFlag)) { ap->OpcodeOfPred = Yap_opcode(_spy_pred); - ap->CodeOfPred = ap->cs.p_code.TrueCodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); + ap->CodeOfPred = ap->cs.p_code.TrueCodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); } else { ap->CodeOfPred = ap->cs.p_code.TrueCodeOfPred; } @@ -2555,7 +2555,7 @@ Yap_EraseStaticClause(StaticClause *cl, PredEntry *ap, Term mod) { !(ap->PredFlags & ThreadLocalPredFlag) && ap->ModuleOfPred != IDB_MODULE) { ap->OpcodeOfPred = LOCKPRED_OPCODE; - ap->CodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); + ap->CodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); } #endif } @@ -2577,12 +2577,12 @@ Yap_add_logupd_clause(PredEntry *pe, LogUpdClause *cl, int mode) { !(pe->PredFlags & ThreadLocalPredFlag) && pe->ModuleOfPred != IDB_MODULE) { pe->OpcodeOfPred = LOCKPRED_OPCODE; - pe->CodeOfPred = (yamop *)(&(pe->OpcodeOfPred)); + pe->CodeOfPred = (yamop *)(&(pe->OpcodeOfPred)); } else { #endif pe->CodeOfPred = pe->cs.p_code.TrueCodeOfPred; pe->OpcodeOfPred = ((yamop *)(pe->CodeOfPred))->opc; -#if defined(YAPOR) || defined(THREADS) +#if defined(YAPOR) || defined(THREADS) } #endif } @@ -2593,7 +2593,7 @@ Yap_add_logupd_clause(PredEntry *pe, LogUpdClause *cl, int mode) { } } -static Int +static Int p_compile( USES_REGS1 ) { /* '$compile'(+C,+Flags, Mod) */ Term t = Deref(ARG1); @@ -2629,7 +2629,7 @@ p_compile( USES_REGS1 ) return TRUE; } -static Int +static Int p_compile_dynamic( USES_REGS1 ) { /* '$compile_dynamic'(+C,+Flags,Mod,-Ref) */ Term t = Deref(ARG1); @@ -2644,11 +2644,11 @@ p_compile_dynamic( USES_REGS1 ) return FALSE; if (IsAtomTerm(t1)) { if (RepAtom(AtomOfTerm(t1))->StrOfAE[0] == 'f') mode = asserta; - else mode = assertz; + else mode = assertz; } else mode = IntegerOfTerm(t1); /* separate assert in current file from reconsult if (mode == assertz && LOCAL_consult_level && mod == CurrentModule) - mode = consult; + mode = consult; */ old_optimize = optimizer_on; optimizer_on = FALSE; @@ -2657,11 +2657,11 @@ p_compile_dynamic( USES_REGS1 ) cclause() in case there is a overflow */ t = Deref(ARG1); /* just in case there was an heap overflow */ if (!LOCAL_ErrorMessage) { - - + + optimizer_on = old_optimize; addclause(t, code_adr, mode , mod, &ARG5); - } + } if (LOCAL_ErrorMessage) { if (!LOCAL_Error_Term) LOCAL_Error_Term = TermNil; @@ -2712,20 +2712,20 @@ Yap_init_consult(int mode, const char *file) init_consult(mode,file); } -static Int +static Int p_startconsult( USES_REGS1 ) { /* '$start_consult'(+Mode) */ Term t; char *smode = RepAtom(AtomOfTerm(Deref(ARG1)))->StrOfAE; int mode; - + mode = strcmp("consult",smode); init_consult(mode, RepAtom(AtomOfTerm(Deref(ARG2)))->StrOfAE); t = MkIntTerm(LOCAL_consult_level); return (Yap_unify_constant(ARG3, t)); } -static Int +static Int p_showconslultlev( USES_REGS1 ) { Term t; @@ -2755,7 +2755,7 @@ Yap_end_consult( void ) { } -static Int +static Int p_endconsult( USES_REGS1 ) { /* '$end_consult' */ end_consult( PASS_REGS1 ); @@ -2783,14 +2783,14 @@ Yap_Abolish(PredEntry *pred) pred->src.OwnerFile = AtomNil; } -static Int +static Int p_purge_clauses( USES_REGS1 ) { /* '$purge_clauses'(+Func) */ PredEntry *pred; Term t = Deref(ARG1); Term mod = Deref(ARG2); MegaClause *before = DeadMegaClauses; - + Yap_PutValue(AtomAbol, MkAtomTerm(AtomNil)); if (IsVarTerm(t)) return FALSE; @@ -2825,7 +2825,7 @@ p_purge_clauses( USES_REGS1 ) } -static Int +static Int p_sys_export( USES_REGS1 ) { /* '$set_spy'(+Fun,+M) */ PredEntry *pred; @@ -2846,7 +2846,7 @@ p_sys_export( USES_REGS1 ) } else { return (FALSE); } - PELOCK(100,pred); + PELOCK(100,pred); pred->PredFlags |= SysExportPredFlag; UNLOCKPE(100,pred); return TRUE; @@ -2854,12 +2854,12 @@ p_sys_export( USES_REGS1 ) /****************************************************************** - + MANAGING SPY-POINTS - + ******************************************************************/ -static Int +static Int p_is_no_trace( USES_REGS1 ) { /* '$undefined'(P,Mod) */ PredEntry *pe; @@ -2877,7 +2877,7 @@ p_is_no_trace( USES_REGS1 ) } -static Int +static Int p_set_no_trace( USES_REGS1 ) { /* '$set_no_trace'(+Fun,+M) */ PredEntry *pe; @@ -2910,7 +2910,7 @@ Yap_SetNoTrace(char *name, arity_t arity, Term tmod) } -static Int +static Int p_setspy( USES_REGS1 ) { /* '$set_spy'(+Fun,+M) */ Atom at; @@ -2962,14 +2962,14 @@ p_setspy( USES_REGS1 ) Yap_opcode(_spy_or_trymark); } else { pred->OpcodeOfPred = Yap_opcode(_spy_pred); - pred->CodeOfPred = (yamop *)(&(pred->OpcodeOfPred)); + pred->CodeOfPred = (yamop *)(&(pred->OpcodeOfPred)); } pred->PredFlags |= SpiedPredFlag; UNLOCKPE(37,pred); return TRUE; } -static Int +static Int p_rmspy( USES_REGS1 ) { /* '$rm_spy'(+T,+Mod) */ Atom at; @@ -3002,7 +3002,7 @@ p_rmspy( USES_REGS1 ) pred->PredFlags ^= SpiedPredFlag; UNLOCKPE(39,pred); return TRUE; - } + } #endif if (!(pred->PredFlags & (CountPredFlag|ProfiledPredFlag))) { if (!(pred->PredFlags & DynamicPredFlag)) { @@ -3011,7 +3011,7 @@ p_rmspy( USES_REGS1 ) !(pred->PredFlags & ThreadLocalPredFlag) && pred->ModuleOfPred != IDB_MODULE) { pred->OpcodeOfPred = LOCKPRED_OPCODE; - pred->CodeOfPred = (yamop *)(&(pred->OpcodeOfPred)); + pred->CodeOfPred = (yamop *)(&(pred->OpcodeOfPred)); } else { #endif pred->CodeOfPred = pred->cs.p_code.TrueCodeOfPred; @@ -3033,12 +3033,12 @@ p_rmspy( USES_REGS1 ) /****************************************************************** - + INFO ABOUT PREDICATES - + ******************************************************************/ -static Int +static Int p_number_of_clauses( USES_REGS1 ) { /* '$number_of_clauses'(Predicate,M,N) */ Term t = Deref(ARG1); @@ -3066,7 +3066,7 @@ p_number_of_clauses( USES_REGS1 ) return (Yap_unify_constant(ARG3, MkIntegerTerm(ncl))); } -static Int +static Int p_in_use( USES_REGS1 ) { /* '$in_use'(+P,+Mod) */ PredEntry *pe; @@ -3081,7 +3081,7 @@ p_in_use( USES_REGS1 ) return(out); } -static Int +static Int p_new_multifile( USES_REGS1 ) { /* '$new_multifile'(+N,+Ar,+Mod) */ Atom at; @@ -3103,9 +3103,9 @@ p_new_multifile( USES_REGS1 ) arity = IntOfTerm(t); else return FALSE; - if (arity == 0) + if (arity == 0) pe = RepPredProp(PredPropByAtom(at, mod)); - else + else pe = RepPredProp(PredPropByFunc(Yap_MkFunctor(at, arity),mod)); PELOCK(26,pe); pe->PredFlags |= MultiFileFlag; @@ -3122,7 +3122,7 @@ p_new_multifile( USES_REGS1 ) } -static Int +static Int p_is_multifile( USES_REGS1 ) { /* '$is_multifile'(+S,+Mod) */ PredEntry *pe; @@ -3137,7 +3137,7 @@ p_is_multifile( USES_REGS1 ) return(out); } -static Int +static Int p_new_discontiguous( USES_REGS1 ) { /* '$new_discontiguous'(+N,+Ar,+Mod) */ Atom at; @@ -3159,9 +3159,9 @@ p_new_discontiguous( USES_REGS1 ) arity = IntOfTerm(t); else return FALSE; - if (arity == 0) + if (arity == 0) pe = RepPredProp(PredPropByAtom(at, mod)); - else + else pe = RepPredProp(PredPropByFunc(Yap_MkFunctor(at, arity),mod)); PELOCK(26,pe); pe->PredFlags |= DiscontiguousPredFlag; @@ -3173,7 +3173,7 @@ p_new_discontiguous( USES_REGS1 ) } -static Int +static Int p_is_discontiguous( USES_REGS1 ) { /* '$is_multifile'(+S,+Mod) */ PredEntry *pe; @@ -3188,7 +3188,7 @@ p_is_discontiguous( USES_REGS1 ) return(out); } -static Int +static Int p_is_thread_local( USES_REGS1 ) { /* '$is_dynamic'(+P) */ PredEntry *pe; @@ -3203,7 +3203,7 @@ p_is_thread_local( USES_REGS1 ) return(out); } -static Int +static Int p_is_log_updatable( USES_REGS1 ) { /* '$is_dynamic'(+P) */ PredEntry *pe; @@ -3218,7 +3218,7 @@ p_is_log_updatable( USES_REGS1 ) return(out); } -static Int +static Int p_is_source( USES_REGS1 ) { /* '$is_dynamic'(+P) */ PredEntry *pe; @@ -3233,7 +3233,7 @@ p_is_source( USES_REGS1 ) return(out); } -static Int +static Int p_is_exo( USES_REGS1 ) { /* '$is_dynamic'(+P) */ PredEntry *pe; @@ -3254,7 +3254,7 @@ p_is_exo( USES_REGS1 ) return(out); } -static Int +static Int p_owner_file( USES_REGS1 ) { /* '$owner_file'(+P,M,F) */ PredEntry *pe; @@ -3279,7 +3279,7 @@ p_owner_file( USES_REGS1 ) return Yap_unify(ARG3, MkAtomTerm(owner)); } -static Int +static Int p_set_owner_file( USES_REGS1 ) { /* '$owner_file'(+P,M,F) */ PredEntry *pe; @@ -3301,7 +3301,7 @@ p_set_owner_file( USES_REGS1 ) return TRUE; } -static Int +static Int p_mk_d( USES_REGS1 ) { /* '$is_dynamic'(+P) */ PredEntry *pe; @@ -3318,7 +3318,7 @@ p_mk_d( USES_REGS1 ) return TRUE; } -static Int +static Int p_is_dynamic( USES_REGS1 ) { /* '$is_dynamic'(+P) */ PredEntry *pe; @@ -3333,7 +3333,7 @@ p_is_dynamic( USES_REGS1 ) return(out); } -static Int +static Int p_is_metapredicate( USES_REGS1 ) { /* '$is_metapredicate'(+P) */ PredEntry *pe; @@ -3348,7 +3348,7 @@ p_is_metapredicate( USES_REGS1 ) return out; } -static Int +static Int p_is_expandgoalormetapredicate( USES_REGS1 ) { /* '$is_expand_goal_predicate'(+P) */ PredEntry *pe; @@ -3411,7 +3411,7 @@ p_is_expandgoalormetapredicate( USES_REGS1 ) return(out); } -static Int +static Int p_pred_exists( USES_REGS1 ) { /* '$pred_exists'(+P,+M) */ PredEntry *pe; @@ -3430,7 +3430,7 @@ p_pred_exists( USES_REGS1 ) return out; } -static Int +static Int p_set_pred_module( USES_REGS1 ) { /* '$set_pred_module'(+P,+Mod) */ PredEntry *pe; @@ -3444,7 +3444,7 @@ p_set_pred_module( USES_REGS1 ) return(TRUE); } -static Int +static Int p_set_pred_owner( USES_REGS1 ) { /* '$set_pred_module'(+P,+File) */ PredEntry *pe; @@ -3473,7 +3473,7 @@ p_set_pred_owner( USES_REGS1 ) return(TRUE); } -static Int +static Int p_undefined( USES_REGS1 ) { /* '$undefined'(P,Mod) */ PredEntry *pe; @@ -3496,10 +3496,10 @@ p_undefined( USES_REGS1 ) /* * this predicate should only be called when all clauses for the dynamic - * predicate were remove, otherwise chaos will follow!! + * predicate were remove, otherwise chaos will follow!! */ -static Int +static Int p_kill_dynamic( USES_REGS1 ) { /* '$kill_dynamic'(P,M) */ PredEntry *pe; @@ -3518,27 +3518,27 @@ p_kill_dynamic( USES_REGS1 ) } pe->cs.p_code.LastClause = pe->cs.p_code.FirstClause = NULL; pe->OpcodeOfPred = UNDEF_OPCODE; - pe->cs.p_code.TrueCodeOfPred = pe->CodeOfPred = (yamop *)(&(pe->OpcodeOfPred)); + pe->cs.p_code.TrueCodeOfPred = pe->CodeOfPred = (yamop *)(&(pe->OpcodeOfPred)); pe->PredFlags = pe->PredFlags & GoalExPredFlag; UNLOCKPE(62,pe); return (TRUE); } -static Int +static Int p_optimizer_on( USES_REGS1 ) { /* '$optimizer_on' */ optimizer_on = TRUE; return (TRUE); } -static Int +static Int p_optimizer_off( USES_REGS1 ) { /* '$optimizer_off' */ optimizer_on = FALSE; return (TRUE); } -static Int +static Int p_compile_mode( USES_REGS1 ) { /* $compile_mode(Old,New) */ Term t2, t3 = MkIntTerm(compile_mode); @@ -3600,7 +3600,7 @@ search_for_static_predicate_in_use(PredEntry *p, int check_everything) /* check first environments that are younger than our latest choicepoint */ if (check_everything && env_ptr) { - /* + /* I do not need to check environments for asserts, only for retracts */ @@ -3615,7 +3615,7 @@ search_for_static_predicate_in_use(PredEntry *p, int check_everything) } } /* now mark the choicepoint */ - + if (b_ptr) pe = PredForChoicePt(b_ptr->cp_ap); else @@ -3632,11 +3632,11 @@ search_for_static_predicate_in_use(PredEntry *p, int check_everything) if (p->PredFlags & LogUpdatePredFlag) { LogUpdIndex *cl = ClauseCodeToLogUpdIndex(code_beg); - if (find_owner_log_index(cl, code_p)) + if (find_owner_log_index(cl, code_p)) b_ptr->cp_ap = cur_log_upd_clause(pe, b_ptr->cp_ap->y_u.Otapl.d); } else if (p->PredFlags & MegaClausePredFlag) { StaticIndex *cl = ClauseCodeToStaticIndex(code_beg); - if (find_owner_static_index(cl, code_p)) + if (find_owner_static_index(cl, code_p)) b_ptr->cp_ap = cur_clause(pe, b_ptr->cp_ap->y_u.Otapl.d); } else { /* static clause */ @@ -3670,7 +3670,7 @@ mark_pred(int mark, PredEntry *pe) } /* go up the chain of choice_points and environments, - marking all static predicates that current execution is depending + marking all static predicates that current execution is depending upon */ static void do_toggle_static_predicates_in_use(int mask) @@ -3686,7 +3686,7 @@ do_toggle_static_predicates_in_use(int mask) /* check first environments that are younger than our latest choicepoint */ while (b_ptr > (choiceptr)env_ptr) { PredEntry *pe = EnvPreg((yamop *)env_ptr[E_CP]); - + mark_pred(mask, pe); env_ptr = (CELL *)(env_ptr[E_E]); } @@ -3710,7 +3710,7 @@ find_owner_log_index(LogUpdIndex *cl, yamop *code_p) { yamop *code_beg = cl->ClCode; yamop *code_end = (yamop *)((char *)cl + cl->ClSize); - + if (code_p >= code_beg && code_p <= code_end) { return cl; } @@ -3730,7 +3730,7 @@ find_owner_static_index(StaticIndex *cl, yamop *code_p) { yamop *code_beg = cl->ClCode; yamop *code_end = (yamop *)((char *)cl + cl->ClSize); - + if (code_p >= code_beg && code_p <= code_end) { return cl; } @@ -3764,7 +3764,7 @@ all_envs(CELL *env_ptr USES_REGS) Term tf = AbsPair(HR); CELL *start = HR; CELL *bp = NULL; - + /* walk the environment chain */ while (env_ptr) { bp = HR; @@ -3776,13 +3776,13 @@ all_envs(CELL *env_ptr USES_REGS) LOCAL_Error_Size = (ASP-1024)-HR; while (env_ptr) { LOCAL_Error_Size += 2; - env_ptr = (CELL *)(env_ptr[E_E]); + env_ptr = (CELL *)(env_ptr[E_E]); } return 0L; } else { bp[1] = AbsPair(HR); } - env_ptr = (CELL *)(env_ptr[E_E]); + env_ptr = (CELL *)(env_ptr[E_E]); } bp[1] = TermNil; return tf; @@ -3896,7 +3896,7 @@ p_toggle_static_predicates_in_use( USES_REGS1 ) #if !defined(YAPOR) && !defined(THREADS) Term t = Deref(ARG1); Int mask; - + /* find out whether we need to mark or unmark */ if (IsVarTerm(t)) { Yap_Error(INSTANTIATION_ERROR,t,"toggle_static_predicates_in_use/1"); @@ -3932,7 +3932,7 @@ clause_was_found(PredEntry *pp, Atom *pat, arity_t *parity) { *pat = NameOfFunctor(pp->FunctorOfPred); } else { *pat = (Atom)(pp->FunctorOfPred); - } + } } } @@ -3998,7 +3998,7 @@ find_code_in_clause(PredEntry *pp, yamop *codeptr, CODEADDR *startp, CODEADDR *e } else if (pp->PredFlags & DynamicPredFlag) { do { DynamicClause *cl; - + cl = ClauseCodeToDynamicClause(clcode); if (IN_BLOCK(codeptr,cl,cl->ClSize)) { if (startp) @@ -4014,7 +4014,7 @@ find_code_in_clause(PredEntry *pp, yamop *codeptr, CODEADDR *startp, CODEADDR *e } while (TRUE); } else if (pp->PredFlags & MegaClausePredFlag) { MegaClause *cl; - + cl = ClauseCodeToMegaClause(clcode); if (IN_BLOCK(codeptr,cl,cl->ClSize)) { if (startp) @@ -4025,7 +4025,7 @@ find_code_in_clause(PredEntry *pp, yamop *codeptr, CODEADDR *startp, CODEADDR *e } } else { StaticClause *cl; - + cl = ClauseCodeToStaticClause(clcode); do { if (IN_BLOCK(codeptr,cl,cl->ClSize)) { @@ -4080,7 +4080,7 @@ cl_code_in_pred(PredEntry *pp, yamop *codeptr, CODEADDR *startp, CODEADDR *endp) } else { out = find_code_in_clause(pp, codeptr, startp, endp); } - UNLOCK(pp->PELock); + UNLOCK(pp->PELock); if (out) return TRUE; return FALSE; } @@ -4149,7 +4149,7 @@ Yap_PredForCode(yamop *codeptr, find_pred_type where_from, Atom *pat, arity_t *p *pmodule = TermProlog; else *pmodule = p->ModuleOfPred; - out = find_code_in_clause(p, codeptr, NULL, NULL); + out = find_code_in_clause(p, codeptr, NULL, NULL); clause_was_found(p, pat, parity); return out; } @@ -4609,13 +4609,13 @@ p_system_pred( USES_REGS1 ) Functor funt = FunctorOfTerm(t1); if (IsExtensionFunctor(funt)) { return FALSE; - } + } if (funt == FunctorModule) { Term nmod = ArgOfTerm(1, t1); if (IsVarTerm(nmod)) { Yap_Error(INSTANTIATION_ERROR,ARG1,"system_predicate/1"); return FALSE; - } + } if (!IsAtomTerm(nmod)) { Yap_Error(TYPE_ERROR_ATOM,ARG1,"system_predicate/1"); return FALSE; @@ -4654,13 +4654,13 @@ p_all_system_pred( USES_REGS1 ) Functor funt = FunctorOfTerm(t1); if (IsExtensionFunctor(funt)) { return FALSE; - } + } if (funt == FunctorModule) { Term nmod = ArgOfTerm(1, t1); if (IsVarTerm(nmod)) { Yap_Error(INSTANTIATION_ERROR,ARG1,"system_predicate/1"); return FALSE; - } + } if (!IsAtomTerm(nmod)) { Yap_Error(TYPE_ERROR_ATOM,ARG1,"system_predicate/1"); return FALSE; @@ -4681,7 +4681,7 @@ p_all_system_pred( USES_REGS1 ) } else { if (!Yap_unify(ARG3,TermProlog)) return FALSE; - } + } return(!pe->ModuleOfPred || /* any predicate in prolog module */ /* any C-pred */ pe->PredFlags & (UserCPredFlag|CPredFlag|BinaryPredFlag|AsmPredFlag|TestPredFlag) || @@ -4722,7 +4722,7 @@ Yap_HidePred(PredEntry *pe) } pe->NextOfPE = HIDDEN_PREDICATES; HIDDEN_PREDICATES = AbsPredProp(pe); - pe->PredFlags |= HiddenPredFlag; + pe->PredFlags |= HiddenPredFlag; } static Int /* $system_predicate(P) */ @@ -4744,13 +4744,13 @@ p_stash_predicate( USES_REGS1 ) Functor funt = FunctorOfTerm(t1); if (IsExtensionFunctor(funt)) { return(FALSE); - } + } if (funt == FunctorModule) { Term nmod = ArgOfTerm(1, t1); if (IsVarTerm(nmod)) { Yap_Error(INSTANTIATION_ERROR,ARG1,"hide_predicate/1"); return(FALSE); - } + } if (!IsAtomTerm(nmod)) { Yap_Error(TYPE_ERROR_ATOM,ARG1,"hide_predicate/1"); return(FALSE); @@ -4788,13 +4788,13 @@ p_hide_predicate( USES_REGS1 ) Functor funt = FunctorOfTerm(t1); if (IsExtensionFunctor(funt)) { return(FALSE); - } + } if (funt == FunctorModule) { Term nmod = ArgOfTerm(1, t1); if (IsVarTerm(nmod)) { Yap_Error(INSTANTIATION_ERROR,ARG1,"hide_predicate/1"); return(FALSE); - } + } if (!IsAtomTerm(nmod)) { Yap_Error(TYPE_ERROR_ATOM,ARG1,"hide_predicate/1"); return(FALSE); @@ -4809,7 +4809,7 @@ p_hide_predicate( USES_REGS1 ) return FALSE; if (EndOfPAEntr(pe)) return FALSE; - pe->PredFlags |= HiddenPredFlag; + pe->PredFlags |= HiddenPredFlag; return TRUE; } @@ -4831,13 +4831,13 @@ p_hidden_predicate( USES_REGS1 ) Functor funt = FunctorOfTerm(t1); if (IsExtensionFunctor(funt)) { return(FALSE); - } + } if (funt == FunctorModule) { Term nmod = ArgOfTerm(1, t1); if (IsVarTerm(nmod)) { Yap_Error(INSTANTIATION_ERROR,ARG1,"hide_predicate/1"); return(FALSE); - } + } if (!IsAtomTerm(nmod)) { Yap_Error(TYPE_ERROR_ATOM,ARG1,"hide_predicate/1"); return(FALSE); @@ -4914,7 +4914,7 @@ fetch_next_lu_clause(PredEntry *pe, yamop *i_code, Term th, Term tb, Term tr, ya #if defined(YAPOR) || defined(THREADS) if (pe->PredFlags & ThreadLocalPredFlag) { /* we don't actually need to execute code */ - UNLOCK(pe->PELock); + UNLOCK(pe->PELock); } else { PP = pe; } @@ -5061,7 +5061,7 @@ fetch_next_lu_clause_erase(PredEntry *pe, yamop *i_code, Term th, Term tb, Term #if defined(YAPOR) || defined(THREADS) if (pe->PredFlags & ThreadLocalPredFlag) { /* we don't actually need to execute code */ - UNLOCK(pe->PELock); + UNLOCK(pe->PELock); } else { PP = pe; } @@ -5184,7 +5184,7 @@ replace_integer(Term orig, UInt new) { CELL *pt; - if (IntInBnd((Int)new)) + if (IntInBnd((Int)new)) return MkIntTerm(new); /* should create an old integer */ if (!IsApplTerm(orig)) { @@ -5406,7 +5406,7 @@ fetch_next_static_clause(PredEntry *pe, yamop *i_code, Term th, Term tb, Term tr return TRUE; } else { Term t; - + if (!(pe->PredFlags & SourcePredFlag)) { /* no source */ rtn = Yap_MkStaticRefTerm(cl, pe); @@ -5557,7 +5557,7 @@ add_code_in_pred(PredEntry *pp) { StaticIndex *cl = ClauseCodeToStaticIndex(clcode); add_code_in_static_index(cl, pp); } - } + } clcode = pp->cs.p_code.FirstClause; if (clcode != NULL) { if (pp->PredFlags & LogUpdatePredFlag) { @@ -5594,7 +5594,7 @@ add_code_in_pred(PredEntry *pp) { } while (TRUE); } } - UNLOCK(pp->PELock); + UNLOCK(pp->PELock); } @@ -5840,7 +5840,7 @@ UnifyPredInfo(PredEntry *pe, int start_arg USES_REGS) { tname = MkAtomTerm(NameOfFunctor(f)); } } - + return Yap_unify(XREGS[start_arg], tmod) && Yap_unify(XREGS[start_arg+1],tname) && Yap_unify(XREGS[start_arg+2],MkIntegerTerm(arity)); @@ -5861,12 +5861,12 @@ p_env_info( USES_REGS1 ) CELL *env = LCL0-IntegerOfTerm(Deref(ARG1)); yamop *env_cp; Term env_b, taddr; - + if (!env) return FALSE; env_b = MkIntegerTerm((Int)(LCL0-(CELL *)env[E_CB])); env_cp = (yamop *)env[E_CP]; - + /* pe = PREVOP(env_cp,Osbpp)->y_u.Osbpp.p0; */ taddr = MkIntegerTerm((Int)env); return Yap_unify(ARG3,MkIntegerTerm((Int)env_cp)) && @@ -5894,7 +5894,7 @@ p_choicepoint_info( USES_REGS1 ) yamop *ipc = cptr->cp_ap; yamop *ncl = NULL; Term t = TermNil, taddr; - + taddr = MkIntegerTerm((Int)cptr); while (go_on) { op_numbers opnum = Yap_op_from_opcode(ipc->opc); @@ -6052,9 +6052,9 @@ p_choicepoint_info( USES_REGS1 ) ncl = NULL; pe = ipc->y_u.lp.p; t = BuildActivePred(pe, cptr->cp_args); - break; + break; case _Nstop: - { + { Atom at = AtomLive; t = MkAtomTerm(at); pe = RepPredProp(PredPropByAtom(at, CurrentModule)); @@ -6094,7 +6094,7 @@ compute_dbcl_size(arity_t arity) break; default: sz = arity*(UInt)NEXTOP((yamop *)NULL,xc); - break; + break; } return (UInt)NEXTOP((yamop *)sz,p); } @@ -6102,7 +6102,7 @@ compute_dbcl_size(arity_t arity) #define DerefAndCheck(t, V) \ t = Deref(V); if(IsVarTerm(t) || !(IsAtomOrIntTerm(t))) Yap_Error(TYPE_ERROR_ATOM, t0, "load_db"); -static int +static int store_dbcl_size(yamop *pc, arity_t arity, Term t0, PredEntry *pe) { Term t; @@ -6184,14 +6184,14 @@ store_dbcl_size(yamop *pc, arity_t arity, Term t0, PredEntry *pe) pc = NEXTOP(pc,xc); } } - break; + break; } pc->opc = Yap_opcode(_procceed); pc->y_u.p.p = pe; return TRUE; } -static Int +static Int p_dbload_get_space( USES_REGS1 ) { /* '$number_of_clauses'(Predicate,M,N) */ Term t = Deref(ARG1); @@ -6269,13 +6269,13 @@ p_dbload_get_space( USES_REGS1 ) } else { ap->OpcodeOfPred = INDEX_OPCODE; } - ap->CodeOfPred = ap->cs.p_code.TrueCodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); + ap->CodeOfPred = ap->cs.p_code.TrueCodeOfPred = (yamop *)(&(ap->OpcodeOfPred)); ptr = (yamop *)((ADDR)mcl->ClCode+ncls*sz); ptr->opc = Yap_opcode(_Ystop); return Yap_unify(ARG4, MkIntegerTerm((Int)mcl)); } -static Int +static Int p_dbassert( USES_REGS1 ) { /* '$number_of_clauses'(Predicate,M,N) */ Term thandle = Deref(ARG2); @@ -6305,7 +6305,7 @@ p_dbassert( USES_REGS1 ) #define CL_PROP_STREAM 5 /* instance(+Ref,?Term) */ -static Int +static Int p_instance_property( USES_REGS1 ) { Term t1 = Deref(ARG1); @@ -6339,14 +6339,14 @@ p_instance_property( USES_REGS1 ) return FALSE; } else { Term t[2]; - + if (ap->ArityOfPE == 0) { t[1] = MkAtomTerm((Atom)ap->FunctorOfPred); } else { Functor nf = ap->FunctorOfPred; arity_t arity = ArityOfFunctor(nf); Atom name = NameOfFunctor(nf); - + t[0] = MkAtomTerm(name); t[1] = MkIntegerTerm(arity); t[1] = Yap_MkApplTerm(FunctorSlash, 2, t); @@ -6391,7 +6391,7 @@ p_instance_property( USES_REGS1 ) arity_t arity = ArityOfFunctor(nf); Atom name = NameOfFunctor(nf); Term t[2]; - + t[0] = MkAtomTerm(name); t[1] = MkIntegerTerm(arity); t[1] = Yap_MkApplTerm(FunctorSlash, 2, t); @@ -6439,7 +6439,7 @@ p_instance_property( USES_REGS1 ) Functor nf = ap->FunctorOfPred; arity_t arity = ArityOfFunctor(nf); Atom name = NameOfFunctor(nf); - + t[0] = MkAtomTerm(name); t[1] = MkIntegerTerm(arity); t[1] = Yap_MkApplTerm(FunctorSlash, 2, t); @@ -6493,7 +6493,7 @@ p_nth_instance( USES_REGS1 ) } Count = IntegerOfTerm(TCount); if (Count <= 0) { - if (Count) + if (Count) Yap_Error(DOMAIN_ERROR_NOT_LESS_THAN_ZERO, TCount, "nth_clause/3"); else Yap_Error(DOMAIN_ERROR_NOT_ZERO, TCount, "nth_clause/3"); @@ -6501,7 +6501,7 @@ p_nth_instance( USES_REGS1 ) } pe = get_pred(Deref(ARG1), Deref(ARG2), "nth_clause/3"); if (pe) { - PELOCK(47,pe); + PELOCK(47,pe); } if (Deref(ARG2) == IDB_MODULE) { return Yap_db_nth_recorded( pe, Count PASS_REGS ); @@ -6518,7 +6518,7 @@ p_nth_instance( USES_REGS1 ) } CurSlot = Yap_StartSlots( ); /* I have pe and n */ - sl4 = Yap_InitSlot( ARG4 PASS_REGS ); + sl4 = Yap_InitSlot( ARG4 ); /* in case we have to index or to expand code */ for (i = 1; i <= pe->ArityOfPE; i++) { XREGS[i] = MkVarTerm(); @@ -6527,15 +6527,15 @@ p_nth_instance( USES_REGS1 ) IPred(pe, 0, CP); } cl0 = Yap_NthClause(pe, Count); - ARG4 = Yap_GetFromSlot( sl4 PASS_REGS ); - LOCAL_CurSlot = CurSlot; + ARG4 = Yap_GetFromSlot( sl4 ); + LOCAL_CurSlot = CurSlot; if (cl0 == NULL) { UNLOCK(pe->PELock); return FALSE; } if (pe->PredFlags & LogUpdatePredFlag) { LogUpdClause *cl = cl0; - + #if MULTIPLE_STACKS TRAIL_CLREF(cl); /* So that fail will erase it */ INC_CLREF_COUNT(cl); @@ -6594,7 +6594,7 @@ p_nth_instance( USES_REGS1 ) } } else if (IsApplTerm(t4)) { Functor f = FunctorOfTerm(t4); - + if (f == FunctorStaticClause) { StaticClause *cl = Yap_ClauseFromTerm(t4), *cl0; pe = (PredEntry *)IntegerOfTerm(ArgOfTerm(2, t4)); @@ -6670,12 +6670,12 @@ p_nth_instance( USES_REGS1 ) } else { if (!Yap_unify(ARG2,pred_module)) return FALSE; - } - return TRUE; + } + return TRUE; } -void +void Yap_InitCdMgr(void) { CACHE_REGS @@ -6761,4 +6761,3 @@ Yap_InitCdMgr(void) Yap_InitCPred("$predicate_live_cps", 4, p_predicate_lu_cps, 0L); #endif } - diff --git a/C/fli_absmi_insts.h b/C/fli_absmi_insts.h index 948066a8a..5f3ffc458 100644 --- a/C/fli_absmi_insts.h +++ b/C/fli_absmi_insts.h @@ -14,13 +14,13 @@ char *s; Atom name; if (PREG->y_u.Osbpp.p->ArityOfPE) { Functor f = PREG->y_u.Osbpp.p->FunctorOfPred; - name = f->NameOfFE; + name = f->NameOfFE; } else { name = (Atom)(PREG->y_u.Osbpp.p->FunctorOfPred); } s = name->StrOfAE; - - __android_log_print(ANDROID_LOG_INFO, "YAP", " %s ", s); + + LOG( " %s ", s); #endif check_trail(TR); if (!(PREG->y_u.Osbpp.p->PredFlags & (SafePredFlag|NoTracePredFlag|HiddenPredFlag))) { diff --git a/C/iopreds.c b/C/iopreds.c index aa4d27be5..e75eca86f 100644 --- a/C/iopreds.c +++ b/C/iopreds.c @@ -574,7 +574,7 @@ Yap_read_term(term_t t0, IOSTREAM *inp_stream, struct read_data_t *rd) Yap_clean_tokenizer(tokstart, LOCAL_VarTable, LOCAL_AnonVarTable, LOCAL_Comments); rd->varnames = 0; rd->singles = 0; - return Yap_unify_constant( Yap_GetFromSlot( t0 PASS_REGS), MkAtomTerm (AtomEof)); + return Yap_unify_constant( Yap_GetFromSlot( t0), MkAtomTerm (AtomEof)); } } repeat_cycle: @@ -620,7 +620,7 @@ Yap_read_term(term_t t0, IOSTREAM *inp_stream, struct read_data_t *rd) Yap_clean_tokenizer(tokstart, LOCAL_VarTable, LOCAL_AnonVarTable, LOCAL_Comments); rd->has_exception = TRUE; - rd->exception = Yap_InitSlot(terror PASS_REGS); + rd->exception = Yap_InitSlot(terror); CurrentModule = OCurrentModule; return FALSE; } @@ -630,9 +630,9 @@ Yap_read_term(term_t t0, IOSTREAM *inp_stream, struct read_data_t *rd) break; } } - if (!Yap_unify(t, Yap_GetFromSlot( t0 PASS_REGS))) + if (!Yap_unify(t, Yap_GetFromSlot( t0))) return FALSE; - if (store_comments && !Yap_unify(LOCAL_Comments, Yap_GetFromSlot( rd->comments PASS_REGS))) + if (store_comments && !Yap_unify(LOCAL_Comments, Yap_GetFromSlot( rd->comments ))) return FALSE; if (rd->varnames) { Term v; @@ -656,7 +656,7 @@ Yap_read_term(term_t t0, IOSTREAM *inp_stream, struct read_data_t *rd) } } LOCAL_VarNames = v; - if (!Yap_unify(v, Yap_GetFromSlot( rd->varnames PASS_REGS ))) { + if (!Yap_unify(v, Yap_GetFromSlot( rd->varnames ))) { CurrentModule = OCurrentModule; return FALSE; } @@ -683,7 +683,7 @@ Yap_read_term(term_t t0, IOSTREAM *inp_stream, struct read_data_t *rd) TR = old_TR; } } - if (!Yap_unify(v, Yap_GetFromSlot( rd->variables PASS_REGS ) )) { + if (!Yap_unify(v, Yap_GetFromSlot( rd->variables ) )) { CurrentModule = OCurrentModule; return FALSE; } @@ -711,11 +711,11 @@ Yap_read_term(term_t t0, IOSTREAM *inp_stream, struct read_data_t *rd) } if (rd->singles == 1) { if (IsPairTerm(v)) - rd->singles = Yap_InitSlot( v PASS_REGS); + rd->singles = Yap_InitSlot( v ); else rd->singles = FALSE; } else if (rd->singles) { - if (!Yap_unify( v, Yap_GetFromSlot( rd->singles PASS_REGS ))) { + if (!Yap_unify( v, Yap_GetFromSlot( rd->singles ))) { CurrentModule = OCurrentModule; return FALSE; } diff --git a/C/parser.c b/C/parser.c index fcfb87be7..82ccefab5 100755 --- a/C/parser.c +++ b/C/parser.c @@ -848,7 +848,7 @@ case Var_tok: tn = Yap_MkNewApplTerm(SWIFunctorToFunctor(FUNCTOR_quasi_quotation4), 4); tnp = RepAppl(tn) + 1; tnp[0] = MkAtomTerm(at); - if (!get_quasi_quotation(Yap_InitSlot(ArgOfTerm(2, tn) PASS_REGS), + if (!get_quasi_quotation(Yap_InitSlot(ArgOfTerm(2, tn)), &qq->text, qq->text + strlen((const char *)qq->text), rd)) FAIL; @@ -857,7 +857,7 @@ case Var_tok: intptr_t qqend = qq->end.charno; // set_range_position(positions, -1, qqend PASS_LD); - if (!PL_unify_term(Yap_InitSlot(ArgOfTerm(2, t) PASS_REGS), PL_FUNCTOR, + if (!PL_unify_term(Yap_InitSlot(ArgOfTerm(2, t) ), PL_FUNCTOR, FUNCTOR_minus2, PL_INTPTR, qq->mid.charno + 2, /* end of | token */ PL_INTPTR, qqend - 2)) /* end minus "|}" */ @@ -865,12 +865,12 @@ case Var_tok: } tnp[2] = - Yap_GetFromSlot(rd->varnames PASS_REGS); /* Arg 3: the var dictionary */ + Yap_GetFromSlot(rd->varnames); /* Arg 3: the var dictionary */ /* Arg 4: the result */ t = ArgOfTerm(4, tn); if (!(to = PL_new_term_ref()) || !PL_unify_list(rd->qq_tail, to, rd->qq_tail) || - !PL_unify(to, Yap_InitSlot(tn PASS_REGS))) + !PL_unify(to, Yap_InitSlot(tn ))) FAIL; } NextToken; diff --git a/C/pl-yap.c b/C/pl-yap.c index 40aff9d92..91ce833f9 100755 --- a/C/pl-yap.c +++ b/C/pl-yap.c @@ -72,7 +72,7 @@ codeToAtom(int chrcode) if ( !(pv=GD->atoms.for_code[page]) ) { pv = PL_malloc(256*sizeof(atom_t)); - + memset(pv, 0, 256*sizeof(atom_t)); GD->atoms.for_code[page] = pv; } @@ -83,7 +83,7 @@ codeToAtom(int chrcode) } else { a = uncachedCodeToAtom(chrcode); } - + return a; } @@ -142,9 +142,9 @@ callProlog(module_t module, term_t goal, int flags, term_t *ex ) fail; } - + proc = PL_pred(fd, module); - + { int arity = arityFunctor(fd); term_t args = PL_new_term_refs(arity); qid_t qid; @@ -196,7 +196,7 @@ PL_qualify(term_t raw, term_t qualified) if ( !(mname = PL_new_term_ref()) || !PL_strip_module(raw, &m, qualified) ) return FALSE; - + /* modules are terms in YAP */ Yap_PutInSlot(mname, (Term)m PASS_REGS); @@ -208,7 +208,7 @@ int valueExpression(term_t t, Number r ARG_LD) { REGS_FROM_LD - YAP_Term t0 = Yap_Eval(Yap_GetFromSlot(t PASS_REGS) PASS_REGS); + YAP_Term t0 = Yap_Eval(Yap_GetFromSlot(t ) PASS_REGS); if (YAP_IsIntTerm(t0)) { r->type = V_INTEGER; r->value.i = YAP_IntOfTerm(t0); @@ -263,7 +263,7 @@ double_in_int64_range(double x) int toIntegerNumber(Number n, int flags) -{ +{ switch(n->type) { case V_INTEGER: succeed; @@ -283,12 +283,12 @@ switch(n->type) if ( (flags & TOINT_CONVERT_FLOAT) ) { if ( double_in_int64_range(n->value.f) ) { int64_t l = (int64_t)n->value.f; - + if ( (flags & TOINT_TRUNCATE) || (double)l == n->value.f ) { n->value.i = l; n->type = V_INTEGER; - + return TRUE; } return FALSE; @@ -296,7 +296,7 @@ switch(n->type) } else { mpz_init_set_d(n->value.mpz, n->value.f); n->type = V_MPZ; - + return TRUE; #endif } @@ -305,7 +305,7 @@ switch(n->type) } assert(0); fail; -} +} int @@ -313,15 +313,15 @@ _PL_unify_atomic(term_t t, PL_atomic_t a) { GET_LD if (IsApplTerm(a) || IsAtomTerm(a)) - return Yap_unify(Yap_GetFromSlot(t PASS_REGS), a); + return Yap_unify(Yap_GetFromSlot(t ), a); return PL_unify_atom(t, a); } int _PL_unify_string(term_t t, word w) { - CACHE_REGS - return Yap_unify(Yap_GetFromSlot(t PASS_REGS), w); + CACHE_REGS + return Yap_unify(Yap_GetFromSlot(t ), w); } Atom lookupAtom(const char *s, size_t len) @@ -395,7 +395,7 @@ typedef union int get_atom_ptr_text(Atom a, PL_chars_t *text) -{ +{ if (IsWideAtom(a)) { pl_wchar_t *name = (pl_wchar_t *)a->WStrOfAE; text->text.w = name; @@ -467,7 +467,7 @@ patch used localeconv() to find the decimal point, but this is both complicated and not thread-safe. Finally, with help of Richard we decided to replace the first character -that is not a digit nor [eE], as this must be the decimal point. +that is not a digit nor [eE], as this must be the decimal point. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #define isDigit(c) ((c) >= '0' && (c) <= '9') @@ -582,7 +582,7 @@ int priorityOperator(Module m, atom_t atom) { YAP_Term mod = (YAP_Term)m; - if (!m) + if (!m) mod = YAP_CurrentModule(); return YAP_MaxOpPriority(YAP_AtomFromSWIAtom(atom), mod); } @@ -593,7 +593,7 @@ currentOperator(Module m, atom_t name, int kind, int *type, int *priority) YAP_Term mod = (YAP_Term)m; int opkind, yap_type; - if (!m) + if (!m) mod = YAP_CurrentModule(); switch (kind) { case OP_PREFIX: @@ -630,7 +630,7 @@ currentOperator(Module m, atom_t name, int kind, int *type, int *priority) break; case 7: *type = OP_FX; - break; + break; default: *type = OP_FY; break; @@ -861,9 +861,9 @@ Yap_TermToString(Term t, char *s, size_t sz, size_t *length, int *encoding, int Int l; Int myASP = LCL0-ASP; yhandle_t CurSlot = Yap_StartSlots(); - + Yap_StartSlots( ); - l = Yap_InitSlot(t PASS_REGS ); + l = Yap_InitSlot(t ); { IOENC encodings[3]; IOENC *enc; @@ -874,7 +874,7 @@ Yap_TermToString(Term t, char *s, size_t sz, size_t *length, int *encoding, int encodings[2] = ENC_UNKNOWN; for(enc = encodings; *enc != ENC_UNKNOWN; enc++) - { + { int64_t size; IOSTREAM *fd; @@ -891,10 +891,10 @@ Yap_TermToString(Term t, char *s, size_t sz, size_t *length, int *encoding, int { *encoding = *enc; size = Stell64(fd); if ( *enc == ENC_ISO_LATIN_1 ) - { + { *length = size-1; } else - { + { *length = (size/sizeof(pl_wchar_t))-1; } /* found, just check if using local space */ @@ -935,23 +935,16 @@ Yap_HandleToString(term_t l, size_t sz, size_t *length, int *encoding, int flags size_t size = 4096, total = size; IOSTREAM *fd; - total = size; + total = size+1; buf = malloc(total); -#ifdef DEBUG - {CACHE_REGS - __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__, "text %p \n", buf);} -#endif + buf[0]='\0'; while ( (fd = Sopenmem(&buf, &size, "w")) == NULL || (( fd->encoding = ENC_UTF8) && FALSE) || (PL_write_term(fd, l, 1200, flags) == 0) || Sputcode(EOS, fd) < 0 || Sflush(fd) < 0 ) /* failure */ { -#ifdef DEBUG - {CACHE_REGS - __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__, "fd %p, %x buf=%s\n", fd, LOCAL_SlotBase[28], buf);} -#endif - Sclose(fd); + Sclose(fd); if (!fd) return NULL; total += size; @@ -960,11 +953,7 @@ Yap_HandleToString(term_t l, size_t sz, size_t *length, int *encoding, int flags return NULL; Sclose(fd); } -#ifdef DEBUG - {CACHE_REGS - __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__, "text done %s", buf);} -#endif - Sclose(fd); + Sclose(fd); /* success */ return buf; } @@ -988,9 +977,9 @@ char * PL_prompt_string(int fd) { if ( fd == 0 ) { atom_t a = PrologPrompt(); /* TBD: deal with UTF-8 */ - + if ( a ) - { + { Atom at = YAP_AtomFromSWIAtom(a); if (!IsWideAtom(at) && !IsBlob(at)) { return RepAtom(at)->StrOfAE; @@ -1082,7 +1071,7 @@ PL_dispatch(int fd, int wait) X_API int _PL_get_arg__LD(int index, term_t ts, term_t a ARG_LD) { REGS_FROM_LD - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); if ( !YAP_IsApplTerm(t) ) { if (YAP_IsPairTerm(t)) { if (index == 1){ @@ -1098,13 +1087,13 @@ X_API int _PL_get_arg__LD(int index, term_t ts, term_t a ARG_LD) Yap_PutInSlot(a,ArgOfTerm(index, t) PASS_REGS); return 1; } - + /* SWI: int PL_get_atom(term_t t, YAP_Atom *a) YAP: YAP_Atom YAP_AtomOfTerm(Term) */ int PL_get_atom__LD(term_t ts, atom_t *a ARG_LD) { REGS_FROM_LD - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); if ( !IsAtomTerm(t)) return 0; *a = YAP_SWIAtomFromAtom(AtomOfTerm(t)); @@ -1121,61 +1110,61 @@ X_API int PL_put_atom__LD(term_t t, atom_t a ARG_LD) int PL_put_term__LD(term_t d, term_t s ARG_LD) { REGS_FROM_LD - Yap_PutInSlot(d,Yap_GetFromSlot(s PASS_REGS) PASS_REGS); + Yap_PutInSlot(d,Yap_GetFromSlot(s) PASS_REGS); return 1; } term_t PL_new_term_ref__LD(ARG1_LD) { REGS_FROM_LD - term_t to = Yap_NewSlots(1 PASS_REGS); + term_t to = Yap_NewSlots(1); return to; } int PL_is_atom__LD(term_t ts ARG_LD) { REGS_FROM_LD - Term t = Yap_GetFromSlot(ts PASS_REGS); + Term t = Yap_GetFromSlot(ts); return !IsVarTerm(t) && IsAtomTerm(t); } int PL_is_variable__LD(term_t ts ARG_LD) { REGS_FROM_LD - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); return IsVarTerm(t); } X_API int PL_unify__LD(term_t t1, term_t t2 ARG_LD) { REGS_FROM_LD - return Yap_unify(Yap_GetFromSlot(t1 PASS_REGS),Yap_GetFromSlot(t2 PASS_REGS)); + return Yap_unify(Yap_GetFromSlot(t1),Yap_GetFromSlot(t2)); } int PL_unify_atom__LD(term_t t, atom_t at ARG_LD) { REGS_FROM_LD YAP_Term cterm = MkAtomTerm(YAP_AtomFromSWIAtom(at)); - return YAP_Unify(Yap_GetFromSlot(t PASS_REGS),cterm); + return YAP_Unify(Yap_GetFromSlot(t),cterm); } /* SWI: int PL_unify_integer(term_t ?t, long n) YAP long int unify(YAP_Term* a, Term* b) */ int PL_unify_integer__LD(term_t t, intptr_t i ARG_LD) -{ +{ REGS_FROM_LD Term iterm = MkIntegerTerm(i); - return Yap_unify(Yap_GetFromSlot(t PASS_REGS),iterm); + return Yap_unify(Yap_GetFromSlot(t),iterm); } /* SWI: int PL_unify_integer(term_t ?t, long n) YAP long int unify(YAP_Term* a, Term* b) */ X_API int PL_unify_int64__LD(term_t t, int64_t n ARG_LD) -{ +{ REGS_FROM_LD #if SIZEOF_INT_P==8 Term iterm = MkIntegerTerm(n); - return Yap_unify(Yap_GetFromSlot(t PASS_REGS),iterm); + return Yap_unify(Yap_GetFromSlot(t),iterm); #elif USE_GMP YAP_Term iterm; char s[64]; @@ -1190,7 +1179,7 @@ X_API int PL_unify_int64__LD(term_t t, int64_t n ARG_LD) #endif mpz_init_set_str (&rop, s, 10); iterm = YAP_MkBigNumTerm((void *)&rop); - return YAP_Unify(Yap_GetFromSlot(t PASS_REGS),iterm); + return YAP_Unify(Yap_GetFromSlot(t),iterm); #else if ((long)n == n) return PL_unify_integer(t, n); @@ -1238,12 +1227,12 @@ PL_w32thread_raise(DWORD id, int sig) if ( sig < 0 || sig > MAXSIGNAL ) return FALSE; /* illegal signal */ - PL_LOCK(L_PLFLAG); + PL_LOCK(L_PLFLAG); for(i = 0; i <= thread_highest_id; i++) { PL_thread_info_t *info = GD->thread.threads[i]; - + if ( info && info->w32id == id && info->thread_data ) - { + { Sfprintf(GLOBAL_stderr, "post %d %d\n\n\n",i, sig); Yap_external_signal(i, sig); //raiseSignal(info->thread_data, sig); if ( info->w32id ) @@ -1254,7 +1243,7 @@ PL_w32thread_raise(DWORD id, int sig) } } PL_UNLOCK(L_PLFLAG); - + return FALSE; /* can't find thread */ } diff --git a/C/qlyr.c b/C/qlyr.c index 9035ffa42..80f551933 100755 --- a/C/qlyr.c +++ b/C/qlyr.c @@ -77,14 +77,15 @@ Yap_AlwaysAllocCodeSpace(UInt size) static void QLYR_ERROR(qlfr_err_t my_err) { - Yap_Error(SAVED_STATE_ERROR,TermNil,"error %s in saved state %s",GLOBAL_RestoreFile, qlyr_error[my_err]); + // __android_log_print(ANDROID_LOG_INFO, "YAP ", "error %s in saved state %s",GLOBAL_RestoreFile, qlyr_error[my_err]); + Yap_Error(SAVED_STATE_ERROR,TermNil,"error %s in saved state %s",GLOBAL_RestoreFile, qlyr_error[my_err]); Yap_exit(1); } static Atom LookupAtom(Atom oat) { - CACHE_REGS + CACHE_REGS CELL hash = (CELL)(oat) % LOCAL_ImportAtomHashTableSize; import_atom_hash_entry_t *a; @@ -95,6 +96,7 @@ LookupAtom(Atom oat) } a = a->next; } + // __android_log_print(ANDROID_LOG_INFO, "YAP ", "error %p in saved state ", oat); QLYR_ERROR(UNKNOWN_ATOM); return NIL; } @@ -459,12 +461,12 @@ TermToGlobalOrAtomAdjust(Term t) #define CharP(X) ((char *)(X)) -#define REINIT_LOCK(P) -#define REINIT_RWLOCK(P) +#define REINIT_LOCK(P) +#define REINIT_RWLOCK(P) #define BlobTypeAdjust(P) (P) #define NoAGCAtomAdjust(P) (P) -#define OrArgAdjust(P) -#define TabEntryAdjust(P) +#define OrArgAdjust(P) +#define TabEntryAdjust(P) #define IntegerAdjust(D) (D) #define AddrAdjust(P) (P) #define MFileAdjust(P) (P) @@ -480,8 +482,8 @@ CodeVarAdjust__ (Term var USES_REGS) #define ConstantAdjust(P) (P) #define ArityAdjust(P) (P) -#define DoubleInCodeAdjust(P) -#define IntegerInCodeAdjust(Pxb) +#define DoubleInCodeAdjust(P) +#define IntegerInCodeAdjust(Pxb) static inline PredEntry * PtoPredAdjust(PredEntry *p) @@ -706,7 +708,7 @@ checkChars(IOSTREAM *stream, char s[]) { int ch, c; char *p = s; - + while ((ch = *p++)) { if ((c = read_byte(stream)) != ch ) { return false; @@ -773,7 +775,7 @@ ReadHash(IOSTREAM *stream) Atom oat = (Atom)read_UInt(stream); Atom at; qlf_tag_t tg = read_tag(stream); - + if (tg == QLY_ATOM_WIDE) { wchar_t *rep = (wchar_t *)AllocTempSpace(); UInt len; @@ -833,7 +835,7 @@ ReadHash(IOSTREAM *stream) UInt arity = read_UInt(stream); Atom omod = (Atom)read_UInt(stream); Term mod; - + if (omod) { mod = MkAtomTerm(AtomAdjust(omod)); if (mod == TermProlog) mod = 0; @@ -889,7 +891,7 @@ ReadHash(IOSTREAM *stream) UInt nrefs = read_UInt(stream); LogUpdClause *ncl = (LogUpdClause *)Yap_AlwaysAllocCodeSpace(sz); if (!ncl) { - QLYR_ERROR(OUT_OF_CODE_SPACE); + QLYR_ERROR(OUT_OF_CODE_SPACE); } ncl->Id = FunctorDBRef; ncl->ClRefCount = nrefs; @@ -900,9 +902,9 @@ ReadHash(IOSTREAM *stream) } static void -read_clauses(IOSTREAM *stream, PredEntry *pp, UInt nclauses, UInt flags) { +read_clauses(IOSTREAM *stream, PredEntry *pp, UInt nclauses, pred_flags_t flags) { CACHE_REGS - if (pp->PredFlags & LogUpdatePredFlag) { + if (flags & LogUpdatePredFlag) { /* first, clean up whatever was there */ if (pp->cs.p_code.NOfClauses) { LogUpdClause *cl; @@ -934,7 +936,7 @@ read_clauses(IOSTREAM *stream, PredEntry *pp, UInt nclauses, UInt flags) { RestoreLUClause(cl, pp PASS_REGS); Yap_AssertzClause(pp, cl->ClCode); } - } else if (pp->PredFlags & MegaClausePredFlag) { + } else if (flags & MegaClausePredFlag) { CACHE_REGS char *base = (void *)read_UInt(stream); UInt mask = read_UInt(stream); @@ -952,26 +954,26 @@ read_clauses(IOSTREAM *stream, PredEntry *pp, UInt nclauses, UInt flags) { cl->ClCode; pp->PredFlags |= MegaClausePredFlag; /* enter index mode */ - if (mask & ExoMask) { - struct index_t **icl = (struct index_t **)(cl->ClCode); + if (mask & ExoMask) { + struct index_t **icl = (struct index_t **)(cl->ClCode); pp->OpcodeOfPred = Yap_opcode(_enter_exo); icl[0] = NULL; icl[1] = NULL; } else { pp->OpcodeOfPred = INDEX_OPCODE; } - pp->CodeOfPred = pp->cs.p_code.TrueCodeOfPred = (yamop *)(&(pp->OpcodeOfPred)); + pp->CodeOfPred = pp->cs.p_code.TrueCodeOfPred = (yamop *)(&(pp->OpcodeOfPred)); /* This must be set for restoremegaclause */ pp->cs.p_code.NOfClauses = nclauses; RestoreMegaClause(cl PASS_REGS); - } else if (pp->PredFlags & DynamicPredFlag) { + } else if (flags & DynamicPredFlag) { UInt i; for (i = 0; i < nclauses; i++) { char *base = (void *)read_UInt(stream); UInt size = read_UInt(stream); DynamicClause *cl = (DynamicClause *)Yap_AlwaysAllocCodeSpace(size); - + LOCAL_HDiff = (char *)cl-base; read_bytes(stream, cl, size); INIT_LOCK(cl->ClLock); @@ -983,9 +985,9 @@ read_clauses(IOSTREAM *stream, PredEntry *pp, UInt nclauses, UInt flags) { UInt i; - if (pp->PredFlags & SYSTEM_PRED_FLAGS) { + if (flags & SYSTEM_PRED_FLAGS) { if (nclauses) { - QLYR_ERROR(INCONSISTENT_CPRED); + QLYR_ERROR(INCONSISTENT_CPRED); } return; } @@ -1005,8 +1007,8 @@ read_clauses(IOSTREAM *stream, PredEntry *pp, UInt nclauses, UInt flags) { static void read_pred(IOSTREAM *stream, Term mod) { - UInt flags; - UInt nclauses, fl1; + pred_flags_t flags, fl1; + UInt nclauses; PredEntry *ap; ap = LookupPredEntry((PredEntry *)read_UInt(stream)); @@ -1015,17 +1017,24 @@ read_pred(IOSTREAM *stream, Term mod) { if (ap->PredFlags & IndexedPredFlag) { Yap_RemoveIndexation(ap); } - /* if (ap->ArityOfPE && ap->ModuleOfPred != IDB_MODULE) */ +#if 0 + if (ap->ArityOfPE && ap->ModuleOfPred != IDB_MODULE) + __android_log_print(ANDROID_LOG_INFO, "YAP ", " %s/%ld %lx\n", NameOfFunctor(ap->FunctorOfPred)->StrOfAE, ap->ArityOfPE, flags); /* printf(" %s/%ld %lx\n", NameOfFunctor(ap->FunctorOfPred)->StrOfAE, ap->ArityOfPE, flags); */ - /* else if (ap->ModuleOfPred != IDB_MODULE) */ + else if (ap->ModuleOfPred != IDB_MODULE) + __android_log_print(ANDROID_LOG_INFO, "YAP "," %s/%ld %lx\n", ((Atom)(ap->FunctorOfPred))->StrOfAE, ap->ArityOfPE, flags); /* printf(" %s/%ld %lx\n", ((Atom)(ap->FunctorOfPred))->StrOfAE, ap->ArityOfPE, flags); */ - fl1 = flags & ((UInt)STATIC_PRED_FLAGS|(UInt)EXTRA_PRED_FLAGS); + else + __android_log_print(ANDROID_LOG_INFO, "YAP "," number\n"); +#endif + fl1 = flags & ((pred_flags_t)STATIC_PRED_FLAGS|(UInt)EXTRA_PRED_FLAGS); ap->PredFlags &= ~((UInt)STATIC_PRED_FLAGS|(UInt)EXTRA_PRED_FLAGS); ap->PredFlags |= fl1; if (flags & NumberDBPredFlag) { ap->src.IndxId = read_UInt(stream); } else { ap->src.OwnerFile = (Atom)read_UInt(stream); + if (ap->src.OwnerFile) { ap->src.OwnerFile = AtomAdjust(ap->src.OwnerFile); } @@ -1035,8 +1044,10 @@ read_pred(IOSTREAM *stream, Term mod) { if (flags & MultiFileFlag && ap->ModuleOfPred == PROLOG_MODULE) { ap->ModuleOfPred = TermProlog; } - read_clauses(stream, ap, nclauses, flags); - if (flags & HiddenPredFlag) { + if (nclauses) + read_clauses(stream, ap, nclauses, flags); + + if (flags & HiddenPredFlag) { Yap_HidePred(ap); } } @@ -1134,11 +1145,11 @@ p_read_program( USES_REGS1 ) return TRUE; } -int +int Yap_Restore(char *s, char *lib_dir) { IOSTREAM *stream = Yap_OpenRestore(s, lib_dir); - if (!stream) + if (!stream) return -1; GLOBAL_RestoreFile = s; if (get_header( stream ) == NIL) @@ -1146,6 +1157,7 @@ Yap_Restore(char *s, char *lib_dir) read_module(stream); Sclose( stream ); GLOBAL_RestoreFile = NULL; + CurrentModule = USER_MODULE; return DO_ONLY_CODE; } @@ -1160,4 +1172,3 @@ void Yap_InitQLYR(void) restore_codes(); } } - diff --git a/C/save.c b/C/save.c index d3c194220..b5eb8a11c 100755 --- a/C/save.c +++ b/C/save.c @@ -249,19 +249,6 @@ open_file(char *my_file, int flag) char flags[6]; int i=0; -#if __ANDROID__ - if (strstr(my_file, "/assets/") == my_file) { - if (flag == O_RDONLY) { - my_file += strlen("/assets/"); - AAsset* asset = AAssetManager_open(GLOBAL_assetManager, my_file, AASSET_MODE_UNKNOWN); - if (!asset) - return NULL; - AAsset_close( asset ); - return NULL; // usually the file will be compressed, so there is no point in actually trying to open it. - } - return NULL; - } -#endif if (flag & O_RDONLY) { flags[i++] = 'r'; } diff --git a/C/stdpreds.c b/C/stdpreds.c old mode 100644 new mode 100755 index 200e8f0f0..bc45c095a --- a/C/stdpreds.c +++ b/C/stdpreds.c @@ -877,61 +877,69 @@ static Int return TRUE; } +static PropEntry * +fetchPredFromListOfProps (PropEntry *p) +{ + while (p) { + if (p->KindOfPE == PEProp) { + // found our baby.. + return p; + } else if (p->KindOfPE == FunctorProperty) { + // go to list of properties in functor.. + PropEntry *q; + FunctorEntry *f = RepFunctorProp(p); + if ((q = fetchPredFromListOfProps( f->PropsOfFE ))) { + return q; + } + } + p = p->NextOfPE; + } + return NIL; +} + +static PropEntry * +nextPredForAtom (PropEntry *p) +{ + PredEntry *pe; + if (p == NIL) + return NIL; + pe = RepPredProp(p); + if (pe->ArityOfPE == 0) { + // if atom prop, search atom list + return fetchPredFromListOfProps(p->NextOfPE); + } else { + FunctorEntry *f = pe->FunctorOfPred; + // first search remainder of functor list + if ((p = fetchPredFromListOfProps(p->NextOfPE))) { + return p; + } + // if that fails, follow the functor + return fetchPredFromListOfProps( f->NextOfPE ); + } +} + static Int cont_current_predicate(USES_REGS1) { PredEntry *pp = NULL; + PropEntry *n; UInt Arity; Term name; Term t1 = Deref(ARG1), t2 = Deref(ARG2), t3; - bool is_det = false, rc; + bool rc; Functor f; if (IsNonVarTerm(t1)) { + // current_pred(A, M, P) PropEntry *p = AddressOfTerm(EXTRA_CBACK_ARG(4, 1)); - PropEntry *q = AddressOfTerm(EXTRA_CBACK_ARG(4, 2)); // restart inner loop - for (; q; q = q->NextOfPE) { - if (q->KindOfPE == PEProp) { - pp = RepPredProp(q); - q = q->NextOfPE; - if (q == NIL) - p = p->NextOfPE; - if (!p) - is_det = true; - // we are done with this loop. - break; - } - } - if (!pp && p) { - // try using outer loop - for (; p; p = p->NextOfPE) { - if (p->KindOfPE == PEProp) { - q = NULL; - pp = RepPredProp(p); - p = p->NextOfPE; - if (!p) - is_det = true; - break; - } else if (p->KindOfPE == FunctorProperty) { - // looping on p/n - for (q = RepFunctorProp(p)->PropsOfFE; q; q = q->NextOfPE) { - if (q->KindOfPE == PEProp) { - pp = RepPredProp(q); - q = q->NextOfPE; - if (!q && !p->NextOfPE) - is_det = true; - break; - } - } - break; - } - } - } - if (pp == NULL) // nothing more - cut_fail(); - if (!is_det) { - EXTRA_CBACK_ARG(4, 1) = MkAddressTerm(p); - EXTRA_CBACK_ARG(4, 2) = MkAddressTerm(q); + pp = RepPredProp(p); + n = nextPredForAtom (p); + if (n == NIL) { + YAP_cut_up(); + } else { + EXTRA_CBACK_ARG(4, 1) = MkAddressTerm(n); + B->cp_h = HR; + } } else if (IsNonVarTerm(t2)) { // operating within the same module. @@ -945,8 +953,8 @@ static Int cont_current_predicate(USES_REGS1) { if (npp) { EXTRA_CBACK_ARG(4, 1) = MkAddressTerm(npp); B->cp_h = HR; - } else { - is_det = true; + } else { + YAP_cut_up(); } } else { pp = AddressOfTerm(EXTRA_CBACK_ARG(4, 1)); @@ -964,10 +972,12 @@ static Int cont_current_predicate(USES_REGS1) { } // we found a new answer if (!pp) cut_fail(); - else + else { EXTRA_CBACK_ARG(4, 1) = MkAddressTerm(pp->NextPredOfModule); - B->cp_h = HR; + B->cp_h = HR; + } } + if (pp->ModuleOfPred != IDB_MODULE) { f = pp->FunctorOfPred; Arity = pp->ArityOfPE; @@ -996,15 +1006,11 @@ static Int cont_current_predicate(USES_REGS1) { t3 = name; } rc = (!(pp->PredFlags & HiddenPredFlag)) && - Yap_unify(ARG2, ModToTerm(pp->ModuleOfPred)) && Yap_unify(ARG1, name) && - Yap_unify(ARG3, t3) && Yap_unify(ARG4, MkIntegerTerm(pp->PredFlags)); - if (is_det) { - if (rc) - cut_succeed(); - else - cut_fail(); - } - return rc; + Yap_unify(ARG2, ModToTerm(pp->ModuleOfPred)) && + Yap_unify(ARG1, name) && + Yap_unify(ARG3, t3) && + Yap_unify(ARG4, MkIntegerTerm(pp->PredFlags)); + return rc; } static Int init_current_predicate(USES_REGS1) { @@ -1015,6 +1021,9 @@ static Int init_current_predicate(USES_REGS1) { PredEntry *pp = NULL; ModEntry *m = NULL; + t1 = Yap_StripModule(t1, &t2); + t3 = Yap_StripModule(t3, &t2); + // check term if (!IsVarTerm(t3)) { t3 = Yap_StripModule(t3, &t2); @@ -1076,15 +1085,10 @@ static Int init_current_predicate(USES_REGS1) { Yap_Error(TYPE_ERROR_ATOM, t1, "current_predicate/2"); cut_fail(); } else { - PropEntry *p = RepAtom(AtomOfTerm(t1))->PropsOfAE, *q = NIL; - while (p && p->KindOfPE == FunctorProperty && - (q = RepFunctorProp(p)->PropsOfFE) == NIL) { - p = p->NextOfPE; - } + PropEntry *p = fetchPredFromListOfProps(RepAtom(AtomOfTerm(t1))->PropsOfAE); if (!p) cut_fail(); EXTRA_CBACK_ARG(4, 1) = MkAddressTerm(p); - EXTRA_CBACK_ARG(4, 2) = MkAddressTerm(q); B->cp_h = HR; } } @@ -1130,7 +1134,7 @@ int Yap_IsOpMaxPrio(Atom at) { CACHE_REGS OpEntry *op = NextOp(RepOpProp((Prop)(RepAtom(at)->PropsOfAE)) PASS_REGS); int max; - + if (EndOfPAEntr(op)) return 0; max = (op->Prefix & 0xfff); @@ -1162,7 +1166,7 @@ static Int cont_current_op(USES_REGS1) { READ_UNLOCK(op->OpRWLock); if (next) { EXTRA_CBACK_ARG(5, 1) = (CELL)MkIntegerTerm((CELL)next); - B->cp_h = HR; + B->cp_h = HR; return TRUE; } else { cut_succeed(); @@ -1171,7 +1175,7 @@ static Int cont_current_op(USES_REGS1) { READ_UNLOCK(op->OpRWLock); if (next) { EXTRA_CBACK_ARG(5, 1) = (CELL)MkIntegerTerm((CELL)next); - B->cp_h = HR; + B->cp_h = HR; return FALSE; } else { cut_fail(); @@ -1187,7 +1191,7 @@ static Int init_current_op(USES_REGS1) { /* current_op(-Precedence,-Type,-Atom) static Int cont_current_atom_op(USES_REGS1) { OpEntry *op = (OpEntry *)IntegerOfTerm(EXTRA_CBACK_ARG(5, 1)), *next; - + READ_LOCK(op->OpRWLock); next = NextOp(RepOpProp(op->NextOfPE) PASS_REGS); if (unify_op(op PASS_REGS)) { diff --git a/C/sysbits.c b/C/sysbits.c index a718b5b89..c1b35b432 100644 --- a/C/sysbits.c +++ b/C/sysbits.c @@ -107,13 +107,14 @@ static char SccsId[] = "%W% %G%"; #include #endif +/// File Error Handler static void Yap_FileError(yap_error_number type, Term where, const char *format,...) { GET_LD - if ( truePrologFlag(PLFLAG_FILEERRORS) ) { + if ( truePrologFlag(PLFLAG_FILEERRORS) ) { va_list ap; - + va_start (ap, format); /* now build the error string */ Yap_Error(type, TermNil, format, ap); @@ -123,6 +124,7 @@ Yap_FileError(yap_error_number type, Term where, const char *format,...) } + static void InitTime(int); static void InitWTime(void); static Int p_sh( USES_REGS1 ); @@ -141,24 +143,6 @@ static int chdir(char *); /* #define signal skel_signal */ #endif /* MACYAP */ -#if DEBUG - -void -LOG(const char *fmt, ...); - -void -LOG(const char *fmt, ...) -{ - FILE * fd; - va_list ap; - - fd = fopen("c:\\cygwin\\Log.txt", "a"); - va_start(ap, fmt); - vfprintf(fd, fmt, ap); - va_end(ap); - fclose( fd ); -} -#endif void exit(int); @@ -180,12 +164,118 @@ Yap_WinError(char *yap_error) #define is_valid_env_char(C) ( ((C) >= 'a' && (C) <= 'z') || ((C) >= 'A' && \ (C) <= 'Z') || (C) == '_' ) +#if __ANDROID__ + +AAssetManager * Yap_assetManager; + + +void * +Yap_openAssetFile( const char *path ) { + AAssetDir *d; + LOG("openA %s %p", path, path); + + const char * p = path+8; + AAsset* asset = AAssetManager_open(Yap_assetManager, p, AASSET_MODE_UNKNOWN); + return asset; +} + +bool +Yap_isAsset( const char *path ) +{ + return path[0] == '/'&& + path[1] == 'a'&& + path[2] == 's'&& + path[3] == 's'&& + path[4] == 'e'&& + path[5] == 't'&& + path[6] == 's'&& + (path[7] == '/' || path[7] == '\0'); +} + +bool +Yap_AccessAsset( const char *name, int mode ) +{ + AAssetManager* mgr = Yap_assetManager; + const char *bufp=name+7; + if (bufp[0] == '/') + bufp++; + if ((mode & W_OK) == W_OK) { + return false; + } + // check if file is a directory. + AAssetDir *assetDir = AAssetManager_openDir(mgr, bufp); + if (assetDir) { + AAssetDir_close(assetDir); + return true; + } + return false; +} + +bool +Yap_AssetIsFile( const char *name ) +{ + AAssetManager* mgr = Yap_assetManager; + const char *bufp=name+7; + if (bufp[0] == '/') + bufp++; + // check if file is a directory. + AAsset *asset = AAssetManager_open(mgr, bufp, AASSET_MODE_UNKNOWN); + if (!asset) + return false; + AAsset_close(asset); + return true; +} + +bool +Yap_AssetIsDir( const char *name ) +{ + AAssetManager* mgr = Yap_assetManager; + const char *bufp=name+7; + if (bufp[0] == '/') + bufp++; + // check if file is a directory. + AAssetDir *assetDir = AAssetManager_openDir(mgr, bufp); + if (!assetDir) { + return false; + } + AAssetDir_close(assetDir); + AAsset *asset = AAssetManager_open(mgr, bufp, AASSET_MODE_UNKNOWN); + if (!asset) + return true; + AAsset_close(asset); + return false; +} + +int64_t +Yap_AssetSize( const char *name ) +{ + AAssetManager* mgr = Yap_assetManager; + const char *bufp=name+7; + if (bufp[0] == '/') + bufp++; + AAsset *asset = AAssetManager_open(mgr, bufp, AASSET_MODE_UNKNOWN); + if (!asset) + return -1; + off64_t len = AAsset_getLength64(asset); + AAsset_close(asset); + return len; +} +#endif + + /// is_directory: verifies whether an expanded file name /// points at a readable directory static bool is_directory(const char *FileName) { +#ifdef __ANDROID__ + if (Yap_isAsset(FileName)) { + return Yap_AssetIsDir(FileName); + } + +#endif + #ifdef __WINDOWS__ DWORD dwAtts = GetFileAttributes( FileName ); if (dwAtts == INVALID_FILE_ATTRIBUTES) @@ -200,8 +290,8 @@ is_directory(const char *FileName) } return S_ISDIR(buf.st_mode); #else - Yap_Error(SYSTEM_ERROR, TermNil, - "stat not available in this configuration"); + Yap_Error(SYSTEM_ERROR, TermNil, + "stat not available in this configuration"); return false; #endif } @@ -211,17 +301,22 @@ is_directory(const char *FileName) static bool has_access(const char *FileName, int mode) { -#if HAS_ACCESS +#ifdef __ANDROID__ + if (Yap_isAsset(FileName)) { + return Yap_AccessAsset(FileName, mode); + } +#endif +#if HAVE_ACCESS if (access( FileName, mode ) == 0) return true; if (errno == EINVAL) { - Yap_Error(SYSTEM_ERROR, TermNil, + Yap_Error(SYSTEM_ERROR, TermNil, "bad flags to access"); } return false; #else - Yap_Error(SYSTEM_ERROR, TermNil, - "access not available in this configuration"); + Yap_Error(SYSTEM_ERROR, TermNil, + "access not available in this configuration"); return false; #endif } @@ -269,25 +364,125 @@ IsAbsolutePath(const char *p) #endif } +#define isValidEnvChar(C) ( ((C) >= 'a' && (C) <= 'z') || ((C) >= 'A' && \ + (C) <= 'Z') || (C) == '_' ) + +// this is necessary because +// support for ~expansion at the beginning +// systems like Android do not do this. +static char * +yapExpandVars (const char *source, char *result) +{ + const char *src = source; + char *res = result; + + + if (strlen(source) >= YAP_FILENAME_MAX) { + Yap_Error(OPERATING_SYSTEM_ERROR, TermNil, "%s in true_file-name is larger than the buffer size (%d bytes)", source, strlen(source)); + } + /* step 1: eating home information */ + if (source[0] == '~') { + if (dir_separator(source[1]) || source[1] == '\0') + { + char *s; + src++; +#if defined(_WIN32) + s = getenv("HOMEDRIVE"); + if (s != NULL) + strncpy (result, getenv ("HOMEDRIVE"), YAP_FILENAME_MAX); + s = getenv("HOMEPATH"); + if (s != NULL) + strncpy (result, s, YAP_FILENAME_MAX); +#else + s = getenv ("HOME"); + if (s != NULL) + strncpy (result, s, YAP_FILENAME_MAX); +#endif + } else { +#if HAVE_GETPWNAM + struct passwd *user_passwd; + + src++; + while (!dir_separator((*res = *src)) && *res != '\0') + res++, src++; + res[0] = '\0'; + if ((user_passwd = getpwnam (result)) == NULL) { + Yap_FileError(OPERATING_SYSTEM_ERROR, MkAtomTerm(Yap_LookupAtom(source)),"User %s does not exist in %s", result, source); + return NULL; + } + strncpy (result, user_passwd->pw_dir, YAP_FILENAME_MAX); +#else + Yap_FileError(OPERATING_SYSTEM_ERROR, MkAtomTerm(Yap_LookupAtom(source)),"User %s cannot be found in %s, missing getpwnam", result, source); + return NULL; +#endif + } + strncat (result, src, YAP_FILENAME_MAX); + return result; + } +#if !HAVE_WORDEXP + // do VARIABLE expansion + else if (source[0] == '$') { + /* follow SICStus expansion rules */ + int ch; + char *s; + src = source+1; + if (src[0] == '{') { + src++; + while ((*res++ = (ch = *src++)) && isValidEnvChar (ch) && ch != '}') { + res++; + } + if (ch == '}') { + // {...} + // done + } + } else { + while ((*res++ = (ch = *src++)) && isValidEnvChar (ch) && ch != '}') { + res++; + } + src--; + } + res[0] = '\0'; + if ((s = (char *) getenv (result))) { + strncpy (result, s, YAP_FILENAME_MAX); + } else { + result[0] = '\0'; + } + strncat (result, src, YAP_FILENAME_MAX); + } +#endif + else { + strncpy (result, source, YAP_FILENAME_MAX); + } + return result; +} + char * expandVars(const char *pattern, char *expanded, int maxlen) { + + char tmp[YAP_FILENAME_MAX+1]; + if ((pattern = yapExpandVars(pattern, tmp)) == NULL) { + return NULL; + } #if __WIN32 || __MINGW32__ DWORD retval=0; // notice that the file does not need to exist1 + if (ini == NULL) { + ini = malloc(strlen(w)+1); + } retval = ExpandEnvironmentStrings(pattern, expanded, maxlen); - - if (retval == 0) + + if (retval == 0) { Yap_WinError("Generating a full path name for a file" ); return NULL; } - return expanded; -#elif HAVE_WORDEXP -wordexp_t result; - + return expanded; +#elif HAVE_WORDEXP + wordexp_t result; + /* Expand the string for the program to run. */ switch (wordexp (pattern, &result, 0)) { @@ -297,6 +492,9 @@ wordexp_t result; return NULL; } else { char *w = result.we_wordv[0]; + if (expanded == NULL) { + expanded = malloc(strlen(w)+1); + } strncpy( expanded, w, maxlen ); wordfree (&result); return expanded; @@ -309,8 +507,15 @@ wordexp_t result; default: /* Some other error. */ return NULL; } +#else + // just use basic + if (expanded == NULL) { + expanded = malloc(strlen(pattern)+1); + } + strcpy(expanded, pattern); + #endif - return NULL; + return expanded; } #if _WIN32 || defined(__MINGW32__) @@ -378,15 +583,17 @@ PrologPath(const char *p, char *buf, size_t len) char * OsPath(const char *p, char *buf) -{ strcpy(buf, p); +{ + if()z + trcpy(buf, p); return buf; } #else char * OsPath(const char *X, char *Y) { - if (X!=Y && Y) strcpy(Y,X); - return Y; + //if (X!=Y && Y) strcpy(Y,X); + return (char *)X ; } #endif /* O_XOS */ @@ -398,10 +605,33 @@ OsPath(const char *X, char *Y) { bool ChDir(const char *path) { bool rc = false; - char *qpath = AbsoluteFile(path, NULL); + char *qpath = AbsoluteFile(path, NULL); +#ifdef __ANDROID__ + if (GLOBAL_AssetsWD) { + free( GLOBAL_AssetsWD ); + GLOBAL_AssetsWD = NULL; + } + if (Yap_isAsset(qpath) ) { + AAssetManager* mgr = Yap_assetManager; + const char *ptr = qpath+8; + AAssetDir* d; + if (ptr[0] == '/') + ptr++; + d = AAssetManager_openDir(mgr, ptr); + if (d) { + GLOBAL_AssetsWD = malloc( strlen(qpath) + 1 ); + strcpy( GLOBAL_AssetsWD, qpath ); + AAssetDir_close( d ); + return true; + } + return false; + } else { + GLOBAL_AssetsWD = NULL; + } +#endif #if _WIN32 || defined(__MINGW32__) - GET_LD + GET_LD if ((rc = (SetCurrentDirectory(qpath) != 0)) == 0) { Yap_WinError("SetCurrentDirectory failed" ); @@ -415,7 +645,7 @@ bool ChDir(const char *path) { #if _WIN32 || defined(__MINGW32__) char * BaseName(const char *X) { - char *qpath = unix2win(X, NULL, YAP_FILENAME_MAX); + char *qpath = unix2win(X, NULL, YAP_FILENAME_MAX); char base[YAP_FILENAME_MAX], ext[YAP_FILENAME_MAX]; _splitpath(qpath, NULL, NULL, base, ext); strcpy(qpath, base); @@ -425,16 +655,16 @@ BaseName(const char *X) { char * DirName(const char *X) { - char dir[YAP_FILENAME_MAX]; - char drive[YAP_FILENAME_MAX]; + char dir[YAP_FILENAME_MAX]; + char drive[YAP_FILENAME_MAX]; char *o = unix2win(X, NULL, YAP_FILENAME_MAX); int err; - if (!o) - return NULL; + if (!o) + return NULL; if (( err = _splitpath_s(o, drive, YAP_FILENAME_MAX-1, dir, YAP_FILENAME_MAX-1,NULL, 0, NULL, 0) ) != 0) { - Yap_FileError(OPERATING_SYSTEM_ERROR, TermNil, "could not perform _splitpath %s: %s", X, strerror(errno)); - return NULL; - + Yap_FileError(OPERATING_SYSTEM_ERROR, TermNil, "could not perform _splitpath %s: %s", X, strerror(errno)); + return NULL; + } strncpy(o, drive, YAP_FILENAME_MAX-1); strncat(o, dir, YAP_FILENAME_MAX-1); @@ -451,8 +681,8 @@ static char *myrealpath( const char *path, char *out) YAP_FILENAME_MAX, out, NULL); - - if (retval == 0) + + if (retval == 0) { Yap_WinError("Generating a full path name for a file" ); return NULL; @@ -462,25 +692,25 @@ static char *myrealpath( const char *path, char *out) { char *rc = realpath(path,out); char *s0; - + if (rc == NULL && (errno == ENOENT|| errno == EACCES)) { char *s = basename((char *)path); s0 = malloc(strlen(s)+1); strcpy(s0, s); if ((rc = myrealpath(dirname((char *)path), out))==NULL) { - Yap_FileError(OPERATING_SYSTEM_ERROR, TermNil, "could not find file %s: %s", path, strerror(errno)); - return NULL; + Yap_FileError(OPERATING_SYSTEM_ERROR, TermNil, "could not find file %s: %s", path, strerror(errno)); + return NULL; } if(rc[strlen(rc)-1] != '/' ) strcat(rc, "/"); strcat(rc, s0); free(s0); } - return rc; + return rc; } #else return NULL; -#endif +#endif } char * @@ -488,57 +718,44 @@ char * { GET_LD char *rc; - char *qpath0; - -#if _WIN32 || defined(__MINGW32__) - char *o = malloc(YAP_FILENAME_MAX+1); - if (!o) - return NULL; - // first pass, remove Unix style stuff - if (unix2win(spec, o, YAP_FILENAME_MAX) == NULL) - return NULL; - spec = (const char *)o; -#endif +#if HAVE_WORDEXP + char o[YAP_FILENAME_MAX+1]; +#elif _WIN32 || defined(__MINGW32__) + char u[YAP_FILENAME_MAX+1]; + // first pass, remove Unix style stuff + if (unix2win(spec, u, YAP_FILENAME_MAX) == NULL) + return NULL; + spec = (const char *)u; +#endif if (tmp == NULL) { tmp = malloc(YAP_FILENAME_MAX+1); if (tmp == NULL) { return NULL; } } - if ( truePrologFlag(PLFLAG_FILEVARS) ) + if ( truePrologFlag(PLFLAG_FILEVARS) ) { - qpath0 = malloc(YAP_FILENAME_MAX+1); -#if HAVE_WORDEXP - qpath0=expandVars(spec,qpath0,YAP_FILENAME_MAX); +#if HAVE_WORDEXP + spec=expandVars(spec,o,YAP_FILENAME_MAX); #endif -#if _WIN32 || defined(__MINGW32__) - free((char *)spec); -#endif - spec = qpath0; } -#if HAVE_REALPATH +#if HAVE_REALPATH rc = myrealpath(spec, tmp); #endif - if (spec == qpath0 -#if _WIN32 || defined(__MINGW32__) - || true -#endif - ) - free((char *)spec); return rc; } char *canoniseFileName( char *path) { #if HAVE_REALPATH && HAVE_BASENAME -#if _WIN32 || defined(__MINGW32__) - char *o = malloc(YAP_FILENAME_MAX+1); - if (!o) - return NULL; - // first pass, remove Unix style stuff - if (unix2win(path, o, YAP_FILENAME_MAX) == NULL) - return NULL; - path = o; -#endif +#if _WIN32 || defined(__MINGW32__) + char *o = malloc(YAP_FILENAME_MAX+1); + if (!o) + return NULL; + // first pass, remove Unix style stuff + if (unix2win(path, o, YAP_FILENAME_MAX) == NULL) + return NULL; + path = o; +#endif char *rc, *tmp = malloc(PATH_MAX); if (tmp == NULL) return NULL; rc = myrealpath(path, tmp); @@ -882,7 +1099,7 @@ void Yap_systime_interval(Int *now,Int *interval) The problem is that mingw32 does not seem to have acces to div */ #ifndef do_div #define do_div(n,base) ({ \ - unsigned long __upper, __low, __high, __mod; \ + unsigned long __upper, __low, __high, __mod; \ asm("":"=a" (__low), "=d" (__high):"A" (n)); \ __upper = __high; \ if (__high) { \ @@ -1492,8 +1709,8 @@ Yap_random (void) #elif HAVE_RAND return (((double) (rand ()) / RAND_MAX)); #else - Yap_Error(SYSTEM_ERROR, TermNil, - "random not available in this configuration"); + Yap_Error(SYSTEM_ERROR, TermNil, + "random not available in this configuration"); return (0.0); #endif } @@ -2035,7 +2252,7 @@ MSCHandleSignal(DWORD dwCtrlType) { } #endif - + /* SIGINT can cause problems, if caught before full initialization */ static void InitSignals (void) @@ -2103,11 +2320,11 @@ Yap_volume_header(char *file) char * PL_cwd(char *cwd, size_t cwdlen) { - return Yap_getcwd( cwd, cwdlen ); + return (char *)Yap_getcwd( (const char *)cwd, cwdlen ); } - char * Yap_getcwd(const char *cwd, size_t cwdlen) - { + const char * Yap_getcwd(const char *cwd, size_t cwdlen) + { #if _WIN32 || defined(__MINGW32__) if (GetCurrentDirectory(cwdlen, (char *)cwd) == 0) { @@ -2116,7 +2333,13 @@ Yap_volume_header(char *file) } return (char *)cwd; #else - return getcwd(cwd, cwdlen); +#if __ANDROID__ + if (GLOBAL_AssetsWD) { + return strncpy( (char *)cwd, (const char *)GLOBAL_AssetsWD, cwdlen); + } + +#endif + return getcwd((char *)cwd, cwdlen); #endif } @@ -2126,15 +2349,16 @@ Yap_volume_header(char *file) { char *work; char ares1[YAP_FILENAME_MAX+1]; - - work = expandVars( source, ares1, YAP_FILENAME_MAX); - // expand names first - if (root && !IsAbsolutePath( source ) ) { - char ares2[YAP_FILENAME_MAX+1]; - strncpy( ares2, root, YAP_FILENAME_MAX ); - strncat( ares2, "/", YAP_FILENAME_MAX ); - strncat( ares2, work, YAP_FILENAME_MAX ); - return AbsoluteFile( ares2, result ); + + + work = expandVars( source, ares1, YAP_FILENAME_MAX); + // expand names first + if (root && !IsAbsolutePath( source ) ) { + char ares2[YAP_FILENAME_MAX+1]; + strncpy( ares2, root, YAP_FILENAME_MAX ); + strncat( ares2, "/", YAP_FILENAME_MAX ); + strncat( ares2, work, YAP_FILENAME_MAX ); + return AbsoluteFile( ares2, result ); } else { // expand path return myrealpath( work, result); @@ -2146,25 +2370,24 @@ Yap_volume_header(char *file) TrueFileName (char *isource, char *root, char *result, int in_lib, int expand_root) { CACHE_REGS - + char *work; const char *source = isource; - + // expand names in case you have // to add a prefix if (!expand_root) root = NULL; - if (exists((work = expandWithPrefix( source, root, result )))) - return true; // done + if (exists((work = expandWithPrefix( source, root, result )))) + return true; // done if (in_lib) { - if (Yap_LibDir != NULL) { - strncpy(LOCAL_FileNameBuf, Yap_LibDir, YAP_FILENAME_MAX); + if (Yap_LibDir != NULL) { + strncpy(LOCAL_FileNameBuf, Yap_LibDir, YAP_FILENAME_MAX); } #if HAVE_GETENV { char *yap_env = getenv("YAPLIBDIR"); - if (yap_env && - exists((work = expandWithPrefix( source, yap_env, result )))) + if (yap_env && exists((work = expandWithPrefix( source, yap_env, result )))) return true; // done } #endif @@ -2181,7 +2404,7 @@ TrueFileName (char *isource, char *root, char *result, int in_lib, int expand_ro } return false; } - + int Yap_TrueFileName (char *source, char *result, int in_lib) { @@ -2287,14 +2510,14 @@ p_sh ( USES_REGS1 ) /** shell(+Command:text, -Status:integer) is det. -Run an external command and wait for its completion. + Run an external command and wait for its completion. */ static Int p_shell ( USES_REGS1 ) { /* '$shell'(+SystCommand) */ #if _MSC_VER || defined(__MINGW32__) char *cmd; - term_t A1 = Yap_InitSlot(ARG1 PASS_REGS); + term_t A1 = Yap_InitSlot(ARG1); if ( PL_get_chars(A1, &cmd, CVT_ALL|REP_FN|CVT_EXCEPTION) ) { int rval = System(cmd); @@ -2373,7 +2596,7 @@ p_system ( USES_REGS1 ) { /* '$system'(+SystCommand) */ #if _MSC_VER || defined(__MINGW32__) char *cmd; - term_t A1 = Yap_InitSlot(ARG1 PASS_REGS); + term_t A1 = Yap_InitSlot(ARG1); if ( PL_get_chars(A1, &cmd, CVT_ALL|REP_FN|CVT_EXCEPTION) ) { STARTUPINFO si; PROCESS_INFORMATION pi; @@ -2745,7 +2968,7 @@ p_virtual_alarm( USES_REGS1 ) Yap_Error(INSTANTIATION_ERROR, t, "alarm/2"); return(FALSE); } - if (!IsIntegerTerm(t)) { + if (!IsIntegerTerm(t)) { Yap_Error(TYPE_ERROR_INTEGER, t, "alarm/2"); return(FALSE); } @@ -2935,11 +3158,7 @@ p_yap_paths( USES_REGS1 ) { strncat(destdir, "/" YAP_SHAREDIR, YAP_FILENAME_MAX ); out2 = MkAtomTerm(Yap_LookupAtom(destdir)); } else { -#if __ANDROID__ - out2 = MkAtomTerm(Yap_LookupAtom("/assets/share/Yap")); -#else out2 = MkAtomTerm(Yap_LookupAtom(YAP_SHAREDIR)); -#endif } if (env_destdir) { strncat(destdir, env_destdir, YAP_FILENAME_MAX ); @@ -2973,9 +3192,7 @@ p_log_event( USES_REGS1 ) { #endif if (IsWideAtom(at) || IsBlob(at)) return FALSE; -#if __ANDROID__ - __android_log_print(ANDROID_LOG_INFO, "YAP", " %s ",RepAtom(at)->StrOfAE); -#endif + LOG( " %s ",RepAtom(at)->StrOfAE); return TRUE; } diff --git a/C/text.c b/C/text.c index dadd2e57d..a8eaccd7d 100644 --- a/C/text.c +++ b/C/text.c @@ -89,7 +89,7 @@ get_string_from_list( Term t, seq_tv_t *inp, char *s, int atoms USES_REGS) int i = RepAtom(at)->WStrOfAE[0]; if (i <= 0) { LOCAL_Error_TYPE = REPRESENTATION_ERROR_CHARACTER_CODE; - return NULL; + return NULL; } *s++ = i; } else @@ -105,7 +105,7 @@ get_string_from_list( Term t, seq_tv_t *inp, char *s, int atoms USES_REGS) Int i = IntOfTerm(HeadOfTerm(t)); if (i <= 0 || i > 255) { LOCAL_Error_TYPE = REPRESENTATION_ERROR_CHARACTER_CODE; - return NULL; + return NULL; } *s++ = i; if (--max == 0) { @@ -165,7 +165,7 @@ get_wide_from_list( Term t, seq_tv_t *inp, wchar_t *s, int atoms USES_REGS) *s++ = code = IntOfTerm(HeadOfTerm(t)); if (code <= 0) { LOCAL_Error_TYPE = REPRESENTATION_ERROR_CHARACTER_CODE; - return NULL; + return NULL; } if (--max == 0) { *s++ = 0; @@ -232,7 +232,7 @@ SkipListCodes(Term *l, Term **tailp, Int *atoms, int *wide) return length; } } - l = RepPair(*l)+1; + l = RepPair(*l)+1; do_derefa(v,l,derefa2_unk,derefa2_nonvar); } while ( *l != *s && IsPairTerm(*l) ); } @@ -370,7 +370,7 @@ Yap_ListToBuffer(void *buf, Term t, seq_tv_t *inp, int *widep, size_t *lenp USES } } -static yap_error_number +static yap_error_number gen_type_error(int flags) { if ((flags & (YAP_STRING_STRING|YAP_STRING_ATOM|YAP_STRING_INT|YAP_STRING_FLOAT|YAP_STRING_ATOMS_CODES|YAP_STRING_BIG)) == (YAP_STRING_STRING|YAP_STRING_ATOM|YAP_STRING_INT|YAP_STRING_FLOAT|YAP_STRING_ATOMS_CODES|YAP_STRING_BIG)) @@ -378,7 +378,7 @@ gen_type_error(int flags) { if ((flags & (YAP_STRING_STRING|YAP_STRING_ATOM|YAP_STRING_INT|YAP_STRING_FLOAT|YAP_STRING_BIG)) == (YAP_STRING_STRING|YAP_STRING_ATOM|YAP_STRING_INT|YAP_STRING_FLOAT|YAP_STRING_BIG)) return TYPE_ERROR_ATOMIC; - if ((flags & (YAP_STRING_INT|YAP_STRING_FLOAT|YAP_STRING_BIG)) == + if ((flags & (YAP_STRING_INT|YAP_STRING_FLOAT|YAP_STRING_BIG)) == (YAP_STRING_INT|YAP_STRING_FLOAT|YAP_STRING_BIG)) return TYPE_ERROR_NUMBER; if (flags & YAP_STRING_ATOM ) @@ -403,12 +403,12 @@ read_Text( void *buf, seq_tv_t *inp, encoding_t *enc, int *minimal, size_t *leng if (IsVarTerm(inp->val.t)) { LOCAL_Error_TYPE = INSTANTIATION_ERROR; LOCAL_Error_Term = inp->val.t; - return 0L; + return 0L; } if (!IsStringTerm(inp->val.t)) { LOCAL_Error_TYPE = TYPE_ERROR_STRING; LOCAL_Error_Term = inp->val.t; - return 0L; + return 0L; } s = StringOfTerm( inp->val.t ); if ( s == NULL ) { @@ -461,11 +461,11 @@ read_Text( void *buf, seq_tv_t *inp, encoding_t *enc, int *minimal, size_t *leng if (IsVarTerm(inp->val.t)) { LOCAL_Error_TYPE = INSTANTIATION_ERROR; LOCAL_Error_Term = inp->val.t; - return 0L; + return 0L; } else if (!IsAtomTerm(inp->val.t)) { LOCAL_Error_TYPE = TYPE_ERROR_ATOM; LOCAL_Error_Term = inp->val.t; - return NULL; + return NULL; } else { Atom at = AtomOfTerm(inp->val.t); if (IsWideAtom(at)) { @@ -527,7 +527,7 @@ read_Text( void *buf, seq_tv_t *inp, encoding_t *enc, int *minimal, size_t *leng *lengp = wcslen(inp->val.w); return (void *)inp->val.w; case YAP_STRING_LITERAL: - { + { yhandle_t CurSlot = Yap_StartSlots( ); if (buf) s = buf; else s = Yap_PreAllocCodeSpace(); @@ -537,7 +537,7 @@ read_Text( void *buf, seq_tv_t *inp, encoding_t *enc, int *minimal, size_t *leng CurSlot = Yap_StartSlots(); fd = Sopenmem(&s, &sz, "w"); fd->encoding = ENC_UTF8; - if ( ! PL_write_term(fd, Yap_InitSlot(inp->val.t PASS_REGS), 1200, 0) || + if ( ! PL_write_term(fd, Yap_InitSlot(inp->val.t), 1200, 0) || Sputcode(EOS, fd) < 0 || Sflush(fd) < 0 ) { AUX_ERROR( inp->val.t, LOCAL_MAX_SIZE, s, char); @@ -563,7 +563,7 @@ read_Text( void *buf, seq_tv_t *inp, encoding_t *enc, int *minimal, size_t *leng } else { LOCAL_Error_TYPE = gen_type_error( inp->type ); LOCAL_Error_Term = t; - } + } } else if (IsPairTerm(t) ) { if (inp->type & (YAP_STRING_CODES|YAP_STRING_ATOMS)) { inp->type &= (YAP_STRING_CODES|YAP_STRING_ATOMS); @@ -584,7 +584,7 @@ read_Text( void *buf, seq_tv_t *inp, encoding_t *enc, int *minimal, size_t *leng } else { LOCAL_Error_TYPE = gen_type_error( inp->type ); LOCAL_Error_Term = t; - } + } } else if (IsIntegerTerm(t)) { if (inp->type & (YAP_STRING_INT)) { inp->type &= (YAP_STRING_INT); @@ -593,7 +593,7 @@ read_Text( void *buf, seq_tv_t *inp, encoding_t *enc, int *minimal, size_t *leng } else { LOCAL_Error_TYPE = gen_type_error( inp->type ); LOCAL_Error_Term = t; - } + } } else if (IsFloatTerm(t)) { if (inp->type & (YAP_STRING_FLOAT)) { inp->type &= (YAP_STRING_FLOAT); @@ -602,7 +602,7 @@ read_Text( void *buf, seq_tv_t *inp, encoding_t *enc, int *minimal, size_t *leng } else { LOCAL_Error_TYPE = gen_type_error( inp->type ); LOCAL_Error_Term = t; - } + } #if USE_GMP } else if (IsBigIntTerm(t)) { if (inp->type & (YAP_STRING_BIG)) { @@ -612,7 +612,7 @@ read_Text( void *buf, seq_tv_t *inp, encoding_t *enc, int *minimal, size_t *leng } else { LOCAL_Error_TYPE = gen_type_error( inp->type ); LOCAL_Error_Term = t; - } + } #endif } else { if (!Yap_IsGroundTerm(t)) { @@ -652,7 +652,7 @@ write_strings( void *s0, seq_tv_t *out, encoding_t enc, int minimal, size_t leng max++; buf = utf8_put_char(buf, '\0'); } - + close_tstring( buf PASS_REGS ); out->val.t = t; } @@ -730,7 +730,7 @@ write_atoms( void *s0, seq_tv_t *out, encoding_t enc, int minimal, size_t leng U int chr; CELL *cl; cp = utf8_get_char(cp, &chr); - if (chr == '\0') break; + if (chr == '\0') break; w[0] = chr; cl = HR; HR += 2; @@ -787,7 +787,7 @@ write_atoms( void *s0, seq_tv_t *out, encoding_t enc, int minimal, size_t leng U } else { if (sz == 0) t = TermNil; else HR[-1] = TermNil; - } + } out->val.t = t; return (t); } @@ -864,7 +864,7 @@ write_codes( void *s0, seq_tv_t *out, encoding_t enc, int minimal, size_t leng U } else { if (sz == 0) t = TermNil; else HR[-1] = TermNil; - } + } out->val.t = t; return (t); } @@ -877,7 +877,7 @@ write_atom( void *s0, seq_tv_t *out, encoding_t enc, int minimal, size_t leng US if (out->type & (YAP_STRING_NCHARS|YAP_STRING_TRUNC)) { if (out->type & YAP_STRING_TRUNC && out->max < max) max = out->max; } - + switch (enc) { case YAP_UTF8: { char *s = s0, *lim = s + strnlen(s, max); @@ -921,7 +921,7 @@ static ssize_t write_length( void *s0, seq_tv_t *out, encoding_t enc, int minimal, size_t leng USES_REGS) { size_t max = -1; - + if (out->type & (YAP_STRING_NCHARS|YAP_STRING_TRUNC)) { if (out->type & YAP_STRING_NCHARS && out->sz != (size_t)-1) return out->sz; if (out->type & YAP_STRING_TRUNC) max = out->max; @@ -955,7 +955,7 @@ write_number( void *s0, seq_tv_t *out, encoding_t enc, int minimal, int size USE char *s = s0; Term t = 0L; if ( (st=Sopenmem( &s, NULL, "r")) != NULL ) - { + { if (enc == YAP_UTF8) st->encoding = ENC_UTF8; else if (enc == YAP_WCHAR) @@ -1005,7 +1005,7 @@ write_term( void *s0, seq_tv_t *out, encoding_t enc, int minimal, size_t leng US size_t len = out->sz; Term t = 0L; if ( (st=Sopenmem( s0, &len, "r")) ) - { + { if (enc == YAP_UTF8) st->encoding = ENC_UTF8; else if (enc == YAP_WCHAR) @@ -1030,7 +1030,7 @@ write_Text( void *inp, seq_tv_t *out, encoding_t enc, int minimal, size_t leng U case YAP_STRING_ATOMS: out->val.t = write_atoms( inp, out, enc, minimal, leng PASS_REGS); - return out->val.t != 0; + return out->val.t != 0; case YAP_STRING_CODES: out->val.t = write_codes( inp, out, enc, minimal, leng PASS_REGS); @@ -1042,13 +1042,13 @@ write_Text( void *inp, seq_tv_t *out, encoding_t enc, int minimal, size_t leng U case YAP_STRING_ATOM: out->val.a = write_atom( inp, out, enc, minimal, leng PASS_REGS); - return out->val.a != NULL; + return out->val.a != NULL; case YAP_STRING_INT: case YAP_STRING_FLOAT: case YAP_STRING_BIG: out->val.t = write_number( inp, out, enc, minimal, leng PASS_REGS); - return out->val.t != 0; + return out->val.t != 0; case YAP_STRING_CHARS: out->val.c = inp; return 1; @@ -1163,14 +1163,14 @@ cmp_Text( void *s1, void *s2, int l, encoding_t enc1, encoding_t enc2 ) char *w2 = s2; for (i = 0; i < l; i++) { chr2 = *w2++; w1 = utf8_get_char(w1, &chr1); if (chr1-chr2) return chr1-chr2; } } - return 0; + return 0; case YAP_UTF8: { int chr1, chr2; char *w2 = s2; for (i = 0; i < l; i++) { w2 = utf8_get_char(w2, &chr2); w1 = utf8_get_char(w1, &chr1); if (chr1-chr2) return chr1-chr2; } } - return 0; + return 0; case YAP_WCHAR: { int chr1, chr2; @@ -1179,7 +1179,7 @@ cmp_Text( void *s1, void *s2, int l, encoding_t enc1, encoding_t enc2 ) } return 0; } - } + } case YAP_WCHAR: { wchar_t *w1 = (wchar_t *)s1; @@ -1330,7 +1330,7 @@ slice( size_t min, size_t max, void *buf, seq_tv_t *out, encoding_t enc USES_REG } else if (enc == YAP_CHAR) { /* atom */ char *nbuf = (char *)HR; - + if (max>min) { Term t = TermNil; char *ptr = (char *)buf + min; @@ -1377,7 +1377,7 @@ Yap_Concat_Text( int n, seq_tv_t inp[], seq_tv_t *out USES_REGS) buf = NULL; for (i = 0 ; i < n ; i++) { void *nbuf = read_Text( buf, inp+i, encv+i, &minimal, &leng PASS_REGS ); - + if (!nbuf) return 0L; bufv[i] = nbuf; @@ -1391,8 +1391,8 @@ Yap_Concat_Text( int n, seq_tv_t inp[], seq_tv_t *out USES_REGS) return buf; } -// -// out must be an atom or a string +// +// out must be an atom or a string void * Yap_Splice_Text( int n, size_t cuts[], seq_tv_t *inp, encoding_t encv[], seq_tv_t outv[] USES_REGS) { @@ -1442,7 +1442,7 @@ Yap_Splice_Text( int n, size_t cuts[], seq_tv_t *inp, encoding_t encv[], seq_tv return NULL; l1 = write_length( buf1, outv+1, enc1, minimal1, leng1 PASS_REGS); if (l < l1) return NULL; - l0 = l-l1; + l0 = l-l1; if (cmp_Text( advance_Text(buf, l0, enc), buf1, l1, enc, enc1) != 0) return NULL; buf0 = slice(0, l0, buf, outv, enc PASS_REGS); @@ -1463,4 +1463,3 @@ Yap_Splice_Text( int n, size_t cuts[], seq_tv_t *inp, encoding_t encv[], seq_tv } return (void *)outv;; } - diff --git a/C/tracer.c b/C/tracer.c index e5f8ff626..6919d9ec0 100644 --- a/C/tracer.c +++ b/C/tracer.c @@ -144,6 +144,20 @@ low_level_trace(yap_low_level_port port, PredEntry *pred, CELL *args) Int arity; /* extern int gc_calls; */ vsc_count++; +#if __ANDROID__ + PredEntry *ap = pred; + if (pred && port == enter_pred) { + UInt flags = ap->PredFlags; + if (ap->ArityOfPE && ap->ModuleOfPred != IDB_MODULE) + __android_log_print(ANDROID_LOG_INFO, "YAP ", " %s/%ld %lx\n", NameOfFunctor(ap->FunctorOfPred)->StrOfAE, ap->ArityOfPE, flags); + /* printf(" %s/%ld %lx\n", NameOfFunctor(ap->FunctorOfPred)->StrOfAE, ap->ArityOfPE, flags); */ + else if (ap->ModuleOfPred != IDB_MODULE) + __android_log_print(ANDROID_LOG_INFO, "YAP "," %s/%ld %lx\n", ((Atom)(ap->FunctorOfPred))->StrOfAE, ap->ArityOfPE, flags); + /* printf(" %s/%ld %lx\n", ((Atom)(ap->FunctorOfPred))->StrOfAE, ap->ArityOfPE, flags); */ + __android_log_print(ANDROID_LOG_INFO, "YAP "," %x ", ap->src.OwnerFile); +} + return; +#endif // if (!worker_id) return; LOCK(Yap_heap_regs->low_level_trace_lock); diff --git a/C/write.c b/C/write.c index 1dcf46053..3b13ca510 100644 --- a/C/write.c +++ b/C/write.c @@ -694,8 +694,8 @@ static Term from_pointer(CELL *ptr0, struct rewind_term *rwt, if (wglb->Keep_terms) { struct rewind_term *x = rwt->parent; - rwt->u_sd.s.old = Yap_InitSlot(t PASS_REGS); - rwt->u_sd.s.ptr = Yap_InitSlot((CELL)ptr0 PASS_REGS); + rwt->u_sd.s.old = Yap_InitSlot(t); + rwt->u_sd.s.ptr = Yap_InitSlot((CELL)ptr0); if (!IsAtomicTerm(t) && !IsVarTerm(t)) { while (x) { @@ -785,7 +785,7 @@ static Term check_infinite_loop(Term t, struct rewind_term *x, CACHE_REGS if (wglb->Keep_terms) { while (x) { - if (Yap_GetFromSlot(x->u_sd.s.old PASS_REGS) == t) + if (Yap_GetFromSlot(x->u_sd.s.old) == t) return TermFoundVar; x = x->parent; } diff --git a/C/yap-args.c b/C/yap-args.c index 2dc2cd173..e5a421bb3 100755 --- a/C/yap-args.c +++ b/C/yap-args.c @@ -167,11 +167,7 @@ int YAP_parse_yap_arguments(int argc, char *argv[], YAP_init_args *iap) { char *p; -#ifdef USE_SYSTEM_MALLOC - int BootMode = YAP_FULL_BOOT_FROM_PROLOG; -#else int BootMode = YAP_BOOT_FROM_SAVED_CODE; -#endif unsigned long int *ssize; iap->SavedState = NULL; @@ -554,5 +550,6 @@ YAP_parse_yap_arguments(int argc, char *argv[], YAP_init_args *iap) } GD->cmdline.appl_argc = argc; GD->cmdline.appl_argv = argv; +//___androidlog_print(ANDROID_LOG_INFO, "YAP ", "boot mode %d", BootMode); return BootMode; } diff --git a/CXX/yapdb.hh b/CXX/yapdb.hh index f028c97ec..ada725aa4 100644 --- a/CXX/yapdb.hh +++ b/CXX/yapdb.hh @@ -55,11 +55,11 @@ public: class YAPModuleProp: public YAPProp { friend class YAPPredicate; ModEntry *m; - - YAPModuleProp(ModEntry *mod) {m = mod;}; - YAPModuleProp(Term tmod) { m = Yap_GetModuleEntry(tmod); }; -public: - YAPModuleProp() { m = Yap_GetModuleEntry(Yap_CurrentModule()); }; + + YAPModuleProp(ModEntry *mod) {m = mod;}; + YAPModuleProp(Term tmod) { m = Yap_GetModuleEntry(tmod); }; +public: + YAPModuleProp() { m = Yap_GetModuleEntry(Yap_CurrentModule()); }; YAPModuleProp(YAPModule tmod) ; virtual YAPModule module() { return YAPModule(m->AtomOfME); }; }; @@ -103,7 +103,7 @@ public: arity_t arity(void) { return ArityOfFunctor( f ); } - + }; /** @@ -118,14 +118,34 @@ protected: PredEntry *ap; /// auxiliary routine to find a predicate in the current module. - PredEntry *getPred( Term t, Term* &outp ) ; + PredEntry *getPred( Term &t, Term* &outp ) ; /// String constructor for predicates /// /// It also communicates the array of arguments t[] /// and the array of variables /// back to yapquery - YAPPredicate(const char *s, Term* &out, Term& vnames ) throw (int); + YAPPredicate(const char *s, Term &out, yhandle_t &vnames ) { + CACHE_REGS + BACKUP_MACHINE_REGS(); + Term *outp; + char ns[strlen(s)+1]; + memcpy(ns, s, strlen(s)+1); + LOG("iPP=%d %d %d", strlen(s), s[0], s[1]); + LOG("iPP=%s", s); + vnames = Yap_NewSlots(1); + out = Yap_StringToTerm(ns, strlen(s)+1, vnames ) ; + LOG("iP2=%s", s); + //extern char *s0; + //fprintf(stderr,"ap=%p arity=%d text=%s", ap, ap->ArityOfPE, s); + // Yap_DebugPlWrite(out); + // delete [] ns; +if (out == 0L) + throw YAPError::YAP_SYNTAX_ERROR; + ap = getPred( out, outp); + RECOVER_MACHINE_REGS(); + } + /// Term constructor for predicates /// @@ -185,30 +205,6 @@ public: YAPPredicate(YAPAtom at, arity_t arity); - /// String constructor for predicates. - /// - /// String is a Prolog term, we extract the main functor after considering the module qualifiers. - inline YAPPredicate(const char *s) throw (int) { - Term t, tp; - t = YAP_ReadBuffer(s,&tp); - if (t == 0L) - throw YAPError::YAP_SYNTAX_ERROR; - CELL * v; - ap = getPred( t, v); - } - - - /// String constructor for predicates, also keeps arguments in tp[] - /// - /// String is a Prolog term, we extract the main functor after considering the module qualifiers. - inline YAPPredicate(const char *s, Term* outp) throw (int) { - Term t, tp; - t = YAP_ReadBuffer(s,&tp); - if (t == 0L) - throw YAPError::YAP_SYNTAX_ERROR; - ap = getPred( t, outp ); - } - /// module of a predicate /// /// notice that modules are currently treated as atoms, this should change. @@ -290,7 +286,7 @@ public: call, arity); } } - + }; YAPFLIP(const char *name, arity_t arity, @@ -313,6 +309,5 @@ public: bool addCut(CPredicate call) { return Yap_AddCutToFli( ap, call ); } - -}; +}; diff --git a/CXX/yapi.cpp b/CXX/yapi.cpp index f438b72ae..356c795f0 100644 --- a/CXX/yapi.cpp +++ b/CXX/yapi.cpp @@ -88,7 +88,7 @@ YAPStringTerm::YAPStringTerm(char *s, size_t len) { // build string BACKUP_H(); CACHE_REGS - + seq_tv_t inp, out; inp.val.c = s; inp.type = YAP_STRING_CHARS; @@ -105,7 +105,7 @@ YAPStringTerm::YAPStringTerm(wchar_t *s): YAPTerm() { // build string BACKUP_H(); CACHE_REGS - + seq_tv_t inp, out; inp.val.w = s; inp.type = YAP_STRING_WCHARS; @@ -121,7 +121,7 @@ YAPStringTerm::YAPStringTerm(wchar_t *s, size_t len) : YAPTerm() { // build stri BACKUP_H(); CACHE_REGS - + seq_tv_t inp, out; inp.val.w = s; inp.type = YAP_STRING_WCHARS; @@ -136,23 +136,23 @@ YAPStringTerm::YAPStringTerm(wchar_t *s, size_t len) : YAPTerm() { // build stri YAPApplTerm::YAPApplTerm(YAPFunctor f, YAPTerm ts[]) : YAPTerm() { - BACKUP_MACHINE_REGS(); + BACKUP_H(); UInt arity = ArityOfFunctor(f.f); mk ( Yap_MkApplTerm( f.f, arity, (Term *)ts) ); - RECOVER_MACHINE_REGS(); + RECOVER_H(); } YAPApplTerm::YAPApplTerm(YAPFunctor f) : YAPTerm() { - BACKUP_MACHINE_REGS(); + BACKUP_H(); UInt arity = ArityOfFunctor(f.f); mk ( Yap_MkNewApplTerm( f.f, arity) ); - RECOVER_MACHINE_REGS(); + RECOVER_H(); } YAPTerm YAPApplTerm::getArg(int arg) { - BACKUP_MACHINE_REGS(); + BACKUP_H(); YAPTerm to = YAPTerm( ArgOfTerm(arg, gt() ) ); - RECOVER_MACHINE_REGS(); + RECOVER_H(); return to; } @@ -162,20 +162,20 @@ YAPFunctor YAPApplTerm::getFunctor() { YAPPairTerm::YAPPairTerm(YAPTerm th, YAPTerm tl) : YAPTerm() { CACHE_REGS - BACKUP_MACHINE_REGS(); + BACKUP_H(); mk ( MkPairTerm( th.term(), tl.term() ) ); - RECOVER_MACHINE_REGS(); + RECOVER_H(); } YAPPairTerm::YAPPairTerm() : YAPTerm() { - BACKUP_MACHINE_REGS(); + BACKUP_H(); t = Yap_MkNewPairTerm( ); - RECOVER_MACHINE_REGS(); + RECOVER_H(); } -void YAPTerm::mk(Term t0) { CACHE_REGS t = Yap_InitSlot( t0 PASS_REGS); } +void YAPTerm::mk(Term t0) { CACHE_REGS t = Yap_InitSlot( t0 ); } -Term YAPTerm::gt() { CACHE_REGS return Yap_GetFromSlot( t PASS_REGS); } +Term YAPTerm::gt() { CACHE_REGS return Yap_GetFromSlot( t ); } YAP_tag_t YAPTerm::tag() { Term tt = gt( ); @@ -193,7 +193,7 @@ YAP_tag_t YAPTerm::tag() { return YAP_TAG_PAIR; if (IsAtomOrIntTerm(tt)) { if (IsAtomTerm(tt)) - return YAP_TAG_ATOM; + return YAP_TAG_ATOM; return YAP_TAG_INT; } else { Functor f = FunctorOfTerm(tt); @@ -296,20 +296,9 @@ const char *YAPTerm::text() { return os; } -char *YAPQuery::text() { - size_t sze = 4096, length; - char *os; - int enc; +const char *YAPQuery::text() { - { CACHE_REGS __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__, "I t=(%d) %lx", *q_g) ; } - BACKUP_MACHINE_REGS(); - if (!(os = Yap_HandleToString(*q_g, sze, &length, &enc, 0))) { - RECOVER_MACHINE_REGS(); - return (char *)NULL; - } - { CACHE_REGS __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__, "II %s", os) ; } - RECOVER_MACHINE_REGS(); - return os; + return goal.text(); } @@ -335,7 +324,7 @@ YAPTerm::YAPTerm(intptr_t i) { CACHE_REGS Term tn = MkIntegerTerm( i ); mk( tn ) YAPTerm YAPListTerm::car() { Term to = gt(); - { CACHE_REGS __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__, "to=%p", to) ; } + { LOG( "to=%lx", to) ; } if (IsPairTerm(to)) return YAPTerm(HeadOfTerm(to)); else @@ -395,51 +384,80 @@ char *YAPAtom::getName(void) { } } +void YAPQuery::initOpenQ() { + CACHE_REGS + oq = LOCAL_execution; + LOCAL_execution = this; + q_open=1; + q_state=0; + q_flags = PL_Q_PASS_EXCEPTION; + + q_p = P; + q_cp = CP; +} + void -YAPQuery::initQuery( Term *ts ) +YAPQuery::initQuery( Term t ) +{ + CACHE_REGS + BACKUP_MACHINE_REGS(); + size_t arity = ap->ArityOfPE; + LOG("iQ=%d", arity); + goal = YAPTerm( t ); + if (arity) { + q_g = Yap_NewSlots( arity ); + for (size_t i=0; i < arity; i++) { + Yap_PutInSlot(q_g+i, ArgOfTerm(i+1, t) PASS_REGS); + } + } else { + q_g = 0; + } + initOpenQ(); + RECOVER_MACHINE_REGS(); +} + +void +YAPQuery::initQuery( YAPTerm ts[], arity_t arity ) { CACHE_REGS - this->oq = (YAPQuery *)LOCAL_execution; - LOCAL_execution = (struct open_query_struct *)this; - this->q_open=1; - this->q_state=0; - this->q_flags = PL_Q_PASS_EXCEPTION; - this->q_g = ts; - this->q_p = P; - this->q_cp = CP; -} -void -YAPQuery::initQuery( YAPTerm t[], arity_t arity ) -{ - Term *ts = new Term[arity]; - for (arity_t i = 0; i < arity; i++) - ts[i] = t[i].term(); - - return initQuery( ts ); + BACKUP_MACHINE_REGS(); + if (arity) { + q_g = Yap_NewSlots( arity ); + for (size_t i=0; i < arity; i++) { + Yap_PutInSlot(q_g+i, ts[i].term() PASS_REGS); + } + Term t = Yap_MkApplTerm(ap->FunctorOfPred, ap->ArityOfPE, Yap_AddressFromSlot(q_g)); + goal = YAPTerm( t ); + } else { + q_g = 0; + goal = YAPTerm( MkAtomTerm((Atom)ap->FunctorOfPred) ); + } + initOpenQ(); + RECOVER_MACHINE_REGS(); } -YAPQuery::YAPQuery(YAPFunctor f, YAPTerm mod, YAPTerm t[]): YAPPredicate(f, mod) +YAPQuery::YAPQuery(YAPFunctor f, YAPTerm mod, YAPTerm ts[]): YAPPredicate(f, mod) { /* ignore flags for now */ - initQuery( t , f.arity()); + initQuery( ts , f.arity()); } -YAPQuery::YAPQuery(YAPFunctor f, YAPTerm t[]): YAPPredicate(f) +YAPQuery::YAPQuery(YAPFunctor f, YAPTerm ts[]): YAPPredicate(f) { /* ignore flags for now */ - initQuery( t , f.arity()); + initQuery( ts , f.arity()); } -YAPQuery::YAPQuery(YAPPredicate p, YAPTerm t[]): YAPPredicate(p.ap) +YAPQuery::YAPQuery(YAPPredicate p, YAPTerm ts[]): YAPPredicate(p.ap) { - initQuery( t , p.ap->ArityOfPE); + initQuery( ts , p.ap->ArityOfPE); } YAPListTerm YAPQuery::namedVars() { CACHE_REGS - Term o = Yap_GetFromSlot( this->vnames.t PASS_REGS ); + Term o = Yap_GetFromSlot( vnames ); return YAPListTerm( o ); } @@ -447,25 +465,24 @@ bool YAPQuery::next() { CACHE_REGS int result; - - if (q_open != 1) return false; - if (setjmp(((YAPQuery *)LOCAL_execution)->q_env)) - return false; - // don't forget, on success these guys must create slots - if (q_state == 0) { - // extern void toggle_low_level_trace(void); - //toggle_low_level_trace(); - result = (bool)YAP_EnterGoal((YAP_PredEntryPtr)ap, q_g, &q_h); + BACKUP_MACHINE_REGS(); + if (q_open != 1) return false; + if (setjmp(q_env)) + return false; + // don't forget, on success these guys must create slots + if (this->q_state == 0) { + result = (bool)YAP_EnterGoal((YAP_PredEntryPtr)ap, q_g, &q_h); } else { - LOCAL_AllowRestart = this->q_open; + LOCAL_AllowRestart = q_open; result = (bool)YAP_RetryGoal(&q_h); } - this->q_state = 1; + q_state = 1; if (!result) { YAP_LeaveGoal(FALSE, &q_h); - this->q_open = 0; + q_open = 0; } + RECOVER_MACHINE_REGS(); return result; } @@ -473,26 +490,31 @@ void YAPQuery::cut() { CACHE_REGS - if (this->q_open != 1 || this->q_state == 0) return; - YAP_LeaveGoal(FALSE, &this->q_h); - this->q_open = 0; - LOCAL_execution = (struct open_query_struct *)this->oq; + BACKUP_MACHINE_REGS(); + if (q_open != 1 || q_state == 0) return; + YAP_LeaveGoal(FALSE, &q_h); + q_open = 0; + LOCAL_execution = this; + RECOVER_MACHINE_REGS(); } void YAPQuery::close() { CACHE_REGS - if (EX && !(this->q_flags & (PL_Q_CATCH_EXCEPTION))) { + RECOVER_MACHINE_REGS(); + if (EX && !(q_flags & (PL_Q_CATCH_EXCEPTION))) { EX = (struct DB_TERM *)NULL; } /* need to implement backtracking here */ - if (this->q_open != 1 || this->q_state == 0) { + if (q_open != 1 || q_state == 0) { + RECOVER_MACHINE_REGS(); return; } - YAP_LeaveGoal(FALSE, &this->q_h); - this->q_open = 0; - LOCAL_execution = (struct open_query_struct *)this->oq; + YAP_LeaveGoal(FALSE, &q_h); + q_open = 0; + LOCAL_execution = this; + RECOVER_MACHINE_REGS(); } static YAPEngine *curren; @@ -502,7 +524,16 @@ static YAPEngine *curren; #include #include -extern AAssetManager *assetManager; +JNIEnv *Yap_jenv; + +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) { + JNIEnv* env; + if (vm->GetEnv(reinterpret_cast(&env), JNI_VERSION_1_6) != JNI_OK) { + return -1; + } + Yap_jenv = env; + return JNI_VERSION_1_6; +} extern char *Yap_AndroidBufp; static size_t Yap_AndroidMax, Yap_AndroidSz; @@ -530,6 +561,19 @@ displayWithJava(int c) } } +extern "C" void Java_pt_up_fc_dcc_yap_JavaYap_load(JNIEnv *env0, jobject obj, jobject mgr); + +extern "C" void Java_pt_up_fc_dcc_yap_JavaYap_load + (JNIEnv *env0, jobject obj, jobject asset_manager) +{ + AAssetManager *mgr = AAssetManager_fromJava(Yap_jenv, asset_manager); + if (mgr == NULL) { + LOG( "we're doomed, mgr = 0; bip bip bip"); + } else { + Yap_assetManager = mgr; + } +} + #endif @@ -548,8 +592,6 @@ YAPEngine::YAPEngine( char *savedState, YAPCallback *cb): _callback(0) { // a single engine can be active #if __ANDROID__ - if (GLOBAL_assetManager == (AAssetManager *)NULL) - return; Yap_DisplayWithJava = displayWithJava; Yap_AndroidBufp = (char *)malloc(Yap_AndroidMax = 4096); Yap_AndroidBufp[0] = '\0'; @@ -573,22 +615,6 @@ YAPEngine::YAPEngine( char *savedState, YAP_Init( &init_args ); } -YAPQuery *YAPEngine::query( char *s ) { - YAPQuery *n = new YAPQuery( s ); - return n; -} - - - -YAPPredicate::YAPPredicate(const char *s, Term* &outp, Term &vnames) throw (int) { - CACHE_REGS - yhandle_t sl = Yap_NewSlots(1 PASS_REGS); - Term t = Yap_StringToTerm(s, strlen(s)+1, sl ); - if (t == 0L) - throw YAPError::YAP_SYNTAX_ERROR; - vnames = Yap_GetFromSlot( sl PASS_REGS ); - ap = getPred( t, outp ); -} YAPPredicate::YAPPredicate(YAPAtom at) { CACHE_REGS @@ -606,35 +632,32 @@ YAPPredicate::YAPPredicate(YAPAtom at, arity_t arity) { } /// auxiliary routine to find a predicate in the current module. -PredEntry *YAPPredicate::getPred( Term t, Term* &outp ) { +PredEntry *YAPPredicate::getPred( Term &t, Term* &outp ) { CACHE_REGS Term m = CurrentModule ; - { CACHE_REGS __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__, "H= %p, outp=%p", HR, outp) ; } -t = Yap_StripModule(t, &m); + t = Yap_StripModule(t, &m); if (IsVarTerm(t) || IsNumTerm(t)) { ap = (PredEntry *)NULL; outp = (Term *)NULL; + return ap; } if (IsAtomTerm(t)) { ap = RepPredProp(PredPropByAtom(AtomOfTerm(t), m)); - if (outp) outp = (Term *)NULL; + outp = (Term *)NULL; + return ap; } else if (IsPairTerm(t)) { - ap = RepPredProp(PredPropByFunc(FunctorCsult, PROLOG_MODULE)); - outp = HR; - HR[0] = RepPair(t)[0]; - HR[1] = m; - HR+=2; - } else { - Functor f = FunctorOfTerm(t); - if (IsExtensionFunctor(f)) { + Term ts[1]; + ts[0] = t; + t = Yap_MkApplTerm(FunctorCsult, 1, ts); + } + Functor f = FunctorOfTerm(t); + if (IsExtensionFunctor(f)) { ap = (PredEntry *)NULL; outp = (Term *)NULL; - } else { + } else { ap = RepPredProp(PredPropByFunc(f, m)); outp = RepAppl(t)+1; - } } - { CACHE_REGS __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__, "done H= %p, outp=%p", HR, outp) ; } return ap; } @@ -711,15 +734,20 @@ YAPPrologPredicate::YAPPrologPredicate(YAPAtom name, void *YAPPrologPredicate::assertClause( YAPTerm clause, bool last, YAPTerm source) { CACHE_REGS + RECOVER_MACHINE_REGS(); Term tt = clause.gt(); Term sourcet = source.gt(); yamop *codeaddr = Yap_cclause(tt, PP->ArityOfPE, CurrentModule, sourcet); /* vsc: give the number of arguments to cclause in case there is overflow */ Term ntt = clause.gt(); - if (LOCAL_ErrorMessage) - return 0; + if (LOCAL_ErrorMessage) { + RECOVER_MACHINE_REGS(); + return 0; + } Term *tref = &ntt; - if (Yap_addclause(ntt, codeaddr, (last ? 0 : 2), CurrentModule, tref)) + if (Yap_addclause(ntt, codeaddr, (last ? 0 : 2), CurrentModule, tref)) { + RECOVER_MACHINE_REGS(); + } return tref; return 0; } diff --git a/CXX/yapi.hh b/CXX/yapi.hh index c7df5c8ea..c96b947e5 100644 --- a/CXX/yapi.hh +++ b/CXX/yapi.hh @@ -25,13 +25,13 @@ #include #if USE_GMP -#include +#include #endif extern "C" { #include - + #include "Yap.h" #include "Yatom.h" @@ -68,7 +68,6 @@ extern "C" { #include #endif - // taken from yap_structs.h #include "iopreds.h" diff --git a/CXX/yapq.hh b/CXX/yapq.hh index 1f5b3227c..0bac6a308 100644 --- a/CXX/yapq.hh +++ b/CXX/yapq.hh @@ -5,25 +5,22 @@ Queries and engines */ + static const char *s0; + /** * @brief Queries * * interface to a YAP Query; * uses an SWI-like status info internally. */ -class YAPQuery: public YAPPredicate { - int q_open; - int q_state; - Term *q_g; - yamop *q_p, *q_cp; - jmp_buf q_env; - int q_flags; - Term vs; - YAP_dogoalinfo q_h; - YAPQuery *oq; - YAPTerm vnames; - void initQuery( Term ts[] ); - void initQuery( YAPTerm t[], arity_t arity ); +class YAPQuery: public YAPPredicate, open_query_struct { + yhandle_t vnames; + YAPTerm goal; + Term t; + + void initOpenQ(); + void initQuery( Term t ); + void initQuery( YAPTerm ts[], arity_t arity ); public: /// main constructor, uses a predicate and an array of terms /// @@ -43,13 +40,12 @@ public: /// string constructor without varnames /// /// It is given a string, calls the parser and obtains a Prolog term that should be a callable - /// goal. It does not ask for a list of variables. - inline YAPQuery(const char *s): YAPPredicate(s, q_g, vs) + /// goal. + inline YAPQuery(const char *s): YAPPredicate(s, t, vnames) { - vnames = YAPTerm( vs ); - initQuery( q_g ); - } - + initQuery( t ); + }; + /// set flags for query execution, currently only for exception handling void setFlag(int flag) {q_flags |= flag; } /// reset flags for query execution, currently only for exception handling @@ -62,7 +58,7 @@ public: /// same call for every solution bool next(); /// represent the top-goal - char *text(); + const char *text(); /// remove alternatives in the current search space, and finish the current query void cut(); /// finish the current query: undo all bindings. @@ -77,8 +73,8 @@ public: /// class that actually implements the callback. class YAPCallback { public: - virtual ~YAPCallback() { printf("~YAPCallback\n"); } - virtual void run() { __android_log_print(ANDROID_LOG_INFO, __FUNCTION__, "callback"); } + virtual ~YAPCallback() { } + virtual void run() { LOG("callback"); } virtual void run(char *s) { } }; @@ -119,7 +115,10 @@ public: /// execute the callback with a text argument. YAPError hasError( ) { return yerror; } /// build a query on the engine - YAPQuery *query( char *s ); + YAPQuery *query( const char *s ) { + s0=s; + return new YAPQuery( s ); + }; /// current module for the engine YAPModule currentModule( ) { return YAPModule( ) ; } }; diff --git a/CXX/yapt.hh b/CXX/yapt.hh index eeb92e7aa..5c6eba574 100644 --- a/CXX/yapt.hh +++ b/CXX/yapt.hh @@ -11,14 +11,14 @@ class YAPTerm { friend class YAPPrologPredicate; friend class YAPQuery; friend class YAPModule; - friend class YAPModuleProp; - friend class YAPApplTerm; + friend class YAPModuleProp; + friend class YAPApplTerm; protected: yhandle_t t; /// handle to term, equivalent to term_t void mk(Term t0); /// internal method to convert from term to handle Term gt(); /// get handle and obtain term public: - ~YAPTerm() {}; + virtual ~YAPTerm() {}; YAPTerm(Term tn) { mk( tn ); } /// private method to convert from Term (internal YAP representation) to YAPTerm // do nothing constructor YAPTerm() { mk(TermNil); } @@ -32,7 +32,7 @@ public: YAP_tag_t tag(); /// copy the term ( term copy ) YAPTerm deepCopy(); - inline Term term() { return gt(); } /// private method to convert from YAPTerm to Term (internal YAP representation) + inline Term term() { return gt(); } /// from YAPTerm to Term (internal YAP representation) //const YAPTerm *vars(); /// this term is == to t1 bool exactlyEqual(YAPTerm t1); @@ -67,7 +67,7 @@ public: tf = YAPTerm((Term)0); } RECOVER_MACHINE_REGS(); - //{ CACHE_REGS __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__, "after getArg H= %p, i=%d", HR, tf.gt()) ; } + REGS_LOG( "after getArg H= %p, i=%d", HR, tf.gt()) ; return tf; } @@ -78,7 +78,7 @@ public: /** * @brief Variable Term */ -class YAPVarTerm: private YAPTerm { +class YAPVarTerm: public YAPTerm { YAPVarTerm(Term t) { if (IsVarTerm(t)) mk( t ); } public: /// constructor @@ -103,7 +103,7 @@ public: * @brief Atom Term * Term Representation of an Atom */ -class YAPAtomTerm: YAPTerm { +class YAPAtomTerm: public YAPTerm { friend class YAPModule; // Constructor: receives a C-atom; YAPAtomTerm(Atom a) { mk( MkAtomTerm(a) ); } @@ -113,13 +113,13 @@ class YAPAtomTerm: YAPTerm { public: // Constructor: receives an atom; YAPAtomTerm(YAPAtom a): YAPTerm() { mk( MkAtomTerm(a.a) ); } - // Constructor: receives a sequence of ISO-LATIN1 codes; + // Constructor: receives a sequence of ISO-LATIN1 codes; YAPAtomTerm(char *s) ; - // Constructor: receives a sequence of up to n ISO-LATIN1 codes; + // Constructor: receives a sequence of up to n ISO-LATIN1 codes; YAPAtomTerm(char *s, size_t len); - // Constructor: receives a sequence of wchar_ts, whatever they may be; + // Constructor: receives a sequence of wchar_ts, whatever they may be; YAPAtomTerm(wchar_t *s) ; - // Constructor: receives a sequence of n wchar_ts, whatever they may be; + // Constructor: receives a sequence of n wchar_ts, whatever they may be; YAPAtomTerm(wchar_t *s, size_t len); virtual bool isVar() { return false; } /// type check for unbound virtual bool isAtom() { return true; } /// type check for atom @@ -131,16 +131,16 @@ public: virtual bool isPair() { return false; } /// is a pair term virtual bool isGround() { return true; } /// term is ground virtual bool isList() { return gt() == TermNil; } /// [] is a list - // Getter: outputs the atom; + // Getter: outputs the atom; YAPAtom getAtom() { return YAPAtom(AtomOfTerm( gt() )); } - // Getter: outputs the name as a sequence of ISO-LATIN1 codes; + // Getter: outputs the name as a sequence of ISO-LATIN1 codes; const char *text() { return AtomOfTerm( gt() )->StrOfAE; } }; /** * @brief Compound Term */ -class YAPApplTerm: YAPTerm { +class YAPApplTerm: public YAPTerm { friend class YAPTerm; YAPApplTerm(Term t0) { mk(t0); } public: @@ -164,7 +164,7 @@ public: /** * @brief List Constructor Term */ -class YAPPairTerm: YAPTerm { +class YAPPairTerm: public YAPTerm { friend class YAPTerm; YAPPairTerm(Term t0) { if (IsPairTerm(t0)) mk( t0 ); else mk(0); } public: @@ -174,15 +174,24 @@ public: YAPTerm getTail() { return YAPTerm(TailOfTerm( gt() )); } }; +/** + * @brief Number Term + */ + +class YAPNumberTerm: public YAPTerm { +public: + YAPNumberTerm() {}; + bool isTagged() { return IsIntTerm( gt() ); } +}; + /** * @brief Integer Term */ -class YAPIntegerTerm: YAPTerm { +class YAPIntegerTerm: public YAPNumberTerm { public: YAPIntegerTerm(intptr_t i); intptr_t getInteger() { return IntegerOfTerm( gt() ); } - bool isTagged() { return IsIntTerm( gt() ); } }; class YAPListTerm: public YAPTerm { @@ -218,15 +227,15 @@ public: return YAPListTerm(TailOfTerm( to )); else if ( to == TermNil) return YAPListTerm( ); - /* error */; + /* error */ + throw YAPError::YAP_TYPE_ERROR; } /// Check if the list is empty. /// /// @param[in] the list inline bool nil() { - CACHE_REGS - { CACHE_REGS __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__, "II %x %x", gt(), TermNil) ; } + { LOG( "II %x %x", gt(), TermNil) ; } return gt() == TermNil; } @@ -236,7 +245,7 @@ public: /** * @brief String Term */ -class YAPStringTerm: private YAPTerm { +class YAPStringTerm: public YAPTerm { public: /// your standard constructor YAPStringTerm(char *s) ; diff --git a/H/Atoms.h b/H/Atoms.h index 3ff1520c5..cedf23aa3 100644 --- a/H/Atoms.h +++ b/H/Atoms.h @@ -126,7 +126,7 @@ typedef struct PropEntryStruct typedef CELL arity_t; -#define FunctorProperty ((PropFlags)(0xbb00)) + #define FunctorProperty ((PropFlags)(0xbb00)) /* functor property */ typedef struct FunctorEntryStruct diff --git a/H/Regs.h b/H/Regs.h index f3764283c..4ce98d349 100755 --- a/H/Regs.h +++ b/H/Regs.h @@ -81,7 +81,7 @@ INLINE_ONLY inline EXTERN void save_B(void); #define CACHE_REGS #define REFRESH_CACHE_REGS #define INIT_REGS -#define PASS_REGS1 +#define PASS_REGS1 #define PASS_REGS #define USES_REGS1 void #define USES_REGS @@ -223,7 +223,7 @@ extern REGSTORE Yap_REGS; #define YENV2MEM #define YENV_ADDRESS (&(YENV)) -#define MEM2YENV +#define MEM2YENV #if defined(__GNUC__) && defined(__alpha) @@ -391,7 +391,7 @@ INLINE_ONLY EXTERN inline void restore_B(void) { #define RECOVER_B() save_B(); B = BK_B -#define restore_TR() +#define restore_TR() #elif defined(__GNUC__) && defined(hppa) @@ -478,7 +478,7 @@ INLINE_ONLY EXTERN inline void restore_TR(void) { #elif defined(__GNUC__) && (defined(_POWER) || defined(__POWERPC__)) -/* +/* Because of a bug in GCC, we should always start from the first available general register. According to rs6000.h, this is r13 everywhere @@ -490,7 +490,7 @@ INLINE_ONLY EXTERN inline void restore_TR(void) { */ #define CreepFlag Yap_REGS.CreepFlag_ -/* +/* vsc: this MUST start from register 13, otherwise GCC will break down in flames and use the registers for evil purposes. :-( */ @@ -509,7 +509,7 @@ register CELL *YENV asm ("r19"); #undef YENV2MEM #undef YENV_ADDRESS (&(YENV)) -#undef MEM2YENV +#undef MEM2YENV #define YENV2MEM { CELL *YENV_MEM = YENV #define YENV_ADDRESS (&YENV_MEM) @@ -628,7 +628,7 @@ INLINE_ONLY EXTERN inline void restore_B(void) { #define RECOVER_B() -#define restore_TR() +#define restore_TR() #endif @@ -745,8 +745,8 @@ StackGap( USES_REGS1 ) { UInt gmin = (LCL0-H0)>>2; - if (gmin < MinStackGap) gmin = MinStackGap; - // if (gmin > 1024*1024) return 1024*1024; + if (gmin < MinStackGap) gmin = MinStackGap; + // if (gmin > 1024*1024) return 1024*1024; return gmin; } diff --git a/H/Yap.h b/H/Yap.h index 80d247957..9590e014a 100755 --- a/H/Yap.h +++ b/H/Yap.h @@ -1,4 +1,4 @@ -/************************************************************************* + /************************************************************************* * * * YAP Prolog %W% %G% * * Yap Prolog was developed at NCCUP - Universidade do Porto * @@ -505,16 +505,19 @@ extern int Yap_output_msg; #if __ANDROID__ +#include #include #include #include -#else -static inline char * __android_log_print(int i,const char *loc,const char *msg,...) { - return NULL; -} -#define ANDROID_LOG_INFO 0 -#define ANDROID_LOG_ERROR 0 -#define ANDROID_LOG_DEBUG 0 + +extern AAssetManager * Yap_assetManager; + +extern void *Yap_openAssetFile( const char *path ) ; +extern bool Yap_isAsset( const char *path ); +extern bool Yap_AccessAsset( const char *name , int mode); +extern bool Yap_AssetIsFile( const char *name ); +extern bool Yap_AssetIsDir( const char *name ); +extern int64_t Yap_AssetSize( const char *name ); #endif @@ -858,4 +861,34 @@ Global variables for JIT #endif #endif +#if DEBUGX +inline static void +LOG0(const char *f, int l, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); +#if __ANDROID__ + __android_log_print(ANDROID_LOG_INFO, "YAP ", fmt, ap); +#else __WINDOWS__ + FILE * fd; + fd = fopen("c:\\cygwin\\Log.txt", "a"); + vfprintf(fd, fmt, ap); + fclose(fd); +#endif + vfprintf(stderr, fmt, ap); + va_end(ap); +} +#else +#define LOG0( ... ) +#endif + +#ifndef __ANDROID__ +#define __android_log_print( ... ) +#endif + +#define LOG( ... ) LOG0( __FILE__, __LINE__, __VA_ARGS__ ) + +#define REGS_LOG( ... ) CACHE_REGS LOG0( __FILE__, __LINE__, __VA_ARGS__ ) + + #endif /* YAP_H */ diff --git a/H/YapHandles.h b/H/YapHandles.h index 224187296..67b57da08 100755 --- a/H/YapHandles.h +++ b/H/YapHandles.h @@ -30,10 +30,10 @@ of a function. Hence, slots should always be used as local variables. Slots are organized as follows: ---- Offset of next pointer in chain (tagged as an handle_t) ---- Number of entries (tagged as handle_t), in the example TAG(INT,4) -Entry -Entry -Entry -Entry +Entry +Entry +Entry +Entry ---- Number of entries (tagged as handle_t), in the example TAG(INT,4) Slots are not known to the yaam. Instead, A new set of slots is created when the emulator calls user C-code. @@ -54,8 +54,8 @@ Slots are not known to the yaam. Instead, A new set of slots is created when the static inline void Yap_RebootSlots__( int wid USES_REGS ) { - // fprintf( stderr, " StartSlots = %ld", LOCAL_CurSlot); - REMOTE_CurSlot(wid) = 1; + // fprintf( stderr, " StartSlots = %ld", LOCAL_CurSlot); + REMOTE_CurSlot(wid) = 1; } @@ -65,7 +65,7 @@ Yap_RebootSlots__( int wid USES_REGS ) { static inline yhandle_t Yap_StartSlots__( USES_REGS1 ) { - // fprintf( stderr, " StartSlots = %ld", LOCAL_CurSlot); + // fprintf( stderr, " StartSlots = %ld", LOCAL_CurSlot); if (LOCAL_CurSlot < 0) { Yap_Error( SYSTEM_ERROR, 0L, " StartSlots = %ld", LOCAL_CurSlot); } @@ -87,9 +87,10 @@ Yap_CurrentSlot( USES_REGS1 ) { return LOCAL_CurSlot; } +#define Yap_GetFromSlot(slot) Yap_GetFromSlot__(slot PASS_REGS) /// @brief read from a slot. static inline Term -Yap_GetFromSlot(yhandle_t slot USES_REGS) +Yap_GetFromSlot__(yhandle_t slot USES_REGS) { return(Deref(LOCAL_SlotBase[slot])); } @@ -142,21 +143,25 @@ ensure_slots(int N USES_REGS) } } +#define Yap_InitSlot( t ) Yap_InitSlot__( t PASS_REGS ) + /// @brief create a new slot with term t -static inline Int -Yap_InitSlot(Term t USES_REGS) +static inline yhandle_t +Yap_InitSlot__(Term t USES_REGS) { yhandle_t old_slots = LOCAL_CurSlot; - + ensure_slots( 1 PASS_REGS); LOCAL_SlotBase[old_slots] = t; LOCAL_CurSlot++; return old_slots; } +#define Yap_NewSlots( n ) Yap_NewSlots__( n PASS_REGS ) + /// @brief allocate n empty new slots static inline yhandle_t -Yap_NewSlots(int n USES_REGS) +Yap_NewSlots__(int n USES_REGS) { yhandle_t old_slots = LOCAL_CurSlot; int i; @@ -169,7 +174,7 @@ Yap_NewSlots(int n USES_REGS) return old_slots; } -#define Yap_InitSlots(n, ts) Yap_InitSlots__(n, ts PASS_REGS) +#define Yap_InitSlots(n, ts) Yap_InitSlots__(n, ts PASS_REGS) /// @brief create n new slots with terms ts[] static inline yhandle_t @@ -177,7 +182,7 @@ Yap_InitSlots__(int n, Term *ts USES_REGS) { yhandle_t old_slots = LOCAL_CurSlot; int i; - + ensure_slots( n PASS_REGS); for (i=0; i< n; i++) LOCAL_SlotBase[old_slots+i] = ts[i]; @@ -193,7 +198,7 @@ Yap_RecoverSlots(int n, yhandle_t topSlot USES_REGS) return false; #ifdef DEBUG if (topSlot + n > LOCAL_CurSlot) { - Yap_Error(SYSTEM_ERROR, 0 /* TermNil */, "Inconsistent slot state in Yap_RecoverSlots."); + Yap_Error(SYSTEM_ERROR, 0 /* TermNil */, "Inconsistent slot state in Yap_RecoverSlots."); return false; } #endif diff --git a/H/Yapproto.h b/H/Yapproto.h index 49e70e3ef..cbd25652b 100755 --- a/H/Yapproto.h +++ b/H/Yapproto.h @@ -371,7 +371,13 @@ int Yap_signal_index(const char *); #ifdef MAC void Yap_SetTextFile(char *); #endif -char *Yap_getcwd(const char *, size_t); +#if __ANDROIDD__ +extern AAssetManager * Yap_assetManager; + +extern void *Yap_openAssetFile( const char *path ) ; +extern bool Yap_isAsset( const char *path ); +#endif +const char *Yap_getcwd(const char *, size_t); void Yap_cputime_interval(Int *,Int *); void Yap_systime_interval(Int *,Int *); void Yap_walltime_interval(Int *,Int *); @@ -452,7 +458,7 @@ struct AtomEntryStruct *Yap_lookupBlob(void *blob, size_t len, void *type, int * void Yap_init_optyap_preds(void); /* pl-file.c */ -struct PL_local_data *Yap_InitThreadIO(int wid); +struct PL_local_data *Yap_InitThreadIO(int wid); void Yap_flush(void); /* pl-yap.c */ @@ -465,5 +471,3 @@ gc_P(yamop *p, yamop *cp) { return (p->opc == Yap_opcode(_execute_cpred) ? cp : p); } - - diff --git a/H/Yatom.h b/H/Yatom.h index 9976a5c03..dbcac3d47 100755 --- a/H/Yatom.h +++ b/H/Yatom.h @@ -188,7 +188,7 @@ IsFunctorProperty (int flags) 00 00 predicate entry 80 00 db property - bb 00 functor entry + bb 00 functor entry ff df sparse functor ff ex arithmetic property ff f4 translation @@ -404,7 +404,7 @@ AbsModProp (ModEntry * p) } #define ModToTerm(m) (m == PROLOG_MODULE ? TermProlog : m ) - + #endif #define ModProperty ((PropFlags)0xfffa) @@ -638,8 +638,8 @@ IsValProperty (int flags) return (PropFlags) ((flags == ValProperty)); } - typedef uint64_t pred_flags_t; - + typedef uint64_t pred_flags_t; + /* predicate property entry structure */ /* AsmPreds are things like var, nonvar, atom ...which are implemented @@ -749,12 +749,12 @@ typedef enum { #endif Term ModuleOfPred; /* module for this definition */ UInt TimeStampOfPred; - timestamp_type LastCallOfPred; + timestamp_type LastCallOfPred; /* This must be at an odd number of cells, otherwise it will not be aligned on RISC machines */ profile_data StatisticsForPred; /* enable profiling for predicate */ struct pred_entry *NextPredOfModule; /* next pred for same module */ -} PredEntry; + } PredEntry; #define PEProp ((PropFlags)(0x0000)) #if USE_OFFSETS_IN_PROPS @@ -1269,7 +1269,7 @@ Yap_GetTranslationProp(Atom at) if (p0 == NIL) return (TranslationEntry *)NULL; return p; } - + INLINE_ONLY inline EXTERN PropFlags IsTranslationProperty (int); INLINE_ONLY inline EXTERN PropFlags @@ -1361,7 +1361,7 @@ IsTranslationProperty (int flags) } /* end of code for named mutexes */ - + typedef enum { STATIC_ARRAY = 1, DYNAMIC_ARRAY = 2, @@ -1708,7 +1708,7 @@ GetPredPropByFuncHavingLock (FunctorEntry *fe, Term cur_mod) UInt hash = PRED_HASH(fe,cur_mod,PredHashTableSize); READ_LOCK(PredHashRWLock); p = PredHash[hash]; - + while (p) { if (p->FunctorOfPred == fe && p->ModuleOfPred == cur_mod) @@ -1766,7 +1766,7 @@ GetPredPropByFuncAndModHavingLock (FunctorEntry *fe, Term cur_mod) UInt hash = PRED_HASH(fe,cur_mod,PredHashTableSize); READ_LOCK(PredHashRWLock); p = PredHash[hash]; - + while (p) { if (p->FunctorOfPred == fe && p->ModuleOfPred == cur_mod) @@ -1883,11 +1883,11 @@ INLINE_ONLY EXTERN inline void AddPropToAtom(AtomEntry *, PropEntry *p); INLINE_ONLY EXTERN inline void AddPropToAtom(AtomEntry *ae, PropEntry *p) { - /* old properties should be always last, and wide atom properties + /* old properties should be always last, and wide atom properties should always be first */ if (ae->PropsOfAE != NIL && RepProp(ae->PropsOfAE)->KindOfPE == WideAtomProperty) { - PropEntry *pp = RepProp(ae->PropsOfAE); + PropEntry *pp = RepProp(ae->PropsOfAE); p->NextOfPE = pp->NextOfPE; pp->NextOfPE = AbsProp(p); } else { @@ -1898,4 +1898,3 @@ AddPropToAtom(AtomEntry *ae, PropEntry *p) #endif - diff --git a/H/amidefs.h b/H/amidefs.h index 0b4bec513..224042104 100644 --- a/H/amidefs.h +++ b/H/amidefs.h @@ -1089,8 +1089,6 @@ extern void **Yap_ABSMI_OPCODES; #endif - - #if DEPTH_LIMIT /* Make this into an even number so that the system will know diff --git a/H/arrays.h b/H/arrays.h index 6ee09a473..185ecbcc5 100644 --- a/H/arrays.h +++ b/H/arrays.h @@ -1,4 +1,4 @@ -/************************************************************************* + /************************************************************************* * * * YAP Prolog * * * @@ -25,4 +25,3 @@ typedef struct array_access_struct { Term indx; /* index in array, for now keep it as an integer! */ } array_access; - diff --git a/H/clause.h b/H/clause.h index ba8e95774..0bd3875df 100644 --- a/H/clause.h +++ b/H/clause.h @@ -201,7 +201,7 @@ INLINE_ONLY EXTERN inline CELL *EXO_OFFSET_TO_ADDRESS(struct index_t *it, BITS3 INLINE_ONLY EXTERN inline CELL * EXO_OFFSET_TO_ADDRESS(struct index_t *it, BITS32 off) { - if (off == 0L) + if (off == 0L) return (CELL *)NULL; return (it->cls)+(off-1)*it->arity; } @@ -258,8 +258,8 @@ typedef struct dbterm_list { #define CL_IN_USE(X) ((X)->ClRefCount) #else #define INIT_CLREF_COUNT(X) -#define INC_CLREF_COUNT(X) -#define DEC_CLREF_COUNT(X) +#define INC_CLREF_COUNT(X) +#define DEC_CLREF_COUNT(X) #define CL_IN_USE(X) ((X)->ClFlags & InUseMask || (X)->ClRefCount) #endif @@ -301,6 +301,7 @@ LogUpdClause *Yap_FollowIndexingCode(PredEntry *,yamop *, Term *, yamop *,yamop yamop *Yap_ExoLookup(PredEntry *ap USES_REGS); CELL Yap_NextExo(choiceptr cpt, struct index_t *it); +# #if USE_THREADED_CODE #define OP_HASH_SIZE 2048 @@ -359,7 +360,7 @@ same_lu_block(yamop **paddr, yamop *p) #define Yap_MkStaticRefTerm(cp, ap) __Yap_MkStaticRefTerm((cp), (ap) PASS_REGS) -static inline Term +static inline Term __Yap_MkStaticRefTerm(StaticClause *cp, PredEntry *ap USES_REGS) { Term t[2]; @@ -376,7 +377,7 @@ Yap_ClauseFromTerm(Term t) #define Yap_MkMegaRefTerm(ap, ipc) __Yap_MkMegaRefTerm((ap), (ipc) PASS_REGS) -static inline Term +static inline Term __Yap_MkMegaRefTerm(PredEntry *ap,yamop *ipc USES_REGS) { Term t[2]; @@ -385,13 +386,13 @@ __Yap_MkMegaRefTerm(PredEntry *ap,yamop *ipc USES_REGS) return Yap_MkApplTerm(FunctorMegaClause,2,t); } -static inline yamop * +static inline yamop * Yap_MegaClauseFromTerm(Term t) { return (yamop *)IntegerOfTerm(ArgOfTerm(2,t)); } -static inline PredEntry * +static inline PredEntry * Yap_MegaClausePredicateFromTerm(Term t) { return (PredEntry *)IntegerOfTerm(ArgOfTerm(1,t)); @@ -399,7 +400,7 @@ Yap_MegaClausePredicateFromTerm(Term t) #define Yap_MkExoRefTerm(ap, i) __Yap_MkExoRefTerm((ap), (i) PASS_REGS) -static inline Term +static inline Term __Yap_MkExoRefTerm(PredEntry *ap,Int i USES_REGS) { Term t[2]; @@ -408,13 +409,13 @@ __Yap_MkExoRefTerm(PredEntry *ap,Int i USES_REGS) return Yap_MkApplTerm(FunctorExoClause,2,t); } -static inline Int +static inline Int Yap_ExoClauseFromTerm(Term t) { return IntegerOfTerm(ArgOfTerm(2,t)); } -static inline PredEntry * +static inline PredEntry * Yap_ExoClausePredicateFromTerm(Term t) { return (PredEntry *)IntegerOfTerm(ArgOfTerm(1,t)); diff --git a/H/dglobals.h b/H/dglobals.h index 351568641..76e73d237 100644 --- a/H/dglobals.h +++ b/H/dglobals.h @@ -38,6 +38,7 @@ #if __ANDROID__ #define GLOBAL_assetManager Yap_global->assetManager_ +#define GLOBAL_AssetsWD Yap_global->AssetsWD_ #endif #if THREADS diff --git a/H/hglobals.h b/H/hglobals.h index 81493fb68..1592160bc 100644 --- a/H/hglobals.h +++ b/H/hglobals.h @@ -38,6 +38,7 @@ typedef struct global_data { #if __ANDROID__ struct AAssetManager* assetManager_; + char* AssetsWD_; #endif #if THREADS diff --git a/H/iglobals.h b/H/iglobals.h index 966291195..1e4540672 100644 --- a/H/iglobals.h +++ b/H/iglobals.h @@ -37,7 +37,8 @@ static void InitGlobal(void) { GLOBAL_AGCHook = NULL; #if __ANDROID__ - GLOBAL_assetManager = GLOBAL_assetManager; + GLOBAL_assetManager = NULL; + GLOBAL_AssetsWD = NULL; #endif #if THREADS diff --git a/H/pl-codelist.h b/H/pl-codelist.h index 49a37cc6c..3ef9a3a45 100644 --- a/H/pl-codelist.h +++ b/H/pl-codelist.h @@ -26,21 +26,21 @@ EXTEND_SEQ_CHARS(Word ptr, int c) { return ptr+2; } -static inline int +static inline int CLOSE_SEQ_STRING(Word p, Word p0, term_t tail, term_t term, term_t l) { CACHE_REGS Yap_PutInSlot(l, AbsPair(p0) PASS_REGS); p--; if (tail) { RESET_VARIABLE(p); - if (Yap_unify(Yap_GetFromSlot(l PASS_REGS), Yap_GetFromSlot(term PASS_REGS))) { + if (Yap_unify(Yap_GetFromSlot(l), Yap_GetFromSlot(term))) { Yap_PutInSlot(tail, (CELL)(p) PASS_REGS); return TRUE; } return FALSE; } else { p[0] = TermNil; - return Yap_unify(Yap_GetFromSlot(l PASS_REGS), Yap_GetFromSlot(term PASS_REGS)); + return Yap_unify(Yap_GetFromSlot(l), Yap_GetFromSlot(term )); } } diff --git a/H/pl-global.h b/H/pl-global.h index b8744bc23..4a58843f7 100755 --- a/H/pl-global.h +++ b/H/pl-global.h @@ -188,6 +188,7 @@ typedef struct { int optimise; /* -O: optimised compilation */ } cmdline; +#if 0 struct { //char * CWDdir; //size_t CWDlen; @@ -196,6 +197,7 @@ typedef struct { char * module; /* argv[0] module passed */ #endif } paths; +#endif struct { ExtensionCell _ext_head; /* head of registered extensions */ @@ -251,7 +253,7 @@ typedef struct { /* Procedure dc_call_prolog0; /\* $c_call_prolog/0 *\/ */ /* #ifdef O_ATTVAR */ /* Procedure dwakeup1; /\* system:$wakeup/1 *\/ */ - predicate_t portray_attvar1; /* $attvar:portray_attvar/1 */ + predicate_t portray_attvar1; /* $attvar:portray_attvar/1 */ /* #endif */ /* #ifdef O_CALL_RESIDUE */ /* Procedure call_residue_vars2; /\* $attvar:call_residue_vars/2 *\/ */ @@ -390,7 +392,7 @@ typedef struct PL_local_data { #ifdef O_GMP struct - { + { int persistent; /* do persistent operations */ } gmp; #endif @@ -411,4 +413,3 @@ typedef struct PL_local_data { extern PL_local_data_t lds; #endif - diff --git a/H/pl-incl.h b/H/pl-incl.h index 40eef17ee..184feceac 100755 --- a/H/pl-incl.h +++ b/H/pl-incl.h @@ -141,7 +141,7 @@ typedef int Char; /* char that can pass EOF */ typedef enum { V_INTEGER, /* integer (64-bit) value */ -#ifdef O_GMP +#ifdef O_GMP V_MPZ, /* mpz_t */ V_MPQ, /* mpq_t */ #endif @@ -226,7 +226,7 @@ typedef enum #endif typedef Term PL_atomic_t; /* same size as a word */ -typedef struct record * Record; +typedef struct record * Record; #define MAXSIGNAL 64 @@ -242,7 +242,7 @@ users foreign language code. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #define NOTRACE PL_FA_NOTRACE -#define META PL_FA_TRANSPARENT +#define METAP PL_FA_TRANSPARENT #define NDET PL_FA_NONDETERMINISTIC #define VA PL_FA_VARARGS #define CREF PL_FA_CREF @@ -491,7 +491,7 @@ typedef struct wakeup_state /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Defining built-in predicates using the new interface +Defining built-in predicates using the new interface - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #define ESC ((char) 27) @@ -698,19 +698,19 @@ extern int System(char *cmd); extern char *expandVars(const char *pattern, char *expanded, int maxlen); PL_EXPORT(bool) ChDir(const char *X); - + #if _WIN32 || defined(__MINGW32__) PL_EXPORT(char *) BaseName(const char *X); -PL_EXPORT(char *) DirName(const char *f); +PL_EXPORT(char *) DirName(const char *f); #else -#define BaseName basename +#define BaseName basename #define DirName dirname #endif PL_EXPORT(char *) OsPath(const char *X, char *Y); - - + + #define DeleteTemporaryFile(F) RemoveFile(stringAtom(F)) PL_EXPORT(intptr_t) lengthList(term_t list, int errors); diff --git a/H/pl-yap.h b/H/pl-yap.h index 400870e4c..091c9454e 100644 --- a/H/pl-yap.h +++ b/H/pl-yap.h @@ -75,16 +75,16 @@ COMMON(word) pl_writeq(term_t term); static inline int get_procedure(term_t descr, predicate_t *proc, term_t he, int f) { CACHE_REGS - Term t = Yap_GetFromSlot(descr PASS_REGS); + Term t = Yap_GetFromSlot(descr ); if (IsVarTerm(t)) return FALSE; - if (IsAtomTerm(t)) + if (IsAtomTerm(t)) *proc = RepPredProp(Yap_GetPredPropByAtom(AtomOfTerm(t),CurrentModule)); else if (IsApplTerm(t)) { Functor f = FunctorOfTerm(t); if (IsExtensionFunctor(f)) { return FALSE; - } + } *proc = RepPredProp(Yap_GetPredPropByFunc(f, CurrentModule)); } return TRUE; @@ -125,7 +125,7 @@ void PL_license(const char *license, const char *module); inline static char * atomName(Atom atom) { - if (IsWideAtom(atom)) + if (IsWideAtom(atom)) return (char *)(atom->WStrOfAE); return atom->StrOfAE; } @@ -143,7 +143,7 @@ atomName(Atom atom) Procedure resolveProcedure(functor_t f, Module module); #define charEscapeWriteOption(A) FALSE // VSC: to implement -#define wordToTermRef(A) Yap_InitSlot(*(A) PASS_REGS) +#define wordToTermRef(A) Yap_InitSlot(*(A)) #define isTaggedInt(A) IsIntegerTerm(A) #define valInt(A) IntegerOfTerm(A) @@ -161,7 +161,7 @@ int isWideAtom(atom_t atom); inline static int charCode(Term w) { if ( IsAtomTerm(w) ) - { + { Atom a = atomValue(w); if (IsWideAtom(a)) { @@ -203,7 +203,7 @@ stripostfix(const char *s, const char *e) return strcasecmp(&s[ls-le], e) == 0; return FALSE; -} +} #endif #if HAVE_SIGPROCMASK diff --git a/H/rglobals.h b/H/rglobals.h index f68b2006e..a39343419 100644 --- a/H/rglobals.h +++ b/H/rglobals.h @@ -38,6 +38,7 @@ static void RestoreGlobal(void) { #if __ANDROID__ + #endif #if THREADS diff --git a/Makefile.in b/Makefile.in index e767bce79..e53ebec21 100755 --- a/Makefile.in +++ b/Makefile.in @@ -18,19 +18,21 @@ YAPLIBDIR=@libdir@/Yap # # where YAP should look for architecture-independent Prolog libraries # -SHAREDIR=$(ROOTDIR)/share +DATAROOTDIR=@datarootdir@ +# +SHAREDIR=$(DATAROOTDIR) # # where the includes should be stored # -INCLUDEDIR=$(ROOTDIR)/include/Yap +INCLUDEDIR=@includedir@/Yap # # where to store info files # -INFODIR=$(SHAREDIR)/info +INFODIR=$(DATAROOTDIR)/info # # where to store documentation files # -DOCSDIR=$(SHAREDIR)/doc/Yap +DOCSDIR=$(SHAREDIR)/doc/yap # # Add this flag to YAP_EXTRAS if you need the extension: @@ -413,8 +415,8 @@ JIT_OBJECTS = \ @JITDEBUGPREDS@ \ @JITSTATISTICPREDS@ -MYDDAS_OBJECTS = \ - @INCLUDE_MYDDAS@ myddas_initialization.o \ +MYDDAS_ALL_OBJECTS = \ + myddas_initialization.o \ myddas_mysql.o \ myddas_odbc.o \ myddas_postgres.o \ @@ -424,6 +426,8 @@ MYDDAS_OBJECTS = \ myddas_util.o \ myddas_wkb2prolog.o +MYDDAS_OBJECTS = @OBJECTS_MYDDAS@ + LIBTAI_OBJECTS = \ tai_add.o tai_now.o tai_pack.o \ tai_sub.o tai_unpack.o taia_add.o taia_approx.o \ @@ -465,7 +469,15 @@ PLCONS_OBJECTS = \ pl-ntmain.o \ yapres.o -all: startup.yss @WINDOWS@ yap-win@EXEC_SUFFIX@ +all: "$(STARTUP_ANDROID)android-setup startup.yss windowsi + +xandroid-setup: + ( cd packages/swig && make android/jni/Android.mk ) + +android-setup: + +windowsi: + @WINDOWS@ yap-win@EXEC_SUFFIX@ Makefile: Makefile.in @@ -507,7 +519,7 @@ save.o: C/save.c %.o: BEAM/%.c config.h $(CC) -c $(CFLAGS) $< -o $@ -yapi.o: CXX/yapi.cpp CXX/yapi.hh config.h +yapi.o: CXX/yapi.cpp CXX/yapi.hh CXX/yapq.hh CXX/yapt.hh CXX/yapdb.hh CXX/yapie.hh CXX/yapa.hh config.h $(CXX) -c $(CXXFLAGS) $< -o $@ sys.o: library/system/sys.c config.h @@ -640,34 +652,27 @@ libYap.a: $(LIB_OBJECTS) yapi.o done @STARTUP_ANDROID@startup.yss: yap@EXEC_SUFFIX@ @DYNYAPLIB@ $(PL_SOURCES) $(SWI_LIB_SOURCES) - adb shell rm -rf /data/yap - adb shell mkdir -p /data/yap - adb shell mkdir -p /data/yap/pl - adb shell mkdir -p /data/yap/swi/library - adb shell mkdir -p /data/yap/packages/chr - adb shell mkdir -p /data/yap/packages/clib - adb shell mkdir -p /data/yap/packages/myddas - adb shell mkdir -p /data/yap/assets/myddas - adb shell mkdir -p /data/yap/assets/lib - adb shell mkdir -p /data/yap/assets/share - adb push yap /data/yap/ - adb push @DYNYAPLIB@ /data/yap/ + \rm -rf data/yap + mkdir -p data/yap/packages + mkdir -p data/yap/swi + cp -a yap data/yap + cp -a @DYNYAPLIB@ data/yap for p in $(EXTRAYAPLIBS); do \ - adb shell $(LN_S) /data/yap/@DYNYAPLIB@ /data/yap/$$p; \ + (cd data/yap && $(LN_S) @DYNYAPLIB@ $$p ); \ done - adb push $(GMPDIR)/lib/libgmp.so /data/yap - adb push $(SQLITE3DIR)/lib/libsqliteX.so /data/yap - #adb push packages/clib/*.so /data/yap - #adb push library/system/*.so /data/yap - adb push $(srcdir)/swi/library /data/yap/swi/library - adb push $(srcdir)/pl /data/yap/pl/ - adb push $(srcdir)/library /data/yap/library/ - adb push $(srcdir)/packages/myddas /data/yap/packages/myddas/ - adb push $(srcdir)/packages/chr /data/yap/packages/chr/ - adb push $(srcdir)/packages/clib /data/yap/packages/clib/ + cp -a ../../gmp-android/lib/libgmp.so data/yap + cp -a ../../sqlite3-android/lib/libsqliteX.so data/yap + cp -a $(srcdir)/pl data/yap + cp -a $(srcdir)/library data/yap + cp -a $(srcdir)/swi/library data/yap/swi + cp -a $(srcdir)/packages/clib data/yap/packages + cp -a $(srcdir)/packages/chr data/yap/packages + cp -a $(srcdir)/packages/myddas data/yap/packages + \rm -rf data/yap/packages/*/.git + adb push data/yap /data/yap >/dev/null 2>&1 adb shell "echo \"bootstrap('/data/yap/pl/init.yap'). module(user). qsave_program('/data/yap/startup.yss').\" | LD_LIBRARY_PATH=/data/yap /data/yap/yap@EXEC_SUFFIX@ -b /data/yap/pl/boot.yap" adb pull /data/yap/startup.yss - #adb shell rm -rf /data/yap + install: @INSTALL_COMMAND@ install_startup install_common diff --git a/config.h.in b/config.h.in index dcf4b04e5..5435ff015 100644 --- a/config.h.in +++ b/config.h.in @@ -1,8 +1,5 @@ /* config.h.in. Generated from configure.in by autoheader. */ -/* Define if building universal (internal helper macro) */ -#undef AC_APPLE_UNIVERSAL_BUILD - /* longs should be in addresses that are multiple of four. */ #undef ALIGN_LONGS @@ -331,9 +328,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_GMP_H -/* Define to 1 if you have the `gmtime' function. */ -#undef HAVE_GMTIME - /* Define of h_errno is provided */ #undef HAVE_H_ERRNO @@ -475,9 +469,6 @@ /* Define to 1 if you have the `localtime' function. */ #undef HAVE_LOCALTIME -/* Define to 1 if the system has the type `long long'. */ -#undef HAVE_LONG_LONG - /* Define to 1 if you have the `lstat' function. */ #undef HAVE_LSTAT @@ -743,12 +734,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SQLITE3_H -/* Define to 1 if the system has the type `SQLLEN'. */ -#undef HAVE_SQLLEN - -/* Define to 1 if the system has the type `SQLULEN'. */ -#undef HAVE_SQLULEN - /* Define to 1 if you have the header file. */ #undef HAVE_SQL_H @@ -884,9 +869,6 @@ /* Define to 1 if you have the `time' function. */ #undef HAVE_TIME -/* Define to 1 if you have the `timegm' function. */ -#undef HAVE_TIMEGM - /* Define to 1 if you have the `times' function. */ #undef HAVE_TIMES @@ -1067,9 +1049,6 @@ /* The size of `short int', as computed by sizeof. */ #undef SIZEOF_SHORT_INT -/* The size of `SQLWCHAR', as computed by sizeof. */ -#undef SIZEOF_SQLWCHAR - /* The size of `void*', as computed by sizeof. */ #undef SIZEOF_VOIDP @@ -1130,18 +1109,6 @@ /* Define to name of the UUID header file. */ #undef UUID_H -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -# undef WORDS_BIGENDIAN -# endif -#endif - /* architecture */ #undef YAP_ARCH @@ -1157,13 +1124,13 @@ /* numerical version */ #undef YAP_NUMERIC_VERSION -/* where to look for Prolog sources */ +/* where YAP lives */ #undef YAP_PL_SRCDIR /* where YAP lives */ #undef YAP_ROOTDIR -/* where to look for the Prolog library */ +/* where YAP lives */ #undef YAP_SHAREDIR /* saved state file */ diff --git a/configure b/configure index d124cb158..e2544020b 100755 --- a/configure +++ b/configure @@ -690,16 +690,12 @@ CPLINT_LIBS CUDD_CPPFLAGS CUDD_LIBS PKG_BDDLIB -ODBC_LIBS -ODBC_LDFLAGS -ODBC_CFLAGS -ODBC_PLTARGETS -ODBC_TARGETS ARCHIVE_LDFLAGS ARCHIVE_CPPFLAGS ARCHIVE_LIBS ARCHIVE_PLTARGETS ARCHIVE_TARGETS +CLIB_CPPFLAGS CLIB_LIBUUID CLIB_CRYPTOBJ CLIB_CRYPTLIBS @@ -725,7 +721,7 @@ JITFLAGS LLVM_CONFIG MYDDAS_LIBS MYDDAS_CPPFLAGS -INCLUDE_MYDDAS +OBJECTS_MYDDAS PKG_MYDDAS EXTRA_LIBS_FOR_SWIDLLS CLIB_PTHREADS @@ -1613,7 +1609,6 @@ Optional Packages: --without-time Exclude alarm library --with-libarchive=DIR libarchive package - --with-odbc= Location of ODBC include/lib --with-cudd=DIR use CUDD package in DIR --with-cplint=DIR with the cplint library using the CUDD library in DIR/lib --with-zlib=DIR zlib compression library @@ -7259,13 +7254,6 @@ else PKG_LIBARCHIVE="" fi -if test -e "$srcdir"/packages/odbc/Makefile.in -then - PKG_ODBC="packages/odbc" -else - PKG_ODBC="" -fi - if test "$use_chr" = no then PKG_CHR="" @@ -11219,11 +11207,11 @@ else ENABLE_MYDDAS="" fi -INCLUDE_MYDDAS="#" +OBJECTS_MYDDAS="#" if test x"$ENABLE_MYDDAS" = x -a x"$STARTUP_ANDROID" = x then #in Android we have to actually include myddas in the binary - INCLUDE_MYDDAS="" + OBJECTS_MYDDAS="$(ALL_MYDDAS_OBJECTS)" fi @@ -12215,6 +12203,7 @@ fi + CLIB_TARGETS="socket.$SO cgi.$SO memfile.$SO files.$SO mime.$SO crypt.$SO time.$SO" case "$PLARCH" in @@ -12394,7 +12383,69 @@ fi fi +dl to be installed in various places. +# brew in OSX +if test -d /usr/local/opt/ossp-uuid; then + CPPFLAGS="$CPPFLAGS -I /usr/local/opt/ossp-uuid/include" + UUID_LIB_PATH="-L /usr/local/opt/ossp-uuid/lib" +fi + +# /opt +if test -d /opt/include/ossp; then + CPPFLAGS="$CPPFLAGS -I /opt/include" + UUID_LIB_PATH="-L /opt/lib" +fi + +# /usr/local +if test -d /opt/include/ossp; then + CPPFLAGS="$CPPFLAGS -I /opt/include" + UUID_LIB_PATH="-L /opt/lib" +fi + +if test x"$UUID_H" = "x"; then + ac_fn_c_check_header_compile "$LINENO" "ossp/uuid.h" "ac_cv_header_ossp_uuid_h" "/*first*/ +" +if test "x$ac_cv_header_ossp_uuid_h" = xyes; then : + UUID_H=ossp/uuid.h + has_uuid=true +fi + + +fi +if test x"$UUID_H" = "x" -a ! -d /usr/include/uuid; then + ac_fn_c_check_header_compile "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "/*first*/ +" +if test "x$ac_cv_header_uuid_uuid_h" = xyes; then : + UUID_H=uuid/uuid.h + has_uuid=true +fi + + +fi +if test x"$UUID_H" = "x"; then + ac_fn_c_check_header_compile "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "/*first*/ +" +if test "x$ac_cv_header_uuid_h" = xyes; then : + UUID_H=uuid.h + has_uuid=true +fi + + +fi +if test x"$UUID_H" = "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find uuid.h -- dropping uuid.pl" >&5 +$as_echo "$as_me: WARNING: Cannot find uuid.h -- dropping uuid.pl" >&2;} +else + +cat >>confdefs.h <<_ACEOF +#define UUID_H <$UUID_H> +_ACEOF + + has_uuid=true +fi + +if test x"$has_uuid" != "x"; then ac_fn_c_check_func "$LINENO" "uuid_create" "ac_cv_func_uuid_create" if test "x$ac_cv_func_uuid_create" = xyes; then : has_uuid=true @@ -12438,7 +12489,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_create" >&5 $as_echo "$ac_cv_lib_uuid_uuid_create" >&6; } if test "x$ac_cv_lib_uuid_uuid_create" = xyes; then : - CLIB_LIBUUID=-luuid + CLIB_LIBUUID="$UUID_LIB_PATH -luuid" has_uuid=true fi @@ -12452,45 +12503,6 @@ $as_echo "$as_me: WARNING: Cannot find libossp-uuid or libuuid -- dropping uuid fi -if test x"$has_uuid" != "x"; then - if test x"$UUID_H" = "x"; then - ac_fn_c_check_header_compile "$LINENO" "ossp/uuid.h" "ac_cv_header_ossp_uuid_h" "/*first*/ -" -if test "x$ac_cv_header_ossp_uuid_h" = xyes; then : - UUID_H=ossp/uuid.h -fi - - - fi - if test x"$UUID_H" = "x" -a ! -d /usr/include/uuid; then - ac_fn_c_check_header_compile "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "/*first*/ -" -if test "x$ac_cv_header_uuid_uuid_h" = xyes; then : - UUID_H=uuid/uuid.h -fi - - - fi - if test x"$UUID_H" = "x"; then - ac_fn_c_check_header_compile "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "/*first*/ -" -if test "x$ac_cv_header_uuid_h" = xyes; then : - UUID_H=uuid.h -fi - - - fi - if test x"$UUID_H" = "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find uuid.h -- dropping uuid.pl" >&5 -$as_echo "$as_me: WARNING: Cannot find uuid.h -- dropping uuid.pl" >&2;} - else - -cat >>confdefs.h <<_ACEOF -#define UUID_H <$UUID_H> -_ACEOF - - CLIB_TARGETS="$CLIB_TARGETS uuid.$SO" - fi fi @@ -12835,6 +12847,7 @@ if echo "$CLIB_PLTARGETS" | grep socket.pl 2>&1 >/dev/null; then CLIB_PLTARGETS="$CLIB_PLTARGETS streampool.pl" fi +CLIB_CPPFLAGS="$CPPFLAGS" @@ -13024,608 +13037,6 @@ fi fi -if test "$PKG_ODBC" != ""; then - - - - - - - - - - - - - -# Check whether --with-odbc was given. -if test "${with_odbc+set}" = set; then : - withval=$with_odbc; case $withval in - no|yes) echo 'Specify dir for ODBC please'; - exit 1 ;; - *) ODBC_DIR=${withval} - esac -fi - - -if test ! -z "$ODBC_DIR"; then - ODBC_CFLAGS="-I${ODBC_DIR}/include" - ODBC_LDFLAGS="-L${ODBC_DIR}/lib" - CFLAGS="-I${ODBC_DIR}/include ${CFLAGS}" - CPPFLAGS="-I${ODBC_DIR}/include ${CPPFLAGS}" - CIFLAGS="-I${ODBC_DIR}/include ${CIFLAGS}" - LDFLAGS="-L${ODBC_DIR}/lib ${LDFLAGS}" -fi - -havelib=no -case "$PLARCH" in - *-win32|*-win64) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lodbc32" >&5 -$as_echo_n "checking for main in -lodbc32... " >&6; } -if ${ac_cv_lib_odbc32_main+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lodbc32 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_odbc32_main=yes -else - ac_cv_lib_odbc32_main=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_odbc32_main" >&5 -$as_echo "$ac_cv_lib_odbc32_main" >&6; } -if test "x$ac_cv_lib_odbc32_main" = xyes; then : - ODBC_LIBS="-lodbc32 $LIBS" - havelib=yes -fi - - ;; - *) - if test $havelib = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLAllocEnv in -lodbc" >&5 -$as_echo_n "checking for SQLAllocEnv in -lodbc... " >&6; } -if ${ac_cv_lib_odbc_SQLAllocEnv+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lodbc $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char SQLAllocEnv (); -int -main () -{ -return SQLAllocEnv (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_odbc_SQLAllocEnv=yes -else - ac_cv_lib_odbc_SQLAllocEnv=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_odbc_SQLAllocEnv" >&5 -$as_echo "$ac_cv_lib_odbc_SQLAllocEnv" >&6; } -if test "x$ac_cv_lib_odbc_SQLAllocEnv" = xyes; then : - ODBC_LIBS="-lodbc $LIBS" - havelib=yes -fi - - if test $havelib = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLAllocEnv in -liodbc" >&5 -$as_echo_n "checking for SQLAllocEnv in -liodbc... " >&6; } -if ${ac_cv_lib_iodbc_SQLAllocEnv+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-liodbc $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char SQLAllocEnv (); -int -main () -{ -return SQLAllocEnv (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_iodbc_SQLAllocEnv=yes -else - ac_cv_lib_iodbc_SQLAllocEnv=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iodbc_SQLAllocEnv" >&5 -$as_echo "$ac_cv_lib_iodbc_SQLAllocEnv" >&6; } -if test "x$ac_cv_lib_iodbc_SQLAllocEnv" = xyes; then : - ODBC_LIBS="-liodbc $LIBS" - havelib=yes -fi - - fi - fi -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -$as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if ${ac_cv_c_bigendian+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_bigendian=unknown - # See if we're dealing with a universal compiler. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __APPLE_CC__ - not a universal capable compiler - #endif - typedef int dummy; - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - - # Check for potential -arch flags. It is not universal unless - # there are at least two -arch flags with different values. - ac_arch= - ac_prev= - for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do - if test -n "$ac_prev"; then - case $ac_word in - i?86 | x86_64 | ppc | ppc64) - if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then - ac_arch=$ac_word - else - ac_cv_c_bigendian=universal - break - fi - ;; - esac - ac_prev= - elif test "x$ac_word" = "x-arch"; then - ac_prev=arch - fi - done -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test $ac_cv_c_bigendian = unknown; then - # See if sys/param.h defines the BYTE_ORDER macro. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include - -int -main () -{ -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ - && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ - && LITTLE_ENDIAN) - bogus endian macros - #endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - # It does; now see whether it defined to BIG_ENDIAN or not. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include - -int -main () -{ -#if BYTE_ORDER != BIG_ENDIAN - not big endian - #endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_bigendian=yes -else - ac_cv_c_bigendian=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $ac_cv_c_bigendian = unknown; then - # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -int -main () -{ -#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) - bogus endian macros - #endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - # It does; now see whether it defined to _BIG_ENDIAN or not. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -int -main () -{ -#ifndef _BIG_ENDIAN - not big endian - #endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_bigendian=yes -else - ac_cv_c_bigendian=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $ac_cv_c_bigendian = unknown; then - # Compile a test program. - if test "$cross_compiling" = yes; then : - # Try to guess by grepping values from an object file. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -short int ascii_mm[] = - { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; - short int ascii_ii[] = - { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; - int use_ascii (int i) { - return ascii_mm[i] + ascii_ii[i]; - } - short int ebcdic_ii[] = - { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; - short int ebcdic_mm[] = - { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; - int use_ebcdic (int i) { - return ebcdic_mm[i] + ebcdic_ii[i]; - } - extern int foo; - -int -main () -{ -return use_ascii (foo) == use_ebcdic (foo); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then - ac_cv_c_bigendian=yes - fi - if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then - if test "$ac_cv_c_bigendian" = unknown; then - ac_cv_c_bigendian=no - else - # finding both strings is unlikely to happen, but who knows? - ac_cv_c_bigendian=unknown - fi - fi -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ - - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long int l; - char c[sizeof (long int)]; - } u; - u.l = 1; - return u.c[sizeof (long int) - 1] == 1; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_c_bigendian=no -else - ac_cv_c_bigendian=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 -$as_echo "$ac_cv_c_bigendian" >&6; } - case $ac_cv_c_bigendian in #( - yes) - $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h -;; #( - no) - ;; #( - universal) - -$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h - - ;; #( - *) - as_fn_error $? "unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; - esac - - -for ac_header in malloc.h time.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - -for ac_header in sql.h -do : - ac_fn_c_check_header_compile "$LINENO" "sql.h" "ac_cv_header_sql_h" " -#ifdef __WINDOWS__ -#include -#endif - -" -if test "x$ac_cv_header_sql_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SQL_H 1 -_ACEOF - -fi - -done - -for ac_func in localtime mktime gmtime timegm -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - -ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default" -if test "x$ac_cv_type_long_long" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_LONG_LONG 1 -_ACEOF - - -fi - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 -$as_echo_n "checking size of long... " >&6; } -if ${ac_cv_sizeof_long+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (long) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_long=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -$as_echo "$ac_cv_sizeof_long" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG $ac_cv_sizeof_long -_ACEOF - - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of SQLWCHAR" >&5 -$as_echo_n "checking size of SQLWCHAR... " >&6; } -if ${ac_cv_sizeof_SQLWCHAR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (SQLWCHAR))" "ac_cv_sizeof_SQLWCHAR" " -#ifdef __WINDOWS__ -#include -#endif -#include - -"; then : - -else - if test "$ac_cv_type_SQLWCHAR" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (SQLWCHAR) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_SQLWCHAR=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_SQLWCHAR" >&5 -$as_echo "$ac_cv_sizeof_SQLWCHAR" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SQLWCHAR $ac_cv_sizeof_SQLWCHAR -_ACEOF - - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5 -$as_echo_n "checking size of wchar_t... " >&6; } -if ${ac_cv_sizeof_wchar_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_wchar_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (wchar_t) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_wchar_t=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_wchar_t" >&5 -$as_echo "$ac_cv_sizeof_wchar_t" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t -_ACEOF - - -ac_fn_c_check_type "$LINENO" "SQLLEN" "ac_cv_type_SQLLEN" " -#ifdef __WINDOWS__ -#include -#endif -#include - -" -if test "x$ac_cv_type_SQLLEN" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_SQLLEN 1 -_ACEOF - - -fi -ac_fn_c_check_type "$LINENO" "SQLULEN" "ac_cv_type_SQLULEN" " -#ifdef __WINDOWS__ -#include -#endif -#include - -" -if test "x$ac_cv_type_SQLULEN" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_SQLULEN 1 -_ACEOF - - -fi - - -if test "$havelib" = yes && - test "$ac_cv_header_sql_h" = yes; then - ODBC_TARGETS="odbc4pl.$SO" -else - echo "ERROR: Cannot find odbc library or the header sql.h" - echo "WARNING: ODBC interface will not be built" - ODBC_TARGETS="" -fi - -ODBC_PLTARGETS=`echo $ODBC_TARGETS | sed "s/4pl\.$SO/.pl/g"` - - - - - - -if test "$ODBC_TARGETS" = "nolib" -then - PKG_ODBC="" -fi - -else - ODBC_TARGETS=nolib - ODBC_PLTARGETS=odbc.pl -fi - - # Check whether --with-cudd was given. @@ -14731,7 +14142,7 @@ else JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 14734 "configure" */ +/* #line 14145 "configure" */ public class Test { } EOF @@ -14907,7 +14318,7 @@ EOF if uudecode$EXEEXT Test.uue; then ac_cv_prog_uudecode_base64=yes else - echo "configure: 14910: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 14321: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -15038,7 +14449,7 @@ else JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 15041 "configure" */ +/* #line 14452 "configure" */ public class Test { } EOF @@ -15073,7 +14484,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -/* [#]line 15076 "configure" */ +/* [#]line 14487 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); @@ -16054,7 +15465,6 @@ LTLIBOBJS=$ac_ltlibobjs - : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files @@ -17741,10 +17151,11 @@ fi if test "$PKG_SWIG" != ""; then +mkdir -p packages/swig/android +mkdir -p packages/swig/android/usr mkdir -p packages/swig/python mkdir -p packages/swig/R mkdir -p packages/swig/java -mkdir -p packages/swig/fli mkdir -p packages/swig/jni @@ -18208,6 +17619,10 @@ yap_timestamp=`date` yap_nversion=`expr $YAP_MAJOR_VERSION \* 10000 + $YAP_MINOR_VERSION \* 100 + $YAP_POINT_VERSION` yap_startup=startup.yss +BINDIR=$bindir +DATAROOTDIR="$prefix"/share +BINDIR="$bindir" + cat >>confdefs.h <<_ACEOF #define YAP_STARTUP "$yap_startup" @@ -18255,7 +17670,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF -#define YAP_BINDIR "$prefix/bin" +#define YAP_BINDIR "$BINDIR" _ACEOF @@ -18265,7 +17680,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF -#define YAP_LIBDIR "$prefix/lib/Yap" +#define YAP_LIBDIR "$LIBDIR/Yap" _ACEOF @@ -18274,18 +17689,18 @@ cat >>confdefs.h <<_ACEOF _ACEOF -cat >>confdefs.h <<_ACEOF -#define YAP_PL_SRCDIR "$prefix/share/Yap/pl" -_ACEOF - - cat >>confdefs.h <<_ACEOF #define YAP_ROOTDIR "$prefix" _ACEOF cat >>confdefs.h <<_ACEOF -#define YAP_SHAREDIR "$prefix/share" +#define YAP_SHAREDIR "$DATAROOTDIR" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define YAP_PL_SRCDIR "$DATAROOTDIR/Yap/pl" _ACEOF @@ -18347,7 +17762,6 @@ mkdir -p packages/prism/src/c/up mkdir -p packages/prism/src/prolog mkdir -p packages/ProbLog mkdir -p packages/ProbLog/simplecudd -mkdir -p packages/prosqlite mkdir -p packages/R mkdir -p packages/RDF mkdir -p packages/real @@ -18468,12 +17882,6 @@ ac_config_files="$ac_config_files packages/archive/Makefile" fi -if test "$PKG_ODBC" != ""; then -ac_config_files="$ac_config_files packages/odbc/Makefile" - -fi - - if test "$PKG_MINISAT" != ""; then ac_config_files="$ac_config_files packages/swi-minisat2/Makefile" @@ -18507,11 +17915,6 @@ ac_config_files="$ac_config_files packages/prism/src/prolog/Makefile" fi -if test "$PKG_PROSQLITE" != ""; then - ac_config_files="$ac_config_files packages/prosqlite/Makefile" - -fi - if test "$PKG_WINCONSOLE" != ""; then ac_config_files="$ac_config_files swi/console/Makefile" @@ -18630,7 +18033,6 @@ LTLIBOBJS=$ac_ltlibobjs - : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files @@ -19262,7 +18664,6 @@ do "packages/sgml/Makefile") CONFIG_FILES="$CONFIG_FILES packages/sgml/Makefile" ;; "packages/zlib/Makefile") CONFIG_FILES="$CONFIG_FILES packages/zlib/Makefile" ;; "packages/archive/Makefile") CONFIG_FILES="$CONFIG_FILES packages/archive/Makefile" ;; - "packages/odbc/Makefile") CONFIG_FILES="$CONFIG_FILES packages/odbc/Makefile" ;; "packages/swi-minisat2/Makefile") CONFIG_FILES="$CONFIG_FILES packages/swi-minisat2/Makefile" ;; "packages/swi-minisat2/C/Makefile") CONFIG_FILES="$CONFIG_FILES packages/swi-minisat2/C/Makefile" ;; "packages/real/Makefile") CONFIG_FILES="$CONFIG_FILES packages/real/Makefile" ;; @@ -19272,7 +18673,6 @@ do "packages/CLPBN/horus/Makefile") CONFIG_FILES="$CONFIG_FILES packages/CLPBN/horus/Makefile" ;; "packages/prism/src/c/Makefile") CONFIG_FILES="$CONFIG_FILES packages/prism/src/c/Makefile" ;; "packages/prism/src/prolog/Makefile") CONFIG_FILES="$CONFIG_FILES packages/prism/src/prolog/Makefile" ;; - "packages/prosqlite/Makefile") CONFIG_FILES="$CONFIG_FILES packages/prosqlite/Makefile" ;; "swi/console/Makefile") CONFIG_FILES="$CONFIG_FILES swi/console/Makefile" ;; "packages/yap-lbfgs/Makefile") CONFIG_FILES="$CONFIG_FILES packages/yap-lbfgs/Makefile" ;; diff --git a/configure.in b/configure.in index d7a574b96..3d3f3f848 100755 --- a/configure.in +++ b/configure.in @@ -639,8 +639,8 @@ then YAP_TARGET=amd64 AC_CHECK_LIB(ws2_32,main) AC_CHECK_LIB(comdlg32,main) - AC_CHECK_LIB(shell32,main) - AC_CHECK_LIB(shlwapi,main) + AC_CHECK_LIB(shell32,main) + AC_CHECK_LIB(shlwapi,main) EXTRA_LIBS_FOR_DLLS="-lws2_32" elif test "$target_os" = "cygwin"; then CC="${CC} -mno-cygwin" @@ -653,7 +653,7 @@ then AC_CHECK_LIB(wsock32,main) AC_CHECK_LIB(comdlg32,main) AC_CHECK_LIB(shell32,main) - AC_CHECK_LIB(shlwapi,main) + AC_CHECK_LIB(shlwapi,main) fi AC_DEFINE(__WINDOWS__, 1, [compiling for Windows]) EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll $EXTRA_LIBS_FOR_DLLS" @@ -793,13 +793,6 @@ else PKG_LIBARCHIVE="" fi -if test -e "$srcdir"/packages/odbc/Makefile.in -then - PKG_ODBC="packages/odbc" -else - PKG_ODBC="" -fi - if test "$use_chr" = no then PKG_CHR="" @@ -2038,21 +2031,6 @@ fi fi -if test "$PKG_ODBC" != ""; then - -m4_include([packages/odbc/configure.in]) - -if test "$ODBC_TARGETS" = "nolib" -then - PKG_ODBC="" -fi - -else - ODBC_TARGETS=nolib - ODBC_PLTARGETS=odbc.pl -fi - - m4_include([packages/bdd/configure.in]) m4_include([packages/cplint/configure.in]) @@ -2131,6 +2109,10 @@ yap_timestamp=`date` yap_nversion=`expr $YAP_MAJOR_VERSION \* 10000 + $YAP_MINOR_VERSION \* 100 + $YAP_POINT_VERSION` yap_startup=startup.yss +BINDIR=$bindir +DATAROOTDIR="$prefix"/share +BINDIR="$bindir" + AC_DEFINE_UNQUOTED(YAP_STARTUP, [ "$yap_startup" ], [saved state file]) AC_DEFINE_UNQUOTED( C_CC, [ "$CC" ], [c-compiler used]) AC_DEFINE_UNQUOTED( C_CFLAGS, ["$CFLAGS $YAP_EXTRAS $ -D_YAP_NOT_INSTALLED_=1 $CPPFLAGS -I. -I$srcdir/H -I$srcdir/include -I$srcdir/os -I$srcdir/OPTYap -I$srcdir/BEAM" ], [compilation flags]) @@ -2140,13 +2122,13 @@ AC_DEFINE_UNQUOTED( C_LIBPLSO, [ "$LIBS $EXTRA_LIBS_FOR_DLLS" ], [libs for linki AC_DEFINE_UNQUOTED( SO_EXT, [ "$SO" ], [relocable objects]) AC_DEFINE_UNQUOTED( SO_PATH, [ "$SOPATH" ], [library search variable]) AC_DEFINE_UNQUOTED( YAP_ARCH, [ "$ARCH" ], [architecture]) -AC_DEFINE_UNQUOTED( YAP_BINDIR, [ "$prefix/bin" ], [where the yap executable lives]) +AC_DEFINE_UNQUOTED( YAP_BINDIR, [ "$BINDIR" ], [where the yap executable lives]) AC_DEFINE_UNQUOTED( YAP_FULL_VERSION, [ "YAP $YAP_VERSION ($ARCH): $yap_timestamp" ], [YAP version string]) -AC_DEFINE_UNQUOTED( YAP_LIBDIR, [ "$prefix/lib/Yap" ], [where to look for shared libraries]) +AC_DEFINE_UNQUOTED( YAP_LIBDIR, [ "$LIBDIR/Yap" ], [where to look for shared libraries]) AC_DEFINE_UNQUOTED( YAP_NUMERIC_VERSION, [ $yap_nversion ], [numerical version]) -AC_DEFINE_UNQUOTED( YAP_PL_SRCDIR, [ "$prefix/share/Yap/pl" ], [where to look for Prolog sources]) AC_DEFINE_UNQUOTED( YAP_ROOTDIR, [ "$prefix" ], [where YAP lives]) -AC_DEFINE_UNQUOTED( YAP_SHAREDIR, [ "$prefix/share" ], [where to look for the Prolog library]) +AC_DEFINE_UNQUOTED( YAP_SHAREDIR, [ "$DATAROOTDIR" ], [where YAP lives]) +AC_DEFINE_UNQUOTED( YAP_PL_SRCDIR, [ "$DATAROOTDIR/Yap/pl" ], [where YAP lives]) AC_DEFINE_UNQUOTED( YAP_TIMESTAMP, [ "$yap_timestamp" ], [date of compilation]) AC_DEFINE_UNQUOTED( YAP_VERSION, [ "$YAP_VERSION" ], [yap version]) AC_DEFINE_UNQUOTED( YAP_YAPLIB, [ "$YAPLIB" ], [name of YAP library]) @@ -2194,7 +2176,6 @@ mkdir -p packages/prism/src/c/up mkdir -p packages/prism/src/prolog mkdir -p packages/ProbLog mkdir -p packages/ProbLog/simplecudd -mkdir -p packages/prosqlite mkdir -p packages/R mkdir -p packages/RDF mkdir -p packages/real @@ -2281,11 +2262,6 @@ if test "$PKG_LIBARCHIVE" != ""; then AC_CONFIG_FILES([packages/archive/Makefile]) fi -if test "$PKG_ODBC" != ""; then -AC_CONFIG_FILES([packages/odbc/Makefile]) -fi - - if test "$PKG_MINISAT" != ""; then AC_CONFIG_FILES([packages/swi-minisat2/Makefile]) AC_CONFIG_FILES([packages/swi-minisat2/C/Makefile]) @@ -2310,10 +2286,6 @@ AC_CONFIG_FILES([packages/prism/src/c/Makefile]) AC_CONFIG_FILES([packages/prism/src/prolog/Makefile]) fi -if test "$PKG_PROSQLITE" != ""; then - AC_CONFIG_FILES([packages/prosqlite/Makefile]) -fi - if test "$PKG_WINCONSOLE" != ""; then AC_CONFIG_FILES([swi/console/Makefile]) fi diff --git a/include/YapDefs.h b/include/YapDefs.h index a66b7c552..5b0e37702 100755 --- a/include/YapDefs.h +++ b/include/YapDefs.h @@ -19,6 +19,7 @@ #define _YAPDEFS_H 1 #include +#include #ifdef YAP_H @@ -72,7 +73,7 @@ typedef bool YAP_Bool; #define YAP_Term Term -#define YAP_Arity arity_t +#define YAP_Arity arity_t #define YAP_Module Term @@ -99,9 +100,9 @@ typedef bool YAP_Bool; /* Type definitions */ #if _WIN64 -typedef unsigned long long YAP_CELL; +typedef unsigned long long YAP_CELL; #else -typedef uintptr_t YAP_CELL; +typedef uintptr_t YAP_CELL; #endif typedef YAP_CELL YAP_Term; @@ -115,7 +116,7 @@ typedef struct FunctorEntry *YAP_Functor; typedef struct AtomEntry *YAP_Atom; #if _WIN64 -typedef long long int YAP_Int; +typedef long long int YAP_Int; typedef unsigned long long int YAP_UInt; @@ -282,16 +283,30 @@ typedef struct yap_boot_params { Int Yap_InitDefaults( YAP_init_args *init_args, char saved_state[] ); #endif -/* this should be opaque to the user */ +/* this should be opaque to the user */ typedef struct { unsigned long b; //> choice-point at entry - YAP_Int CurSlot; //> variables at entry - YAP_Int EndSlot; //> variables at successful execution + YAP_handle_t CurSlot; //> variables at entry + YAP_handle_t EndSlot; //> variables at successful execution struct yami *p; //> Program Counter at entry struct yami *cp; //> Continuation PC at entry } YAP_dogoalinfo; +// query manipulation support + +typedef struct open_query_struct { + int q_open; + int q_state; + YAP_handle_t q_g; + struct pred_entry *q_pe; + struct yami *q_p, *q_cp; + jmp_buf q_env; + int q_flags; + YAP_dogoalinfo q_h; + struct open_query_struct *oq; +} YAP_openQuery; + typedef void (*YAP_halt_hook)(int exit_code, void *closure); typedef YAP_Int YAP_opaque_tag_t; diff --git a/include/YapInterface.h b/include/YapInterface.h index 0d19879b0..57d1be41c 100755 --- a/include/YapInterface.h +++ b/include/YapInterface.h @@ -47,7 +47,7 @@ @defgroup c-interface YAP original C-interface @ingroup ChYInterface -Before describing in full detail how to interface to C code, we will examine +Before describing in full detail how to interface to C code, we will examine a brief example. Assume the user requires a predicate `my_process_id(Id)` which succeeds @@ -59,7 +59,7 @@ C-code described below. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.c} #include "YAP/YapInterface.h" -static int my_process_id(void) +static int my_process_id(void) { YAP_Term pid = YAP_MkIntTerm(getpid()); YAP_Term out = YAP_ARG1; @@ -205,17 +205,17 @@ follows The primitive -YAP_Bool YAP_IsVarTerm(YAP_Term _t_) +YAP_Bool YAP_IsVarTerm(YAP_Term _t_) returns true iff its argument is an uninstantiated variable. Conversely the primitive
    -
  • YAP_Bool YAP_NonVarTerm(YAP_Term _t_) +
  • YAP_Bool YAP_NonVarTerm(YAP_Term _t_) returns true iff its argument is not a variable.
- + The user can create a new uninstantiated variable using the primitive @@ -228,25 +228,25 @@ The following primitives can be used to discriminate among the different types of non-variable terms:
    -
  • YAP_Bool YAP_IsIntTerm(YAP_Term _t_) +
  • YAP_Bool YAP_IsIntTerm(YAP_Term _t_)
    • -
  • YAP_Bool YAP_IsFloatTerm(YAP_Term _t_) +
  • YAP_Bool YAP_IsFloatTerm(YAP_Term _t_)
    • -
  • YAP_Bool YAP_IsDbRefTerm(YAP_Term _t_) +
  • YAP_Bool YAP_IsDbRefTerm(YAP_Term _t_)
    • -
  • YAP_Bool YAP_IsAtomTerm(YAP_Term _t_) +
  • YAP_Bool YAP_IsAtomTerm(YAP_Term _t_)
    • -
  • YAP_Bool YAP_IsPairTerm(YAP_Term _t_) +
  • YAP_Bool YAP_IsPairTerm(YAP_Term _t_)
    • -
  • YAP_Bool YAP_IsApplTerm(YAP_Term _t_) +
  • YAP_Bool YAP_IsApplTerm(YAP_Term _t_)
    • -
  • YAP_Bool YAP_IsCompoundTerm(YAP_Term _t_) +
  • YAP_Bool YAP_IsCompoundTerm(YAP_Term _t_)
@@ -294,10 +294,10 @@ The following primitives are provided for creating an integer term from an integer and to access the value of an integer term.
    -
  • YAP_Term YAP_MkIntTerm(YAP_Int _i_) +
  • YAP_Term YAP_MkIntTerm(YAP_Int _i_)
    • -
  • YAP_Int YAP_IntOfTerm(YAP_Term _t_) +
  • YAP_Int YAP_IntOfTerm(YAP_Term _t_)
@@ -310,11 +310,11 @@ on 64 bit machines. The two following primitives play a similar role for floating-point terms
    -
  • YAP_Term YAP_MkFloatTerm(YAP_flt _double_) +
  • YAP_Term YAP_MkFloatTerm(YAP_flt _double_)
    • -
  • YAP_flt YAP_FloatOfTerm(YAP_Term _t_) +
  • YAP_flt YAP_FloatOfTerm(YAP_Term _t_)
@@ -326,13 +326,13 @@ a big int, creating a term from a big integer and to access the value of a big int from a term.
    -
  • YAP_Bool YAP_IsBigNumTerm(YAP_Term _t_) +
  • YAP_Bool YAP_IsBigNumTerm(YAP_Term _t_)
    • -
  • YAP_Term YAP_MkBigNumTerm(void \* _b_) +
  • YAP_Term YAP_MkBigNumTerm(void \* _b_)
    • -
  • void \*YAP_BigNumOfTerm(YAP_Term _t_, void \* _b_) +
  • void \*YAP_BigNumOfTerm(YAP_Term _t_, void \* _b_)
@@ -359,7 +359,7 @@ p_print_bignum(void) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Currently, no primitives are supplied to users for manipulating data base -references. +references. A special typedef `YAP_Atom` is provided to describe Prolog \a atoms (symbolic constants). The two following primitives can be used @@ -367,24 +367,24 @@ to manipulate atom terms
    -
  • YAP_Term YAP_MkAtomTerm(YAP_Atom at) +
  • YAP_Term YAP_MkAtomTerm(YAP_Atom at)
    • -
  • YAP_Atom YAP_AtomOfTerm(YAP_Term _t_) +
  • YAP_Atom YAP_AtomOfTerm(YAP_Term _t_)
The following primitives are available for associating atoms with their -names +names
    -
  • YAP_Atom YAP_LookupAtom(char \* _s_) +
  • YAP_Atom YAP_LookupAtom(char \* _s_)
    • -
  • YAP_Atom YAP_FullLookupAtom(char \* _s_) +
  • YAP_Atom YAP_FullLookupAtom(char \* _s_)
    • -
  • char \*YAP_AtomName(YAP_Atom _t_) +
  • char \*YAP_AtomName(YAP_Atom _t_)
@@ -398,10 +398,10 @@ The following primitives handle constructing atoms from strings with wide characters, and vice-versa:
    -
  • YAP_Atom YAP_LookupWideAtom(wchar_t \* _s_) +
  • YAP_Atom YAP_LookupWideAtom(wchar_t \* _s_)
    • -
  • wchar_t \*YAP_WideAtomName(YAP_Atom _t_) +
  • wchar_t \*YAP_WideAtomName(YAP_Atom _t_)
@@ -410,16 +410,16 @@ The following primitive tells whether an atom needs wide atoms in its representation:
    -
  • int YAP_IsWideAtom(YAP_Atom _t_) +
  • int YAP_IsWideAtom(YAP_Atom _t_)
The following primitive can be used to obtain the size of an atom in a -representation-independent way: +representation-independent way:
    -
  • int YAP_AtomNameLength(YAP_Atom _t_) +
  • int YAP_AtomNameLength(YAP_Atom _t_)
@@ -431,13 +431,13 @@ externally to the Prolog engine, allow it to be collected, and call a hook on garbage collection:
    -
  • int YAP_AtomGetHold(YAP_Atom _at_) +
  • int YAP_AtomGetHold(YAP_Atom _at_)
    • -
  • int YAP_AtomReleaseHold(YAP_Atom _at_) +
  • int YAP_AtomReleaseHold(YAP_Atom _at_)
    • -
  • int YAP_AGCRegisterHook(YAP_AGC_hook _f_) +
  • int YAP_AGCRegisterHook(YAP_AGC_hook _f_)
@@ -448,19 +448,19 @@ most often used to build lists. The following primitives can be used to manipulate pairs:
    -
  • YAP_Term YAP_MkPairTerm(YAP_Term _Head_, YAP_Term _Tail_) +
  • YAP_Term YAP_MkPairTerm(YAP_Term _Head_, YAP_Term _Tail_)
    • -
  • YAP_Term YAP_MkNewPairTerm(void) +
  • YAP_Term YAP_MkNewPairTerm(void)
    • -
  • YAP_Term YAP_HeadOfTerm(YAP_Term _t_) +
  • YAP_Term YAP_HeadOfTerm(YAP_Term _t_)
    • -
  • YAP_Term YAP_TailOfTerm(YAP_Term _t_) +
  • YAP_Term YAP_TailOfTerm(YAP_Term _t_)
    • -
  • YAP_Term YAP_MkListFromTerms(YAP_Term \* _pt_, YAP_Int \* _sz_) +
  • YAP_Term YAP_MkListFromTerms(YAP_Term \* _pt_, YAP_Int \* _sz_)
@@ -472,28 +472,28 @@ The last function supports the common operation of constructing a list from an array of terms of size _sz_ in a simple sweep. Notice that the list constructors can call the garbage collector if -there is not enough space in the global stack. +there is not enough space in the global stack. A \a compound term consists of a \a functor and a sequence of terms with length equal to the \a arity of the functor. A functor, described in C by the typedef `Functor`, consists of an atom and of an integer. -The following primitives were designed to manipulate compound terms and +The following primitives were designed to manipulate compound terms and functors
    -
  • YAP_Term YAP_MkApplTerm(YAP_Functor _f_, unsigned long int _n_, YAP_Term[] _args_) +
  • YAP_Term YAP_MkApplTerm(YAP_Functor _f_, unsigned long int _n_, YAP_Term[] _args_)
    • -
  • YAP_Term YAP_MkNewApplTerm(YAP_Functor _f_, int _n_) +
  • YAP_Term YAP_MkNewApplTerm(YAP_Functor _f_, int _n_)
    • -
  • YAP_Term YAP_ArgOfTerm(int argno,YAP_Term _ts_) +
  • YAP_Term YAP_ArgOfTerm(int argno,YAP_Term _ts_)
    • -
  • YAP_Term \*YAP_ArgsOfTerm(YAP_Term _ts_) +
  • YAP_Term \*YAP_ArgsOfTerm(YAP_Term _ts_)
    • -
  • YAP_Functor YAP_FunctorOfTerm(YAP_Term _ts_) +
  • YAP_Functor YAP_FunctorOfTerm(YAP_Term _ts_)
@@ -512,7 +512,7 @@ collector if there is not enough space in the global stack. YAP allows one to manipulate the functors of compound term. The function [YAP_FunctorOfTerm](@ref YAP_FunctorOfTerm) allows one to obtain a variable of type `YAP_Functor` with the functor to a term. The following functions -then allow one to construct functors, and to obtain their name and arity. +then allow one to construct functors, and to obtain their name and arity.
  • YAP_Functor YAP_MkFunctor(YAP_Atom _a_,unsigned long int _arity_) @@ -529,7 +529,7 @@ arity. Constructing terms in the stack may lead to overflow. The routine
      -
    • int YAP_RequiresExtraStack(size_t _min_) +
    • int YAP_RequiresExtraStack(size_t _min_)
    @@ -550,7 +550,7 @@ YAP provides a single routine to attempt the unification of two Prolog terms. The routine may succeed or fail:
      -
    • Int YAP_Unify(YAP_Term _a_, YAP_Term _b_) +
    • Int YAP_Unify(YAP_Term _a_, YAP_Term _b_)
    @@ -564,7 +564,7 @@ The YAP C-interface now includes an utility routine to copy a string represented as a list of a character codes to a previously allocated buffer
      -
    • int YAP_StringToBuffer(YAP_Term _String_, char \* _buf_, unsigned int _bufsize_) +
    • int YAP_StringToBuffer(YAP_Term _String_, char \* _buf_, unsigned int _bufsize_)
    @@ -595,7 +595,7 @@ strings of wide characters:
  • YAP_Term YAP_WideBufferToAtomList(wchar_t \* _buf_)
    • -
  • YAP_Term YAP_NWideBufferToAtomList(wchar_t \* _buf_, size_t _len_) +
  • YAP_Term YAP_NWideBufferToAtomList(wchar_t \* _buf_, size_t _len_)
@@ -606,7 +606,7 @@ The C-interface function calls the parser on a sequence of characters stored at _buf_ and returns the resulting term.
    -
  • YAP_Term YAP_ReadBuffer(char \* _buf_,YAP_Term \* _error_) +
  • YAP_Term YAP_ReadBuffer(char \* _buf_,YAP_Term \* _error_)
@@ -619,7 +619,7 @@ These C-interface functions are useful when converting chunks of data to Prolog:
  • YAP_Term YAP_FloatsToList(double \* _buf_,size_t _sz_)
    • -
  • YAP_Term YAP_IntsToList(YAP_Int \* _buf_,size_t _sz_) +
  • YAP_Term YAP_IntsToList(YAP_Int \* _buf_,size_t _sz_)
@@ -631,7 +631,7 @@ These C-interface functions are useful when converting Prolog lists to arrays:
  • YAP_Int YAP_IntsToList(YAP_Term t, YAP_Int \* _buf_,size_t _sz_)
    • -
  • YAP_Int YAP_FloatsToList(YAP_Term t, double \* _buf_,size_t _sz_) +
  • YAP_Int YAP_FloatsToList(YAP_Term t, double \* _buf_,size_t _sz_)
@@ -643,7 +643,7 @@ and -1 on error. The next routine can be used to ask space from the Prolog data-base:
    -
  • void \*YAP_AllocSpaceFromYAP(int _size_) +
  • void \*YAP_AllocSpaceFromYAP(int _size_)
@@ -654,7 +654,7 @@ The space allocated with [YAP_AllocSpaceFromYAP](@ref YAP_AllocSpaceFromYAP) can back to YAP by using:
    -
  • void YAP_FreeSpaceFromYAP(void \* _buf_) +
  • void YAP_FreeSpaceFromYAP(void \* _buf_)
@@ -669,7 +669,7 @@ control over the YAP Input/Output system. The first routine allows one to find a file number given a current stream:
    -
  • int YAP_StreamToFileNo(YAP_Term _stream_) +
  • int YAP_StreamToFileNo(YAP_Term _stream_)
@@ -683,7 +683,7 @@ stale. A second routine that is sometimes useful is:
    -
  • void YAP_CloseAllOpenStreams(void) +
  • void YAP_CloseAllOpenStreams(void)
@@ -694,7 +694,7 @@ streams. It is most useful if you are doing `fork()`. Last, one may sometimes need to flush all streams:
    -
  • void YAP_CloseAllOpenStreams(void) +
  • void YAP_CloseAllOpenStreams(void)
@@ -706,7 +706,7 @@ routine receives as arguments a file descriptor, the true file name as a string, an atom with the user name, and a set of flags:
    -
  • void YAP_OpenStream(void \* _FD_, char \* _name_, YAP_Term _t_, int _flags_) +
  • void YAP_OpenStream(void \* _FD_, char \* _name_, YAP_Term _t_, int _flags_)
@@ -725,7 +725,7 @@ functions that are useful. The first provides a way to insert a term into the data-base
    -
  • void \*YAP_Record(YAP_Term _t_) +
  • void \*YAP_Record(YAP_Term _t_)
@@ -735,7 +735,7 @@ This function returns a pointer to a copy of the term in the database The next functions provides a way to recover the term from the data-base:
    -
  • YAP_Term YAP_Recorded(void \* _handle_) +
  • YAP_Term YAP_Recorded(void \* _handle_)
@@ -746,7 +746,7 @@ variables. The function returns 0L if it cannot create a new term. Last, the next function allows one to recover space:
    -
  • int YAP_Erase(void \* _handle_) +
  • int YAP_Erase(void \* _handle_)
@@ -803,13 +803,13 @@ The second function computes a hash function for a term, as in `term_hash/4`.
    -
  • YAP_Int YAP_TermHash(YAP_Term t, YAP_Int range, YAP_Int depth, int ignore_variables)); +
  • YAP_Int YAP_TermHash(YAP_Term t, YAP_Int range, YAP_Int depth, int ignore_variables));
The first three arguments follow `term_has/4`. The last argument indicates what to do if we find a variable: if `0` fail, otherwise -ignore the variable. +ignore the variable. @section Calling_YAP_From_C From `C` back to Prolog @@ -823,7 +823,7 @@ has been initialised before: Execute query _Goal_ and return 1 if the query succeeds, and 0 otherwise. The predicate returns 0 if failure, otherwise it will return -an _YAP_Term_. +an _YAP_Term_. Quite often, one wants to run a query once. In this case you should use _Goal_: @@ -862,7 +862,7 @@ Look for the next solution to the current query by forcing YAP to backtrack to the latest goal. Notice that slots allocated since the last YAP_RunGoal() will become invalid. -
  • `int` YAP_Reset(`yap_reset_t mode`) +
  • `int` YAP_Reset(`yap_reset_t mode`) Reset execution environment (similar to the abort/0 built-in). This is useful when @@ -913,12 +913,12 @@ YAP_FunctorToPredInModule(`YAP_Functor` _f_, `YAP_Module` _m_), Return the predicate in module _m_ whose main functor is _f_.
    • -
  • `YAP_PredEntryPtr` YAP_AtomToPred(`YAP_Atom` _at_, `YAP_Module` _m_), +
  • `YAP_PredEntryPtr` YAP_AtomToPred(`YAP_Atom` _at_, `YAP_Module` _m_), Return the arity 0 predicate in module _m_ whose name is _at_.
    • -
  • `YAP_Bool` YAP_EnterGoal(`YAP_PredEntryPtr` _pe_), +
  • `YAP_Bool` YAP_EnterGoal(`YAP_PredEntryPtr` _pe_), `YAP_Term \*` _array_, `YAP_dogoalinfo \*` _infop_) Execute a query for predicate _pe_. The query is given as an @@ -979,7 +979,7 @@ finding the first solution to the goal, but you can call [findall/3](@ref findall) or friends if you need all the solutions. Notice that during execution, garbage collection or stack shifting may -have moved the terms +have moved the terms @section Module_Manipulation_in_C Module Manipulation in C @@ -1167,7 +1167,7 @@ static int start_n100(void); static int continue_n100(void); typedef struct { - YAP_Term next_solution; + YAP_Term next_solution; } n100_data_type; n100_data_type *n100_data; @@ -1204,7 +1204,7 @@ terms, as in the example. It is also correct to store pointers to objects external to YAP stacks, as the garbage collector will ignore such references. -If the argument of the predicate is a variable, the routine initializes the +If the argument of the predicate is a variable, the routine initializes the structure to be preserved across backtracking with the information required to provide the next solution, and exits by calling `continue_n100` to provide that solution. @@ -1423,13 +1423,13 @@ The following C-functions are available from YAP: Compile the Prolog term _Clause_ and assert it as the last clause for the corresponding procedure. - + YAP_MkExo(`YAP_PredEntryPtr` _pred_, `size_t` _sz_, `void *` _uid_) + + YAP_MkExo(`YAP_PredEntryPtr` _pred_, `size_t` _sz_, `void *` _uid_) Predicate _pred_ is an exo-predicate that needs _sz_ bytes of -contiguous storage. If _uid_ is non-null associate user-defined +contiguous storage. If _uid_ is non-null associate user-defined code with _pred_. + YAP_AssertTuples(`YAP_PredEntryPtr` pred, `const YAP_Term *` _Facts_, `size_t` nb) -Add the array of _nb_ Prolog term `Facts` to the table +Add the array of _nb_ Prolog term `Facts` to the table `Predicate`. + `int` YAP_ContinueGoal(`void`) @@ -1489,7 +1489,7 @@ call YAP. If booting failed you may consult `ErrorNo` and `ErrorCause` for the cause of the error, or call -`YAP_Error(ErrorNo,0L,ErrorCause)` to do default processing. +`YAP_Error(ErrorNo,0L,ErrorCause)` to do default processing. + `void` YAP_PutValue(`Atom` _at_, `YAP_Term` _value_) Associate the term _value_ with the atom _at_. The term @@ -1848,7 +1848,7 @@ extern X_API YAP_PredEntryPtr YAP_FunctorToPredInModule(YAP_Functor, YAP_Module) extern X_API YAP_PredEntryPtr YAP_AtomToPredInModule(YAP_Atom, YAP_Module); /* int YAP_EnterGoal(void) */ -extern X_API YAP_Bool YAP_EnterGoal(YAP_PredEntryPtr, YAP_Term *, YAP_dogoalinfo *); +extern X_API YAP_Bool YAP_EnterGoal(YAP_PredEntryPtr, YAP_handle_t, YAP_dogoalinfo *); /* int YAP_RetryGoal(void) */ extern X_API YAP_Bool YAP_RetryGoal(YAP_dogoalinfo *); diff --git a/library/dialect/swi/fli/blobs.c b/library/dialect/swi/fli/blobs.c index 936dd9020..1e4158d8e 100644 --- a/library/dialect/swi/fli/blobs.c +++ b/library/dialect/swi/fli/blobs.c @@ -16,7 +16,7 @@ *************************************************************************/ /** * - * @{ + * @{ * @file blobs.c * * @addtogroup swi-c-interface @@ -47,7 +47,7 @@ PL_EXPORT(int) PL_is_blob(term_t t, PL_blob_t **type) { CACHE_REGS - Term yt = Yap_GetFromSlot(t PASS_REGS); + Term yt = Yap_GetFromSlot(t); Atom a; BlobPropEntry *b; @@ -129,7 +129,7 @@ Yap_lookupBlob(void *blob, size_t len, void *type0, int *new) return ae; } -PL_EXPORT(int) +PL_EXPORT(int) PL_unify_blob(term_t t, void *blob, size_t len, PL_blob_t *type) { CACHE_REGS @@ -144,10 +144,10 @@ PL_unify_blob(term_t t, void *blob, size_t len, PL_blob_t *type) if (type->acquire) { type->acquire(AtomToSWIAtom(AbsAtom(ae))); } - return Yap_unify(Yap_GetFromSlot(t PASS_REGS), MkAtomTerm(AbsAtom(ae))); + return Yap_unify(Yap_GetFromSlot(t), MkAtomTerm(AbsAtom(ae))); } -PL_EXPORT(int) +PL_EXPORT(int) PL_put_blob(term_t t, void *blob, size_t len, PL_blob_t *type) { CACHE_REGS @@ -167,7 +167,7 @@ PL_put_blob(term_t t, void *blob, size_t len, PL_blob_t *type) return ret; } -PL_EXPORT(int) +PL_EXPORT(int) PL_get_blob(term_t t, void **blob, size_t *len, PL_blob_t **type) { CACHE_REGS @@ -175,7 +175,7 @@ PL_get_blob(term_t t, void **blob, size_t *len, PL_blob_t **type) Term tt; AtomEntry *ae; - tt = Yap_GetFromSlot(t PASS_REGS); + tt = Yap_GetFromSlot(t); if (IsVarTerm(tt)) return FALSE; if (!IsAtomTerm(tt)) @@ -193,7 +193,7 @@ PL_get_blob(term_t t, void **blob, size_t *len, PL_blob_t **type) return TRUE; } -PL_EXPORT(void*) +PL_EXPORT(void*) PL_blob_data(atom_t a, size_t *len, struct PL_blob_t **type) { Atom x = SWIAtomToAtom(a); @@ -227,7 +227,7 @@ PL_register_blob_type(PL_blob_t *type) SWI_BlobTypes = type; } -PL_EXPORT(PL_blob_t*) +PL_EXPORT(PL_blob_t*) PL_find_blob_type(const char* name) { Atom at = Yap_LookupAtom((char *)name); @@ -235,7 +235,7 @@ PL_find_blob_type(const char* name) return YAP_find_blob_type((YAP_Atom)at); } -PL_EXPORT(PL_blob_t*) +PL_EXPORT(PL_blob_t*) YAP_find_blob_type(YAP_Atom at) { AtomEntry *a = RepAtom((Atom)at); @@ -245,7 +245,7 @@ YAP_find_blob_type(YAP_Atom at) return RepBlobProp(a->PropsOfAE)->blob_t; } -PL_EXPORT(int) +PL_EXPORT(int) PL_unregister_blob_type(PL_blob_t *type) { fprintf(stderr,"PL_unregister_blob_type not implemented yet\n"); diff --git a/library/dialect/swi/fli/swi.c b/library/dialect/swi/fli/swi.c index 0fee59d86..6e9d5bfd8 100755 --- a/library/dialect/swi/fli/swi.c +++ b/library/dialect/swi/fli/swi.c @@ -72,7 +72,7 @@ extern int PL_unify_termv(term_t l, va_list args); extern X_API Atom YAP_AtomFromSWIAtom(atom_t at); extern X_API atom_t YAP_SWIAtomFromAtom(Atom at); -static int +static int do_gc(UInt sz) { /* always called from user_call_cpred */ @@ -138,9 +138,9 @@ UserCPredicate(char *a, CPredicate def, unsigned long int arity, Term mod, int f CurrentModule = mod; Yap_InitCPred(a, arity, def, (UserCPredFlag|CArgsPredFlag|flags)); CurrentModule = cm; -} +} -//! @{ +//! @{ /** @defgroup swi-ATOMS Atom Construction * @ingroup swi-c-interface @@ -192,7 +192,7 @@ X_API char* PL_atom_nchars(atom_t a, size_t *len) /* SAM check type */ X_API term_t PL_copy_term_ref(term_t from) { CACHE_REGS - return Yap_InitSlot(Yap_GetFromSlot(from PASS_REGS) PASS_REGS); + return Yap_InitSlot(Yap_GetFromSlot(from)); } /** @brief create a new term reference @@ -200,9 +200,9 @@ X_API term_t PL_copy_term_ref(term_t from) */ X_API term_t PL_new_term_ref(void) { - + CACHE_REGS - term_t to = Yap_NewSlots(1 PASS_REGS); + term_t to = Yap_NewSlots(1); return to; } @@ -213,7 +213,7 @@ X_API term_t PL_new_term_ref(void) X_API term_t PL_new_term_refs(int n) { CACHE_REGS - term_t to = Yap_NewSlots(n PASS_REGS); + term_t to = Yap_NewSlots(n); return to; } @@ -223,7 +223,7 @@ X_API term_t PL_new_term_refs(int n) X_API void PL_reset_term_refs(term_t after) { CACHE_REGS - term_t new = Yap_NewSlots(1 PASS_REGS); + term_t new = Yap_NewSlots(1); Yap_RecoverSlots(after-new, new PASS_REGS); } @@ -247,7 +247,7 @@ X_API void PL_reset_term_refs(term_t after) X_API int PL_get_name_arity(term_t ts, atom_t *name, int *arity) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); if (IsAtomTerm(t)) { *name = AtomToSWIAtom(AtomOfTerm(t)); *arity = 0; @@ -277,7 +277,7 @@ X_API int PL_get_name_arity(term_t ts, atom_t *name, int *arity) X_API int PL_get_arg(int index, term_t ts, term_t a) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts ); if (IsVarTerm( t )) return 0; if ( !IsApplTerm(t) ) { @@ -308,7 +308,7 @@ X_API int PL_get_arg(int index, term_t ts, term_t a) X_API int PL_get_compound_name_arity(term_t ts, atom_t *ap, int *ip) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); if ( !YAP_IsApplTerm(t) ) { if (YAP_IsPairTerm(t)) { if (ip) @@ -330,14 +330,14 @@ X_API int PL_get_compound_name_arity(term_t ts, atom_t *ap, int *ip) } - + /** @brief *a is assigned the atom in term ts, or the operation fails * */ X_API int PL_get_atom(term_t ts, atom_t *a) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); if ( !IsAtomTerm(t)) return 0; *a = AtomToSWIAtom(AtomOfTerm(t)); @@ -352,7 +352,7 @@ X_API int PL_get_atom(term_t ts, atom_t *a) X_API int PL_get_integer(term_t ts, int *i) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts ); if (IsVarTerm(t) || !IsIntegerTerm(t) ) return 0; *i = (int)IntegerOfTerm(t); @@ -365,7 +365,7 @@ X_API int PL_get_integer(term_t ts, int *i) X_API int PL_get_long(term_t ts, long *i) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); if (!YAP_IsIntTerm(t) ) { if (YAP_IsFloatTerm(t)) { double dbl = YAP_FloatOfTerm(t); @@ -385,7 +385,7 @@ X_API int PL_get_long(term_t ts, long *i) X_API int PL_get_bool(term_t ts, int *i) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); Atom at; if (!IsAtomTerm(t) ) @@ -408,7 +408,7 @@ X_API int PL_get_bool(term_t ts, int *i) X_API int PL_get_int64(term_t ts, int64_t *i) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); if (!YAP_IsIntTerm(t) ) { if (YAP_IsFloatTerm(t)) { double dbl = YAP_FloatOfTerm(t); @@ -458,7 +458,7 @@ X_API int PL_get_int64(term_t ts, int64_t *i) X_API int PL_get_intptr(term_t ts, intptr_t *a) { CACHE_REGS - Term t = Yap_GetFromSlot(ts PASS_REGS); + Term t = Yap_GetFromSlot(ts); if ( !IsIntegerTerm(t) ) return 0; *a = (intptr_t)(IntegerOfTerm(t)); @@ -471,7 +471,7 @@ X_API int PL_get_intptr(term_t ts, intptr_t *a) X_API int PL_get_uintptr(term_t ts, uintptr_t *a) { CACHE_REGS - Term t = Yap_GetFromSlot(ts PASS_REGS); + Term t = Yap_GetFromSlot(ts); if ( !IsIntegerTerm(t) ) return 0; *a = (uintptr_t)(IntegerOfTerm(t)); @@ -484,7 +484,7 @@ X_API int PL_get_uintptr(term_t ts, uintptr_t *a) X_API int _PL_get_arg(int index, term_t ts, term_t a) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); if ( !YAP_IsApplTerm(t) ) { if (YAP_IsPairTerm(t)) { if (index == 1){ @@ -508,7 +508,7 @@ X_API int _PL_get_arg(int index, term_t ts, term_t a) X_API int PL_get_atom_chars(term_t ts, char **a) /* SAM check type */ { CACHE_REGS - Term t = Yap_GetFromSlot(ts PASS_REGS); + Term t = Yap_GetFromSlot(ts); if (!IsAtomTerm(t) || IsWideAtom(AtomOfTerm(t))) return 0; *a = RepAtom(AtomOfTerm(t))->StrOfAE; @@ -521,7 +521,7 @@ X_API int PL_get_atom_chars(term_t ts, char **a) /* SAM check type */ X_API int PL_get_atom_nchars(term_t ts, size_t *len, char **s) /* SAM check type */ { CACHE_REGS - Term t = Yap_GetFromSlot(ts PASS_REGS); + Term t = Yap_GetFromSlot(ts); if (!IsAtomTerm(t)) return 0; *s = RepAtom(AtomOfTerm(t))->StrOfAE; @@ -564,7 +564,7 @@ X_API int PL_get_atom_nchars(term_t ts, size_t *len, char **s) /* SAM check typ X_API int PL_get_functor(term_t ts, functor_t *f) { CACHE_REGS - Term t = Yap_GetFromSlot(ts PASS_REGS); + Term t = Yap_GetFromSlot(ts); if ( IsAtomTerm(t)) { *f = t; } else { @@ -579,7 +579,7 @@ X_API int PL_get_functor(term_t ts, functor_t *f) X_API int PL_get_float(term_t ts, double *f) /* SAM type check*/ { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); if ( IsFloatTerm(t)) { *f = FloatOfTerm(t); } else if ( IsIntegerTerm(t)) { @@ -600,7 +600,7 @@ X_API int PL_get_float(term_t ts, double *f) /* SAM type check*/ X_API int PL_get_string_chars(term_t t, char **s, size_t *len) { CACHE_REGS - Term tt = Yap_GetFromSlot(t PASS_REGS); + Term tt = Yap_GetFromSlot(t); if (!IsStringTerm(tt)) { return 0; } @@ -616,7 +616,7 @@ X_API int PL_get_string_chars(term_t t, char **s, size_t *len) X_API int PL_get_list(term_t ts, term_t h, term_t tl) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts ); if (IsVarTerm(t) || !IsPairTerm(t) ) { return 0; } @@ -632,7 +632,7 @@ X_API int PL_get_list(term_t ts, term_t h, term_t tl) X_API int PL_get_head(term_t ts, term_t h) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); if (!YAP_IsPairTerm(t) ) { return 0; } @@ -667,7 +667,7 @@ X_API int PL_unify_bool(term_t t, int a) { CACHE_REGS Term iterm = (a ? MkAtomTerm(AtomTrue) : MkAtomTerm(AtomFalse) ); - return Yap_unify(Yap_GetFromSlot(t PASS_REGS),iterm); + return Yap_unify(Yap_GetFromSlot(t ),iterm); } @@ -680,7 +680,7 @@ X_API int PL_unify_bool(term_t t, int a) X_API int PL_get_mpz(term_t t, mpz_t mpz) { CACHE_REGS - Term t0 = Yap_GetFromSlot(t PASS_REGS); + Term t0 = Yap_GetFromSlot(t); return Yap_term_to_existing_big(t0, mpz); } @@ -689,13 +689,13 @@ X_API int PL_unify_mpz(term_t t, mpz_t mpz) { CACHE_REGS Term iterm = Yap_MkBigIntTerm(mpz); - return Yap_unify(Yap_GetFromSlot(t PASS_REGS),iterm); + return Yap_unify(Yap_GetFromSlot(t),iterm); } X_API int PL_get_mpq(term_t t, mpq_t mpz) { CACHE_REGS - Term t0 = Yap_GetFromSlot(t PASS_REGS); + Term t0 = Yap_GetFromSlot(t); return Yap_term_to_existing_rat(t0, mpz); } @@ -704,7 +704,7 @@ X_API int PL_unify_mpq(term_t t, mpq_t mpq) { CACHE_REGS Term iterm = Yap_MkBigRatTerm(mpq); - return Yap_unify(Yap_GetFromSlot(t PASS_REGS),iterm); + return Yap_unify(Yap_GetFromSlot(t),iterm); } #endif @@ -713,7 +713,7 @@ X_API int PL_unify_mpq(term_t t, mpq_t mpq) X_API int PL_get_module(term_t ts, module_t *m) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); if (!IsAtomTerm(t) ) return FALSE; *m = Yap_GetModuleEntry(t); @@ -726,9 +726,9 @@ X_API module_t PL_new_module(atom_t swiat) Atom at = SWIAtomToAtom(swiat); Term t; - WRITE_LOCK(RepAtom(at)->ARWLock); + WRITE_LOCK(RepAtom(at)->ARWLock); t = Yap_Module(MkAtomTerm(at)); - WRITE_UNLOCK(RepAtom(at)->ARWLock); + WRITE_UNLOCK(RepAtom(at)->ARWLock); return Yap_GetModuleEntry(t); } @@ -737,7 +737,7 @@ X_API module_t PL_new_module(atom_t swiat) X_API int PL_get_nil(term_t ts) { CACHE_REGS - Term t = Yap_GetFromSlot(ts PASS_REGS); + Term t = Yap_GetFromSlot(ts ); return ( t == TermNil ); } @@ -747,7 +747,7 @@ X_API int PL_get_nil(term_t ts) X_API int PL_get_pointer(term_t ts, void **i) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); if (IsVarTerm(t) || !IsIntegerTerm(t) ) return 0; *i = (void *)IntegerOfTerm(t); @@ -757,7 +757,7 @@ X_API int PL_get_pointer(term_t ts, void **i) X_API int PL_get_tail(term_t ts, term_t tl) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts ); if (!YAP_IsPairTerm(t) ) { return 0; } @@ -889,7 +889,7 @@ X_API int PL_cons_functor(term_t d, functor_t f,...) } va_start (ap, f); for (i = 0; i < arity; i++) { - Yap_unify(tmp[i],Yap_GetFromSlot(va_arg(ap, term_t) PASS_REGS)); + Yap_unify(tmp[i],Yap_GetFromSlot(va_arg(ap, term_t))); } va_end (ap); Yap_PutInSlot(d,t PASS_REGS); @@ -921,7 +921,7 @@ X_API int PL_cons_functor_v(term_t d, functor_t f, term_t a0) tmp = RepAppl(t)+1; } for (i = 0; i < arity; i++) { - Yap_unify(tmp[i] , Yap_GetFromSlot(a0 PASS_REGS) ); + Yap_unify(tmp[i] , Yap_GetFromSlot(a0 ) ); a0++; } Yap_PutInSlot(d,t PASS_REGS); @@ -937,7 +937,7 @@ X_API int PL_cons_list(term_t d, term_t h, term_t t) return FALSE; } } - Yap_PutInSlot(d,MkPairTerm(Yap_GetFromSlot(h PASS_REGS),Yap_GetFromSlot(t PASS_REGS)) PASS_REGS); + Yap_PutInSlot(d,MkPairTerm(Yap_GetFromSlot(h),Yap_GetFromSlot(t)) PASS_REGS); return TRUE; } @@ -997,7 +997,7 @@ X_API int PL_put_functor(term_t t, functor_t f) } } if (arity == 2 && ff == FunctorDot) - Yap_PutInSlot(t,YAP_MkNewPairTerm() PASS_REGS); + Yap_PutInSlot(t,YAP_MkNewPairTerm() PASS_REGS); else Yap_PutInSlot(t,YAP_MkNewApplTerm((YAP_Functor)ff,arity) PASS_REGS); } @@ -1103,7 +1103,7 @@ X_API int PL_put_string_nchars(term_t t, size_t len, const char *chars) X_API int PL_put_term(term_t d, term_t s) { CACHE_REGS - Yap_PutInSlot(d,Yap_GetFromSlot(s PASS_REGS) PASS_REGS); + Yap_PutInSlot(d,Yap_GetFromSlot(s ) PASS_REGS); return TRUE; } @@ -1123,14 +1123,14 @@ X_API int PL_put_variable(term_t t) X_API int PL_raise_exception(term_t exception) { CACHE_REGS - EX = Yap_StoreTermInDB(Yap_GetFromSlot(exception PASS_REGS),0); + EX = Yap_StoreTermInDB(Yap_GetFromSlot(exception),0); return 0; } X_API int PL_throw(term_t exception) { CACHE_REGS - YAP_Throw(Yap_GetFromSlot(exception PASS_REGS)); + YAP_Throw(Yap_GetFromSlot(exception)); if (LOCAL_execution) longjmp(LOCAL_execution->q_env, 0); return 0; @@ -1145,7 +1145,7 @@ X_API void PL_fatal_error(const char *msg) X_API int PL_warning(const char *msg, ...) { va_list args; va_start(args, msg); - // just print the warning message and return? + // just print the warning message and return? fprintf(stderr,"[Warning:"); fprintf(stderr,msg,args); fprintf(stderr,"]\n"); @@ -1158,7 +1158,7 @@ X_API int PL_warning(const char *msg, ...) { X_API int PL_unify(term_t t1, term_t t2) { CACHE_REGS - return Yap_unify(Yap_GetFromSlot(t1 PASS_REGS),Yap_GetFromSlot(t2 PASS_REGS)); + return Yap_unify(Yap_GetFromSlot(t1 ),Yap_GetFromSlot(t2 )); } /* SWI: int PL_unify_atom(term_t ?t, atom *at) @@ -1167,7 +1167,7 @@ X_API int PL_unify_atom(term_t t, atom_t at) { CACHE_REGS YAP_Term cterm = MkAtomTerm(SWIAtomToAtom(at)); - return YAP_Unify(Yap_GetFromSlot(t PASS_REGS),cterm); + return YAP_Unify(Yap_GetFromSlot(t),cterm); } /* SWI: int PL_unify_atom_chars(term_t ?t, const char *chars) @@ -1181,7 +1181,7 @@ X_API int PL_unify_atom_chars(term_t t, const char *s) return FALSE; } Yap_AtomIncreaseHold(at); - return Yap_unify(Yap_GetFromSlot(t PASS_REGS), MkAtomTerm(at)); + return Yap_unify(Yap_GetFromSlot(t), MkAtomTerm(at)); } /* SWI: int PL_unify_atom_chars(term_t ?t, const char *chars) @@ -1195,7 +1195,7 @@ X_API int PL_unify_atom_nchars(term_t t, size_t len, const char *s) return FALSE; } Yap_AtomIncreaseHold(at); - return Yap_unify(Yap_GetFromSlot(t PASS_REGS), MkAtomTerm(at)); + return Yap_unify(Yap_GetFromSlot(t), MkAtomTerm(at)); } /* SWI: int PL_unify_float(term_t ?t, double f) @@ -1204,38 +1204,38 @@ X_API int PL_unify_float(term_t t, double f) { CACHE_REGS Term fterm = MkFloatTerm(f); - return Yap_unify(Yap_GetFromSlot(t PASS_REGS),fterm); + return Yap_unify(Yap_GetFromSlot(t),fterm); } /* SWI: int PL_unify_integer(term_t ?t, long n) YAP long int unify(YAP_Term* a, Term* b) */ X_API int PL_unify_integer(term_t t, long n) -{ +{ CACHE_REGS Term iterm = MkIntegerTerm(n); - return Yap_unify(Yap_GetFromSlot(t PASS_REGS),iterm); + return Yap_unify(Yap_GetFromSlot(t),iterm); } X_API int PL_unify_intptr(term_t t, intptr_t n) -{ +{ CACHE_REGS Term iterm = MkIntegerTerm(n); - return Yap_unify(Yap_GetFromSlot(t PASS_REGS),iterm); + return Yap_unify(Yap_GetFromSlot(t),iterm); } X_API int PL_unify_uintptr(term_t t, uintptr_t n) -{ +{ CACHE_REGS Term iterm = MkIntegerTerm(n); - return Yap_unify(Yap_GetFromSlot(t PASS_REGS),iterm); + return Yap_unify(Yap_GetFromSlot(t),iterm); } /* SWI: int PL_unify_integer(term_t ?t, long n) YAP long int unify(YAP_Term* a, Term* b) */ X_API int PL_unify_functor(term_t t, functor_t f) -{ +{ CACHE_REGS - Term tt = Yap_GetFromSlot(t PASS_REGS); + Term tt = Yap_GetFromSlot(t); Functor ff = SWIFunctorToFunctor(f); if (IsVarTerm(tt)) { if (Unsigned(HR)+ArityOfFunctor(ff) > Unsigned(ASP)-CreepFlag) { @@ -1255,11 +1255,11 @@ X_API int PL_unify_functor(term_t t, functor_t f) /* SWI: int PL_unify_integer(term_t ?t, long n) YAP long int unify(YAP_Term* a, Term* b) */ X_API int PL_unify_int64(term_t t, int64_t n) -{ +{ CACHE_REGS #if SIZEOF_INT_P==8 Term iterm = MkIntegerTerm(n); - return Yap_unify(Yap_GetFromSlot(t PASS_REGS),iterm); + return Yap_unify(Yap_GetFromSlot(t),iterm); #elif USE_GMP YAP_Term iterm; char s[64]; @@ -1274,7 +1274,7 @@ X_API int PL_unify_int64(term_t t, int64_t n) #endif mpz_init_set_str (&rop, s, 10); iterm = YAP_MkBigNumTerm((void *)&rop); - return YAP_Unify(Yap_GetFromSlot(t PASS_REGS),iterm); + return YAP_Unify(Yap_GetFromSlot(t ),iterm); #else if ((long)n == n) return PL_unify_integer(t, n); @@ -1302,7 +1302,7 @@ X_API int PL_unify_list(term_t tt, term_t h, term_t tail) return FALSE; } } - t = Deref(Yap_GetFromSlot(tt PASS_REGS)); + t = Deref(Yap_GetFromSlot(tt)); if (IsVarTerm(t)) { Term pairterm = Yap_MkNewPairTerm(); Yap_unify(t, pairterm); @@ -1321,7 +1321,7 @@ X_API int PL_unify_list(term_t tt, term_t h, term_t tail) X_API int PL_unify_arg(int index, term_t tt, term_t arg) { CACHE_REGS - Term t = Deref(Yap_GetFromSlot(tt PASS_REGS)), to; + Term t = Deref(Yap_GetFromSlot(tt )), to; if (index < 0) return FALSE; if (IsVarTerm(t) || IsAtomOrIntTerm(t)) { @@ -1335,13 +1335,13 @@ X_API int PL_unify_arg(int index, term_t tt, term_t arg) return FALSE; } else { Functor f = FunctorOfTerm(t); - if (IsExtensionFunctor(f)) + if (IsExtensionFunctor(f)) return FALSE; if (index > ArityOfFunctor(f)) return FALSE; to = ArgOfTerm(index, t); } - return Yap_unify(Yap_GetFromSlot(arg PASS_REGS),to); + return Yap_unify(Yap_GetFromSlot(arg),to); } /* SWI: int PL_unify_list(term_t ?t, term_t +h, term_t -t) @@ -1354,7 +1354,7 @@ X_API int PL_unify_list_chars(term_t t, const char *chars) if (LOCAL_Error_TYPE && !Yap_SWIHandleError( "PL_unify_list_chars" )) return FALSE; } - return Yap_unify(Yap_GetFromSlot(t PASS_REGS), chterm); + return Yap_unify(Yap_GetFromSlot(t), chterm); } /* SWI: int PL_unify_list(term_t ?t, term_t +h, term_t -t) @@ -1367,19 +1367,19 @@ X_API int PL_unify_list_ncodes(term_t t, size_t len, const char *chars) if (LOCAL_Error_TYPE && !Yap_SWIHandleError( "PL_unify_list_ncodes" )) return FALSE; } - return Yap_unify(Yap_GetFromSlot(t PASS_REGS), chterm); + return Yap_unify(Yap_GetFromSlot(t), chterm); } X_API int PL_unify_list_codes(term_t t, const char *chars) -{ +{ CACHE_REGS Term chterm; while((chterm = Yap_CharsToListOfCodes(chars PASS_REGS)) == 0L) { if (LOCAL_Error_TYPE && !Yap_SWIHandleError( "PL_unify_list_codes" )) return FALSE; } - return Yap_unify(Yap_GetFromSlot(t PASS_REGS), chterm); + return Yap_unify(Yap_GetFromSlot(t), chterm); } /* SWI: int PL_unify_nil(term_t ?l) @@ -1387,7 +1387,7 @@ PL_unify_list_codes(term_t t, const char *chars) X_API int PL_unify_nil(term_t t) { CACHE_REGS - return Yap_unify(Yap_GetFromSlot(t PASS_REGS), TermNil); + return Yap_unify(Yap_GetFromSlot(t), TermNil); } /* SWI: int PL_unify_pointer(term_t ?t, void *ptr) @@ -1397,7 +1397,7 @@ X_API int PL_unify_pointer(term_t t, void *ptr) { CACHE_REGS YAP_Term ptrterm = YAP_MkIntTerm((YAP_Int)ptr); - return YAP_Unify(Yap_GetFromSlot(t PASS_REGS), ptrterm); + return YAP_Unify(Yap_GetFromSlot(t ), ptrterm); } /* SWI: int PL_unify_list(term_t ?t, term_t +h, term_t -t) @@ -1410,7 +1410,7 @@ X_API int PL_unify_string_chars(term_t t, const char *chars) if (LOCAL_Error_TYPE && !Yap_SWIHandleError( "PL_unify_list_ncodes" )) return FALSE; } - return Yap_unify(Yap_GetFromSlot(t PASS_REGS), chterm); + return Yap_unify(Yap_GetFromSlot(t), chterm); } X_API int PL_unify_string_nchars(term_t t, size_t len, const char *chars) @@ -1421,7 +1421,7 @@ X_API int PL_unify_string_nchars(term_t t, size_t len, const char *chars) if (LOCAL_Error_TYPE && !Yap_SWIHandleError( "PL_unify_list_ncodes" )) return FALSE; } - return Yap_unify(Yap_GetFromSlot(t PASS_REGS), chterm); + return Yap_unify(Yap_GetFromSlot(t), chterm); } /* SWI: int PL_unify_wchars(term_t ?t, int type, size_t len,, const pl_wchar_t *s) @@ -1440,24 +1440,24 @@ X_API int PL_unify_wchars(term_t t, int type, size_t len, const pl_wchar_t *char if (at) { Yap_AtomIncreaseHold(at); chterm = MkAtomTerm(at); - return Yap_unify(Yap_GetFromSlot(t PASS_REGS), chterm); + return Yap_unify(Yap_GetFromSlot(t), chterm); } } break; case PL_UTF8_STRING: case PL_STRING: if ((chterm = Yap_NWCharsToString(chars, len PASS_REGS)) != 0) { - return YAP_Unify(Yap_GetFromSlot(t PASS_REGS), chterm); + return YAP_Unify(Yap_GetFromSlot(t ), chterm); } break; case PL_CODE_LIST: if ((chterm = Yap_NWCharsToListOfCodes(chars, len PASS_REGS)) != 0) { - return YAP_Unify(Yap_GetFromSlot(t PASS_REGS), chterm); + return YAP_Unify(Yap_GetFromSlot(t), chterm); } break; case PL_CHAR_LIST: if ((chterm = Yap_NWCharsToListOfAtoms(chars, len PASS_REGS)) != 0) { - return YAP_Unify(Yap_GetFromSlot(t PASS_REGS), chterm); + return YAP_Unify(Yap_GetFromSlot(t), chterm); } break; default: @@ -1520,7 +1520,7 @@ int PL_unify_termv(term_t l, va_list ap) int depth = 1; Term a[1], *pt; stack_el stack[MAX_DEPTH]; - + BACKUP_MACHINE_REGS(); if (Unsigned(HR) > Unsigned(ASP)-CreepFlag) { if (!do_gc(0)) { @@ -1609,7 +1609,7 @@ int PL_unify_termv(term_t l, va_list ap) break; case PL_TERM: { - Term t = Yap_GetFromSlot(va_arg(ap, size_t) PASS_REGS); + Term t = Yap_GetFromSlot(va_arg(ap, size_t)); if (IsVarTerm(t) && VarOfTerm(t) >= ASP && VarOfTerm(t) < LCL0) { Yap_unify(*pt++, t); } @@ -1638,7 +1638,7 @@ int PL_unify_termv(term_t l, va_list ap) snprintf(s, 64, "%lld", va_arg(ap, long long int)); #else sprintf(s, "%lld", va_arg(ap, long long int)); -#endif +#endif mpz_init_set_str (&rop, s, 10); *pt++ = YAP_MkBigNumTerm((void *)&rop); } @@ -1754,7 +1754,7 @@ int PL_unify_termv(term_t l, va_list ap) nels = stack[depth-1].nels; } } - res = Yap_unify(Yap_GetFromSlot(l PASS_REGS),a[0]); + res = Yap_unify(Yap_GetFromSlot(l),a[0]); RECOVER_MACHINE_REGS(); return res; } @@ -1791,7 +1791,7 @@ X_API int PL_term_type(term_t t) { CACHE_REGS /* YAP_ does not support strings as different objects */ - YAP_Term v = Yap_GetFromSlot(t PASS_REGS); + YAP_Term v = Yap_GetFromSlot(t ); if (IsVarTerm(v)) { return PL_VARIABLE; } else if (IsAtomTerm(v)) { @@ -1810,28 +1810,28 @@ X_API int PL_term_type(term_t t) X_API int PL_is_atom(term_t t) { CACHE_REGS - return IsAtomTerm(Yap_GetFromSlot(t PASS_REGS)); + return IsAtomTerm(Yap_GetFromSlot(t)); } X_API int PL_is_ground(term_t t) { CACHE_REGS - return Yap_IsGroundTerm(Yap_GetFromSlot(t PASS_REGS)); + return Yap_IsGroundTerm(Yap_GetFromSlot(t)); } X_API int PL_is_acyclic(term_t t) { CACHE_REGS - return Yap_IsAcyclicTerm(Yap_GetFromSlot(t PASS_REGS)); + return Yap_IsAcyclicTerm(Yap_GetFromSlot(t)); } X_API int PL_is_callable(term_t t) { CACHE_REGS - YAP_Term t1 = Yap_GetFromSlot(t PASS_REGS); + YAP_Term t1 = Yap_GetFromSlot(t); if (IsVarTerm(t1)) return FALSE; - if (IsAtomTerm(t1) || IsPairTerm(t1)) + if (IsAtomTerm(t1) || IsPairTerm(t1)) return TRUE; if (IsApplTerm(t1) && !IsExtensionFunctor(FunctorOfTerm(t1))) return TRUE; @@ -1841,21 +1841,21 @@ X_API int PL_is_callable(term_t t) X_API int PL_is_atomic(term_t ts) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); return !IsVarTerm(t) || !IsApplTerm(t) || !IsPairTerm(t); } X_API int PL_is_compound(term_t ts) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); return (IsApplTerm(t) || IsPairTerm(t)); } X_API int PL_is_functor(term_t ts, functor_t f) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); Functor ff = SWIFunctorToFunctor(f); if (YAP_IsApplTerm(t)) { return FunctorOfTerm(t) == (Functor)ff; @@ -1868,14 +1868,14 @@ X_API int PL_is_functor(term_t ts, functor_t f) X_API int PL_is_float(term_t ts) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); return !IsVarTerm(t) && IsFloatTerm(t); } X_API int PL_is_integer(term_t ts) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts ); if (IsVarTerm(t)) return FALSE; if (IsIntTerm(t)) return TRUE; if (IsApplTerm(t)) { @@ -1893,20 +1893,20 @@ X_API int PL_is_integer(term_t ts) X_API int PL_is_list(term_t ts) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts ); return !IsVarTerm(t) && (t == TermNil || IsPairTerm(t)); } X_API int PL_is_pair(term_t ts) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); return !IsVarTerm(t) && IsPairTerm(t); } X_API int PL_skip_list(term_t list, term_t tail, size_t *len) -{ +{ CACHE_REGS Term *l = Yap_AddressFromSlot(list); Term *t; @@ -1916,7 +1916,7 @@ PL_skip_list(term_t list, term_t tail, size_t *len) if ( len ) *len = length; if ( tail ) - { Term t2 = Yap_GetFromSlot(tail PASS_REGS); + { Term t2 = Yap_GetFromSlot(tail); Yap_unify(t2, *t); } @@ -1935,29 +1935,29 @@ PL_skip_list(term_t list, term_t tail, size_t *len) X_API int PL_is_number(term_t ts) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); return IsIntegerTerm(t) || IsBigIntTerm(t) || IsFloatTerm(t); } X_API int PL_is_string(term_t ts) { CACHE_REGS - Term t = Yap_GetFromSlot(ts PASS_REGS); + Term t = Yap_GetFromSlot(ts); return IsStringTerm(t); } X_API int PL_is_variable(term_t ts) { CACHE_REGS - YAP_Term t = Yap_GetFromSlot(ts PASS_REGS); + YAP_Term t = Yap_GetFromSlot(ts); return YAP_IsVarTerm(t); } X_API int PL_compare(term_t ts1, term_t ts2) { CACHE_REGS - YAP_Term t1 = Yap_GetFromSlot(ts1 PASS_REGS); - YAP_Term t2 = Yap_GetFromSlot(ts2 PASS_REGS); + YAP_Term t1 = Yap_GetFromSlot(ts1); + YAP_Term t2 = Yap_GetFromSlot(ts2); return YAP_CompareTerms(t1, t2); } @@ -1966,7 +1966,7 @@ PL_record_external (term_t ts, size_t *sz) { CACHE_REGS - Term t = Yap_GetFromSlot(ts PASS_REGS); + Term t = Yap_GetFromSlot(ts); size_t len = 512, nsz; char *s; @@ -1977,16 +1977,16 @@ PL_record_external *sz = nsz; return (char *)s; } else { - if (len < 16*1024) + if (len < 16*1024) len = len *2; - else + else len += 16*1024; } } return NULL; } -/* +/* partial implementation of recorded_external, does not guarantee endianness nor portability, and does not support constraints. */ @@ -2015,7 +2015,7 @@ X_API record_t PL_record(term_t ts) { CACHE_REGS - Term t = Yap_GetFromSlot(ts PASS_REGS); + Term t = Yap_GetFromSlot(ts); return (record_t)YAP_Record(t); } @@ -2102,7 +2102,7 @@ PL_exception(qid_t q) YAP_Term t; if (YAP_GoalHasException(&t)) { CACHE_REGS - term_t to = Yap_NewSlots(1 PASS_REGS); + term_t to = Yap_NewSlots(1); Yap_PutInSlot(to,t PASS_REGS); return to; } else { @@ -2152,9 +2152,9 @@ X_API int PL_is_initialised(int *argcp, char ***argvp) { if (GLOBAL_InitialisedFromPL) { - if (argcp) + if (argcp) *argcp = GLOBAL_PL_Argc; - if (argvp) + if (argvp) *argvp = GLOBAL_PL_Argv; } return GLOBAL_InitialisedFromPL; @@ -2179,7 +2179,7 @@ PL_strip_module(term_t raw, module_t *m, term_t plain) m0 = MkAtomTerm(AtomProlog); } else m0 = USER_MODULE; - t = Yap_StripModule(Yap_GetFromSlot(raw PASS_REGS), &m0); + t = Yap_StripModule(Yap_GetFromSlot(raw), &m0); if (!t) return FALSE; *m = Yap_GetModuleEntry(m0); @@ -2259,7 +2259,7 @@ X_API int PL_unify_predicate(term_t head, predicate_t pred, int how) } } nt = Yap_MkApplTerm(FunctorModule, 2, ts); - return Yap_unify(Yap_GetFromSlot(head PASS_REGS),nt); + return Yap_unify(Yap_GetFromSlot(head),nt); } X_API void PL_predicate_info(predicate_t p,atom_t *name, int *arity, module_t *m) @@ -2276,7 +2276,7 @@ X_API void PL_predicate_info(predicate_t p,atom_t *name, int *arity, module_t *m *arity = 0; aname = (Atom)(pd->FunctorOfPred); } - if (pd->ModuleOfPred && m) + if (pd->ModuleOfPred && m) *m = Yap_GetModuleEntry(pd->ModuleOfPred); else if (m) *m = Yap_GetModuleEntry(TermProlog); @@ -2306,7 +2306,7 @@ PL_open_foreign_frame(void) HB = HR; B = cp_b; ASP = (CELL *)B; - + return (fid_t)(LCL0-(CELL*)cp_b); } @@ -2315,7 +2315,7 @@ PL_close_foreign_frame(fid_t f) { CACHE_REGS choiceptr cp_b = (choiceptr)(LCL0-(UInt)f); - Yap_CloseSlots( IntOfTerm(cp_b->cp_a1) ); + Yap_CloseSlots( IntOfTerm(cp_b->cp_a1) ); B = cp_b; HB = B->cp_h; Yap_TrimTrail(); @@ -2350,7 +2350,7 @@ PL_rewind_foreign_frame(fid_t f) backtrack(); // restore to original location ASP = (CELL *)B; - Yap_CloseSlots( IntOfTerm(cp_b->cp_a1) ); + Yap_CloseSlots( IntOfTerm(cp_b->cp_a1) ); } X_API void @@ -2364,7 +2364,7 @@ PL_discard_foreign_frame(fid_t f) B = B->cp_b; backtrack(); } - Yap_CloseSlots( IntOfTerm(cp_b->cp_a1) ); + Yap_CloseSlots( IntOfTerm(cp_b->cp_a1) ); B = cp_b->cp_b; CP = cp_b->cp_cp; ENV = cp_b->cp_env; @@ -2379,9 +2379,6 @@ PL_discard_foreign_frame(fid_t f) X_API qid_t PL_open_query(module_t ctx, int flags, predicate_t p, term_t t0) { CACHE_REGS - YAP_Term *t = NULL; - if (t0) - t = Yap_AddressFromSlot(t0); /* ignore flags and module for now */ qid_t new = (qid_t)Yap_AllocCodeSpace(sizeof(struct open_query_struct)); @@ -2391,7 +2388,7 @@ X_API qid_t PL_open_query(module_t ctx, int flags, predicate_t p, term_t t0) new->q_state=0; new->q_flags = flags; new->q_pe = (PredEntry *)p; - new->q_g = t; + new->q_g = t0; return new; } @@ -2475,7 +2472,7 @@ X_API int PL_call(term_t tp, module_t m) Term t[2], g; t[0] = SWIModuleToModule(m); - t[1] = Yap_GetFromSlot(tp PASS_REGS); + t[1] = Yap_GetFromSlot(tp ); g = Yap_MkApplTerm(FunctorModule,2,t); out = YAP_RunGoal(g); @@ -2493,14 +2490,14 @@ X_API void PL_register_foreign_in_module(const char *module, const char *name, i #ifdef DEBUG if (flags & (PL_FA_CREF)) { fprintf(stderr,"PL_register_foreign_in_module called with non-implemented flag %x when creating predicate %s:%s/%d\n", flags, module, name, arity); - } + } #endif if (module == NULL) { tmod = CurrentModule; } else { tmod = MkAtomTerm(Yap_LookupAtom((char *)module)); } - if (flags & PL_FA_VARARGS) { + if (flags & PL_FA_VARARGS) { nflags = SWIEnvPredFlag; } if (flags & PL_FA_TRANSPARENT) { @@ -2527,7 +2524,7 @@ X_API void PL_register_extensions(const PL_extension *ptr) X_API void PL_register_extensions_in_module(const char *module, const PL_extension *e) -{ +{ // implemented as register foreign /* ignore flags for now */ while(e->predicate_name != NULL) { @@ -2554,7 +2551,7 @@ X_API void PL_load_extensions(const PL_extension *ptr) X_API int PL_is_inf(term_t st) { CACHE_REGS - Term t = Deref(Yap_GetFromSlot(st PASS_REGS)); + Term t = Deref(Yap_GetFromSlot(st)); if (IsVarTerm(t)) return FALSE; if (!IsFloatTerm(t)) return FALSE; #if HAVE_ISINF @@ -2602,7 +2599,7 @@ Prolog. int PL_thread_raise(int tid, int sig) -{ +{ PL_LOCK(L_THREAD); if ( tid < 1 ) { error: @@ -2625,7 +2622,7 @@ PL_thread_raise(int tid, int sig) int PL_thread_raise(int tid, int sig) -{ +{ if ( !raiseSignal(NULL, sig) ) return FALSE; @@ -2638,7 +2635,7 @@ X_API int PL_unify_thread_id(term_t t, int i) { CACHE_REGS Term iterm = MkIntegerTerm(i); - return Yap_unify(Yap_GetFromSlot(t PASS_REGS),iterm); + return Yap_unify(Yap_GetFromSlot(t),iterm); } @@ -2658,7 +2655,7 @@ pl_thread_self(void) X_API int PL_thread_attach_engine(const PL_thread_attr_t *attr) { int wid = pl_thread_self(); - + if (wid < 0) { /* we do not have an engine */ if (attr) { @@ -2821,7 +2818,7 @@ X_API int PL_eval_expression_to_int64_ex(term_t t, int64_t *val) { CACHE_REGS - Term res = Yap_Eval(Yap_GetFromSlot(t PASS_REGS)); + Term res = Yap_Eval(Yap_GetFromSlot(t)); if (!res) { return FALSE; } @@ -2832,7 +2829,7 @@ PL_eval_expression_to_int64_ex(term_t t, int64_t *val) } else if (YAP_IsBigNumTerm(res)) { MP_INT g; char s[64]; - + YAP_BigNumOfTerm(t, (void *)&g); if (mpz_sizeinbase(&g,2) > 64) { return PL_error(NULL,0,NULL, ERR_EVALUATION, AtomToSWIAtom(Yap_LookupAtom("int_overflow"))); @@ -2946,12 +2943,12 @@ PL_query(int query) fprintf(stderr,"Unimplemented PL_query %d\n",query); return (intptr_t)0; } -} +} X_API void PL_cleanup_fork(void) { -} +} X_API void (*PL_signal(int sig, void (*func)(int)))(int) @@ -3103,7 +3100,7 @@ Yap_swi_install(void) extern atom_t fileNameStream(IOSTREAM *s); extern Atom Yap_FileName(IOSTREAM *s); -Atom +Atom Yap_FileName(IOSTREAM *s) { atom_t a = fileNameStream(s); @@ -3126,7 +3123,7 @@ Int Yap_StreamToFileNo(Term t) { IOSTREAM *s; int rc; - if ( (rc=PL_get_stream_handle(Yap_InitSlot(t PASS_REGS), &s)) ) { + if ( (rc=PL_get_stream_handle(Yap_InitSlot(t), &s)) ) { return Sfileno(s); } return -1; @@ -3138,7 +3135,7 @@ FILE *Yap_FileDescriptorFromStream(Term t) IOSTREAM *s; int rc; - if ( (rc=PL_get_stream_handle(Yap_InitSlot(t PASS_REGS), &s)) ) { + if ( (rc=PL_get_stream_handle(Yap_InitSlot(t), &s)) ) { fprintf(stderr,"Unimplemented\n"); // return Sfileno(s); } @@ -3158,7 +3155,7 @@ raiseSignal(PL_local_data_t *ld, int sig) #if THREADS if (sig == SIG_THREAD_SIGNAL) { Yap_signal(YAP_ITI_SIGNAL); - return TRUE; + return TRUE; } #endif fprintf(stderr, "Unsupported signal %d\n", sig); @@ -3183,7 +3180,7 @@ extern term_t Yap_CvtTerm(term_t ts); term_t Yap_CvtTerm(term_t ts) { CACHE_REGS - Term t = Yap_GetFromSlot(ts PASS_REGS); + Term t = Yap_GetFromSlot(ts); if (IsVarTerm(t)) return ts; if (IsPairTerm(t)) return ts; if (IsAtomTerm(t)) return ts; @@ -3207,22 +3204,22 @@ term_t Yap_CvtTerm(term_t ts) ta[1] = Yap_MkBigIntTerm(mpq_denref(b)); if (ta[1] == TermNil) return ts; - return Yap_InitSlot(Yap_MkApplTerm(FunctorRDiv, 2, ta) PASS_REGS); + return Yap_InitSlot(Yap_MkApplTerm(FunctorRDiv, 2, ta)); } -#endif +#endif case EMPTY_ARENA: case ARRAY_INT: case ARRAY_FLOAT: case CLAUSE_LIST: case EXTERNAL_BLOB: - return Yap_InitSlot(MkIntTerm(0) PASS_REGS); + return Yap_InitSlot(MkIntTerm(0)); default: return ts; } } else if (f == FunctorDBRef) { Term ta[0]; ta[0] = MkIntegerTerm((Int)DBRefOfTerm(t)); - return Yap_InitSlot(Yap_MkApplTerm(FunctorDBREF, 1, ta) PASS_REGS); + return Yap_InitSlot(Yap_MkApplTerm(FunctorDBREF, 1, ta)); } } } @@ -3233,4 +3230,3 @@ term_t Yap_CvtTerm(term_t ts) * @} * @} */ - diff --git a/library/dialect/swi/fli/swi.h b/library/dialect/swi/fli/swi.h index ddc3b1f2f..c94c4b28b 100644 --- a/library/dialect/swi/fli/swi.h +++ b/library/dialect/swi/fli/swi.h @@ -8,10 +8,10 @@ * * *************************************************************************/ -/** +/** @{ - + @file swi.h @defgroup swi-c-interface SWI-Prolog Foreign Language Interface @@ -37,18 +37,6 @@ void Yap_swi_install(void); void Yap_install_blobs(void); -typedef struct open_query_struct { - int q_open; - int q_state; - YAP_Term *q_g; - PredEntry *q_pe; - yamop *q_p, *q_cp; - jmp_buf q_env; - int q_flags; - YAP_dogoalinfo q_h; - struct open_query_struct *oq; -} open_query; - #define addr_hash(V) (((CELL) (V)) >> 4 & (N_SWI_HASH-1)) static inline void diff --git a/man/pl.bib b/man/pl.bib index 1bbae293d..ce9b366c5 100644 --- a/man/pl.bib +++ b/man/pl.bib @@ -258,7 +258,7 @@ publisher = {Springer-Verlag}, location = {Link{\"o}ping, Sweden} } - + @Book{Bratko:86, author = "I. Bratko", @@ -1099,4 +1099,3 @@ pages = {14--17} Data Representation in the BinWAM. {\em Proc.~of Programming Languages Implementation and Logic Programming (PLILP'94)}, LNCS 844, Madrid 1994. - diff --git a/misc/GLOBALS b/misc/GLOBALS index c67065444..cc44c04ec 100755 --- a/misc/GLOBALS +++ b/misc/GLOBALS @@ -39,7 +39,8 @@ Agc_hook AGCHook =NULL #if __ANDROID__ // no need to perform initialization, it is done before we start the Prolog engine. -struct AAssetManager* assetManager =GLOBAL_assetManager +struct AAssetManager* assetManager =NULL +char* AssetsWD =NULL #endif /* multi-thread support */ diff --git a/misc/mkandroid b/misc/mkandroid index 705c0a143..2aee6b222 100755 --- a/misc/mkandroid +++ b/misc/mkandroid @@ -130,50 +130,57 @@ startemulator () { fi } +androidize () { + cd packages/swig + mkdir -p "$ANDROID_NDK_ROOT"/build/core/lib + make install-android + cd ../.. +} cd $BUILDDROID -if test x$1 = xmake -then - ./config.status - make -j install - rm -r packages/swig/android -elif test x$1 = xenv +export HOST="$ANDROID_ARCH"-linux-androideabi +export CPP="$HOST"-cpp +export DESTDIR=`pwd`/packages/swig/android +export PATH="$PATH":/usr/local/bin + +if test x$1 = xenv then return 0 elif test x$1 = xdmake then make -elif test x$1 = xgo +elif test x$1 = xmake then - echo "In make I believe" + pushd packages/swig + make clean + popd + ./config.status + CFLAGS="-g" make -j install elif test x$1 = xeclipse then startemulator "$ECLIPSE" & return 0 else - startemulator + startemulator rm -rf "$BUILDDROID"/* cd "$BUILDDROID" - export HOST="$ANDROID_ARCH"-linux-androideabi - export CPP="$HOST"-cpp "$YAP_SRC"/configure \ --host="$HOST" \ - --prefix=`pwd` \ --enable-low-level-tracer \ --enable-debug-yap \ --enable-dynamic-loading \ + --bindir=/usr/bin \ + --prefix=/assets \ + --enable-dynamic-loading \ --with-swig \ - --with-gmp=$GMPDIR \ - --with-sqlite3=$SQLITE3DIR #\ + --with-gmp="$GMPDIR" \ + --with-sqlite3="$SQLITE3DIR" + + #\ #--enable-chr=yes #--enable-threads make depend - make -j install + CFLAGS="-g" make -j install fi -cd packages/swig -mkdir -p "$ANDROID_NDK_ROOT"/build/core/lib -make android -make install-android -adb uninstall pt.up.fc.dcc.yap -adb install android/bin/JavaYap-debug.apk +androidize diff --git a/os/SWI-Stream.h b/os/SWI-Stream.h index 53fa8da77..23c1287be 100755 --- a/os/SWI-Stream.h +++ b/os/SWI-Stream.h @@ -369,9 +369,6 @@ PL_EXPORT(int) StryLock(IOSTREAM *s); PL_EXPORT(int) Sunlock(IOSTREAM *s); PL_EXPORT(IOSTREAM *) Snew(void *handle, int flags, IOFUNCTIONS *functions); PL_EXPORT(IOSTREAM *) Sopen_file(const char *path, const char *how); -#ifdef ANDROID_ASSET_MANAGER_H -PL_EXPORT(IOSTREAM *) Sopen_asset(char *bufp, const char *how, AAssetManager* mgr); -#endif PL_EXPORT(IOSTREAM *) Sfdopen(int fd, const char *type); PL_EXPORT(int) Sfileno(IOSTREAM *s); PL_EXPORT(IOSTREAM *) Sopen_pipe(const char *command, const char *type); @@ -393,7 +390,7 @@ PL_EXPORT(SOCKET) Swinsock(IOSTREAM *s); #endif #endif - + PL_EXPORT(int) ScheckBOM(IOSTREAM *s); PL_EXPORT(int) SwriteBOM(IOSTREAM *s); PL_EXPORT(ssize_t) Sread_user(void *handle, char *buf, size_t size); diff --git a/os/pl-file.c b/os/pl-file.c index cc6ea01b7..69075c52c 100644 --- a/os/pl-file.c +++ b/os/pl-file.c @@ -2703,7 +2703,7 @@ PRED_IMPL("put_byte", 2, put_byte2, 0) } -/** @pred put_byte(+ _N_) is iso +/** @pred put_byte(+ _N_) is iso Outputs to the current output stream the character whose code is @@ -2737,7 +2737,7 @@ put_code(term_t stream, term_t chr ARG_LD) As `put_code(N)`, but to text stream _S_. - + */ /** @pred put_char(+ _S_,+ _A_) is iso @@ -2762,7 +2762,7 @@ text stream. */ -/** @pred put_code(+ _N_) is iso +/** @pred put_code(+ _N_) is iso Outputs to the current output stream the character whose ASCII code is @@ -2770,7 +2770,7 @@ Outputs to the current output stream the character whose ASCII code is _N_ must be a legal ASCII character code, an expression yielding such a code, or a list in which case only the first element is used. - + */ static PRED_IMPL("put_code", 1, put_code1, 0) @@ -2784,7 +2784,7 @@ PRED_IMPL("put_code", 1, put_code1, 0) As `put(N)`, but to stream _S_. - + */ static PRED_IMPL("put", 2, put2, 0) @@ -2794,7 +2794,7 @@ PRED_IMPL("put", 2, put2, 0) } -/** @pred put(+ _N_) +/** @pred put(+ _N_) Outputs to the current output stream the character whose ASCII code is @@ -2802,7 +2802,7 @@ Outputs to the current output stream the character whose ASCII code is expression yielding such a code, or a list in which case only the first element is used. - + */ static PRED_IMPL("put", 1, put1, 0) @@ -2838,7 +2838,7 @@ get_nonblank(term_t in, term_t chr ARG_LD) } -/** @pred get(- _C_) +/** @pred get(- _C_) The next non-blank character from the current input stream is unified @@ -2847,7 +2847,7 @@ greater than 32. If there are no more non-blank characters in the stream, _C_ is unified with -1. If `end_of_stream` has already been reached in the previous reading, this call will give an error message. - + */ static PRED_IMPL("get", 1, get1, 0) @@ -2861,7 +2861,7 @@ PRED_IMPL("get", 1, get1, 0) The same as `get(C)`, but from stream _S_. - + */ static PRED_IMPL("get", 2, get2, 0) @@ -2889,14 +2889,14 @@ skip(term_t in, term_t chr ARG_LD) } -/** @pred skip(+ _N_) +/** @pred skip(+ _N_) Skips input characters until the next occurrence of the character with ASCII code _N_. The argument to this predicate can take the same forms as those for `put` (see 6.11). - + */ static PRED_IMPL("skip", 1, skip1, 0) @@ -2911,7 +2911,7 @@ PRED_IMPL("skip", 1, skip1, 0) Like skip/1, but using stream _S_ instead of the current input stream. - + */ static PRED_IMPL("skip", 2, skip2, 0) @@ -2979,7 +2979,7 @@ If _C_ is unbound, or is a character code, and the stream _S_ is a binary stream, read the next byte from that stream and unify its code with _C_. - + */ static PRED_IMPL("get_byte", 2, get_byte2, 0) @@ -2989,14 +2989,14 @@ PRED_IMPL("get_byte", 2, get_byte2, 0) } -/** @pred get_byte(- _C_) is iso +/** @pred get_byte(- _C_) is iso If _C_ is unbound, or is a character code, and the current stream is a binary stream, read the next byte from the current stream and unify its code with _C_. - + */ static PRED_IMPL("get_byte", 1, get_byte1, 0) @@ -3038,7 +3038,7 @@ If _C_ is unbound, or is a character code, and the stream _S_ is a text stream, read the next character from that stream and unify its code with _C_. - + */ static PRED_IMPL("get_code", 2, get_code2, 0) @@ -3047,14 +3047,14 @@ PRED_IMPL("get_code", 2, get_code2, 0) } -/** @pred get_code(- _C_) is iso +/** @pred get_code(- _C_) is iso If _C_ is unbound, or is the code for a character, and the current stream is a text stream, read the next character from the current stream and unify its code with _C_. - + */ static PRED_IMPL("get_code", 1, get_code1, 0) @@ -3090,7 +3090,7 @@ If _C_ is unbound, or is an atom representation of a character, and the stream _S_ is a text stream, read the next character from that stream and unify its representation as an atom with _C_. - + */ static PRED_IMPL("get_char", 2, get_char2, 0) @@ -3099,14 +3099,14 @@ PRED_IMPL("get_char", 2, get_char2, 0) } -/** @pred get_char(- _C_) is iso +/** @pred get_char(- _C_) is iso If _C_ is unbound, or is an atom representation of a character, and the current stream is a text stream, read the next character from the current stream and unify its atom representation with _C_. - + */ static PRED_IMPL("get_char", 1, get_char1, 0) @@ -3181,7 +3181,7 @@ PRED_IMPL("protocolling", 1, protocolling, 0) } -/** @pred prompt(- _A_,+ _B_) +/** @pred prompt(- _A_,+ _B_) Changes YAP input prompt from _A_ to _B_. */ @@ -3280,7 +3280,7 @@ tab(term_t out, term_t spaces ARG_LD) The same as tab/1, but using stream _S_. - + */ static PRED_IMPL("tab", 2, tab2, 0) @@ -3289,12 +3289,12 @@ PRED_IMPL("tab", 2, tab2, 0) return tab(A1, A2 PASS_LD); } -/** @pred tab(+ _N_) +/** @pred tab(+ _N_) Outputs _N_ spaces to the current output stream. - + */ static PRED_IMPL("tab", 1, tab1, 0) @@ -3413,7 +3413,7 @@ openStream(term_t file, term_t mode, term_t options) int reposition = TRUE; atom_t alias = NULL_ATOM; atom_t eof_action = ATOM_eof_code; - int close_on_abort = TRUE; + int close_on_abort = TRUE; atom_t buffer = ATOM_full; atom_t lock = ATOM_none; int wait = TRUE; @@ -3533,15 +3533,6 @@ openStream(term_t file, term_t mode, term_t options) #endif /*HAVE_POPEN*/ if ( PL_get_file_name(file, &path, 0) ) { -#if __ANDROID__ - if (strstr(path,"/assets/")) { - if (!(s=Sopen_asset(path+8, "r", GLOBAL_assetManager))) - { PL_error(NULL, 0, OsError(), ERR_FILE_OPERATION, - ATOM_open, ATOM_source_sink, file); - return NULL; - } - } else -#endif if ( !(s = Sopen_file(path, how)) ) { PL_error(NULL, 0, OsError(), ERR_FILE_OPERATION, ATOM_open, ATOM_source_sink, file); @@ -3697,7 +3688,7 @@ open_expands_filename. - + */ static PRED_IMPL("open", 4, open4, PL_FA_ISO) @@ -3710,7 +3701,7 @@ PRED_IMPL("open", 4, open4, PL_FA_ISO) } -/** @pred open(+ _F_,+ _M_,- _S_) is iso +/** @pred open(+ _F_,+ _M_,- _S_) is iso Opens the file with name _F_ in mode _M_ (`read`, `write` or @@ -3828,7 +3819,7 @@ pl_seen(void) return symbol_no_stream(ATOM_current_input); } -/** @pred see(+ _S_) +/** @pred see(+ _S_) If _S_ is a currently opened input stream then it is assumed to be @@ -3844,7 +3835,7 @@ When _S_ is a stream not currently opened for input, an error may be reported, depending on the state of the `file_errors` flag. If _S_ is neither a stream nor an atom the predicates just fails. - + */ static PRED_IMPL("see", 1, see, 0) @@ -3852,7 +3843,7 @@ PRED_IMPL("see", 1, see, 0) } -/** @pred seen +/** @pred seen Closes the current input stream (see 6.7.). @@ -3864,12 +3855,12 @@ PRED_IMPL("seen", 0, seen, 0) } -/** @pred seeing(- _S_) +/** @pred seeing(- _S_) The current input stream is unified with _S_. - + */ static PRED_IMPL("seeing", 1, seeing, 0) @@ -3925,7 +3916,7 @@ ok: return TRUE; } -/** @pred tell(+ _S_) +/** @pred tell(+ _S_) If _S_ is a currently opened stream for output, it becomes the @@ -3941,7 +3932,7 @@ Whenever _S_ is a stream not currently opened for output, an error may be reported, depending on the state of the file_errors flag. The predicate just fails, if _S_ is neither a stream nor an atom. - + */ static PRED_IMPL("tell", 1, tell, 0) @@ -3953,12 +3944,12 @@ PRED_IMPL("append", 1, append, 0) { return do_tell(A1, ATOM_append); } -/** @pred telling(- _S_) +/** @pred telling(- _S_) The current output stream is unified with _S_. - + */ static PRED_IMPL("telling", 1, telling, 0) @@ -3970,7 +3961,7 @@ PRED_IMPL("telling", 1, telling, 0) return PL_unify_stream(A1, Scurout); } -/** @pred told +/** @pred told Closes the current output stream, and the user's terminal becomes again @@ -3978,7 +3969,7 @@ the current output stream. It is important to remember to close streams after having finished using them, as the maximum number of simultaneously opened streams is 17. - + */ static PRED_IMPL("told", 0, told, 0) @@ -4128,14 +4119,14 @@ pl_close(term_t stream, int force ARG_LD) } -/** @pred close(+ _S_) is iso +/** @pred close(+ _S_) is iso Closes the stream _S_. If _S_ does not stand for a stream currently opened an error is reported. The streams user_input, user_output, and user_error can never be closed. - + */ static PRED_IMPL("close", 1, close, PL_FA_ISO) @@ -4153,12 +4144,12 @@ static const opt_spec close2_options[] = /** @pred close(+ _S_,+ _O_) is iso -Closes the stream _S_, following options _O_. +Closes the stream _S_, following options _O_. The only valid options are `force(true)` and `force(false)`. YAP currently ignores these options. - + */ static PRED_IMPL("close", 2, close2, PL_FA_ISO) @@ -4560,7 +4551,7 @@ typedef struct } prop_enum; -/** @pred stream_property(? _Stream_,? _Prop_) is iso +/** @pred stream_property(? _Stream_,? _Prop_) is iso @@ -4633,12 +4624,12 @@ The initial mode is `prolog` for the user streams and -+ current_line_number(- _LineNumber_) ++ current_line_number(- _LineNumber_) Unify _LineNumber_ with the line number for the current stream. - + */ static PRED_IMPL("stream_property", 2, stream_property, @@ -4848,7 +4839,7 @@ PRED_IMPL("stream_property", 2, stream_property, } -/** @pred is_stream( _S_) +/** @pred is_stream( _S_) Succeeds if _S_ is a currently open stream. @@ -4891,12 +4882,12 @@ flush_output(term_t out ARG_LD) return FALSE; } -/** @pred flush_output is iso +/** @pred flush_output is iso Send out all data in the output buffer of the current output stream. - + */ static PRED_IMPL("flush_output", 0, flush_output, PL_FA_ISO) @@ -4909,7 +4900,7 @@ PRED_IMPL("flush_output", 0, flush_output, PL_FA_ISO) Send all data in the output buffer for stream _S_. - + */ static PRED_IMPL("flush_output", 1, flush_output1, PL_FA_ISO) @@ -4973,13 +4964,13 @@ getRepositionableStream(term_t stream, IOSTREAM **sp) } -/** @pred set_stream_position(+ _S_, + _POS_) is iso +/** @pred set_stream_position(+ _S_, + _POS_) is iso Given a stream position _POS_ for a stream _S_, set the current stream position for _S_ to be _POS_. - + */ static PRED_IMPL("set_stream_position", 2, set_stream_position, PL_FA_ISO) @@ -5079,13 +5070,13 @@ PRED_IMPL("seek", 4, seek, 0) } -/** @pred set_input(+ _S_) is iso +/** @pred set_input(+ _S_) is iso Set stream _S_ as the current input stream. Predicates like read/1 and get/1 will start using stream _S_. - + */ static PRED_IMPL("set_input", 1, set_input, PL_FA_ISO) @@ -5108,7 +5099,7 @@ PRED_IMPL("set_input", 1, set_input, PL_FA_ISO) Set stream _S_ as the current output stream. Predicates like write/1 and put/1 will start using stream _S_. - + */ static PRED_IMPL("set_output", 1, set_output, PL_FA_ISO) @@ -5125,12 +5116,12 @@ PRED_IMPL("set_output", 1, set_output, PL_FA_ISO) } -/** @pred current_input(- _S_) is iso +/** @pred current_input(- _S_) is iso Unify _S_ with the current input stream. - + */ static PRED_IMPL("current_input", 1, current_input, PL_FA_ISO) @@ -5139,12 +5130,12 @@ PRED_IMPL("current_input", 1, current_input, PL_FA_ISO) } -/** @pred current_output(- _S_) is iso +/** @pred current_output(- _S_) is iso Unify _S_ with the current output stream. - + */ static PRED_IMPL("current_output", 1, current_output, PL_FA_ISO) @@ -5177,13 +5168,13 @@ PRED_IMPL("byte_count", 2, byte_count, 0) } -/** @pred character_count(+ _Stream_,- _CharacterCount_) +/** @pred character_count(+ _Stream_,- _CharacterCount_) Unify _CharacterCount_ with the number of characters written to or read from _Stream_. - + */ static PRED_IMPL("character_count", 2, character_count, 0) @@ -5201,12 +5192,12 @@ PRED_IMPL("character_count", 2, character_count, 0) } -/** @pred line_count(+ _Stream_,- _LineNumber_) +/** @pred line_count(+ _Stream_,- _LineNumber_) Unify _LineNumber_ with the line number for the _Stream_. - + */ static PRED_IMPL("line_count", 2, line_count, 0) @@ -5224,13 +5215,13 @@ PRED_IMPL("line_count", 2, line_count, 0) } -/** @pred line_position(+ _Stream_,- _LinePosition_) +/** @pred line_position(+ _Stream_,- _LinePosition_) Unify _LinePosition_ with the position on current text stream _Stream_. - + */ static PRED_IMPL("line_position", 2, line_position, 0) @@ -5289,7 +5280,7 @@ at_end_of_stream(term_t stream ARG_LD) Succeed if the stream _S_ has stream position end-of-stream or past-end-of-stream. Note that _S_ must be a readable stream. - + */ static PRED_IMPL("at_end_of_stream", 1, at_end_of_stream, PL_FA_ISO) @@ -5297,13 +5288,13 @@ PRED_IMPL("at_end_of_stream", 1, at_end_of_stream, PL_FA_ISO) return at_end_of_stream(A1 PASS_LD); } -/** @pred at_end_of_stream is iso +/** @pred at_end_of_stream is iso Succeed if the current stream has stream position end-of-stream or past-end-of-stream. - + */ static PRED_IMPL("at_end_of_stream", 0, at_end_of_stream0, PL_FA_ISO) @@ -5327,13 +5318,13 @@ peek(term_t stream, term_t chr, int how ARG_LD) if ( how == PL_BYTE ) { IOPOS pos = s->posbuf; - c = Sgetc(s); - if ( c != EOF ) - Sungetc(c, s); + if ( c != EOF ){ + Sungetc(c, s); + } s->posbuf = pos; - } else - { c = Speekcode(s); + } else { +c = Speekcode(s); } if ( Sferror(s) ) return streamStatus(s); @@ -5359,7 +5350,7 @@ If _C_ is unbound, or is a character code, and _S_ is a binary stream, read the next byte from the current stream and unify its code with _C_, while leaving the current stream position unaltered. - + */ static PRED_IMPL("peek_byte", 2, peek_byte2, 0) @@ -5368,14 +5359,14 @@ PRED_IMPL("peek_byte", 2, peek_byte2, 0) } -/** @pred peek_byte(- _C_) is iso +/** @pred peek_byte(- _C_) is iso If _C_ is unbound, or is a character code, and the current stream is a binary stream, read the next byte from the current stream and unify its code with _C_, while leaving the current stream position unaltered. - + */ static PRED_IMPL("peek_byte", 1, peek_byte1, 0) @@ -5391,7 +5382,7 @@ the stream _S_ is a text stream, read the next character from that stream and unify its representation as an atom with _C_, while leaving the current stream position unaltered. - + */ static PRED_IMPL("peek_code", 2, peek_code2, 0) @@ -5407,7 +5398,7 @@ the stream _S_ is a text stream, read the next character from that stream and unify its representation as an atom with _C_, while leaving the current stream position unaltered. - + */ static PRED_IMPL("peek_code", 1, peek_code1, 0) @@ -5423,7 +5414,7 @@ the stream _S_ is a text stream, read the next character from that stream and unify its representation as an atom with _C_, while leaving the current stream position unaltered. - + */ static PRED_IMPL("peek_char", 2, peek_char2, 0) @@ -5431,7 +5422,7 @@ PRED_IMPL("peek_char", 2, peek_char2, 0) return peek(A1, A2, PL_CHAR PASS_LD); } -/** @pred peek_char(- _C_) is iso +/** @pred peek_char(- _C_) is iso If _C_ is unbound, or is an atom representation of a character, and @@ -5439,7 +5430,7 @@ the current stream is a text stream, read the next character from the current stream and unify its atom representation with _C_, while leaving the current stream position unaltered. - + */ static PRED_IMPL("peek_char", 1, peek_char1, 0) @@ -5755,7 +5746,7 @@ BeginPredDefs(file) PRED_DEF("get0", 1, get_code1, 0) PRED_DEF("ttyflush", 0, ttyflush, 0) PRED_DEF("prompt", 2, prompt, 0) - PRED_DEF("tab", 2, tab2, 0) +PRED_DEF("tab", 2, tab2, 0) PRED_DEF("tab", 1, tab1, 0) /* Quintus IO */ PRED_DEF("byte_count", 2, byte_count, 0) @@ -5883,20 +5874,20 @@ static const PL_extension foreigns[] = { FRG("print", 1, pl_print, 0), FRG("writeln", 1, pl_writeln, 0), FRG("nl", 1, pl_nl1, ISO), - FRG("format", 2, pl_format, META), + FRG("format", 2, pl_format, METAP), FRG("write", 2, pl_write2, ISO), FRG("writeq", 2, pl_writeq2, ISO), FRG("print", 2, pl_print2, 0), FRG("write_canonical", 2, pl_write_canonical2, ISO), - FRG("format", 3, pl_format3, META), + FRG("format", 3, pl_format3, METAP), FRG("sleep", 1, pl_sleep, 0), FRG("get_time", 1, pl_get_time, 0), // vsc - FRG("format_predicate", 2, pl_format_predicate, META), + FRG("format_predicate", 2, pl_format_predicate, METAP), FRG("current_format_predicate", 2, pl_current_format_predicate, - META|NDET), + METAP|NDET), FRG("$raw_read", 1, pl_raw_read, 0), FRG("$raw_read", 2, pl_raw_read2, 0), @@ -5906,37 +5897,11 @@ static const PL_extension foreigns[] = { LFRG((char *)NULL, 0, NULL, 0) }; -#if __ANDROID__ -JNIEnv *Yap_jenv; - -void Java_pt_up_fc_dcc_yap_JavaYap_load(JNIEnv *env0, jobject obj, jobject mgr); - -void Java_pt_up_fc_dcc_yap_JavaYap_load - (JNIEnv *env0, jobject obj, jobject mgr0) -{ - AAssetManager *mgr = AAssetManager_fromJava(env0, mgr0); - Yap_jenv = env0; - if (mgr == NULL) { - __android_log_print(ANDROID_LOG_DEBUG, "YapJava", "Need to print : we're doomed, mgr = 0; bip bip bip"); - } else { - __android_log_print(ANDROID_LOG_DEBUG, "YapJava", "Need to print : we're winning, mgr = %p; yeah", mgr); - GLOBAL_assetManager = mgr; - } -} - -AAssetManager *Yap_assetManager( void ); - -AAssetManager *Yap_assetManager( void ) -{ - return GLOBAL_assetManager; -} -#endif - struct PL_local_data *Yap_InitThreadIO(int wid) { struct PL_local_data *p; - if (wid) + if (wid) p = (struct PL_local_data *)malloc(sizeof(struct PL_local_data)); else return &lds; @@ -6046,4 +6011,3 @@ init_yap(void) /** @} */ - diff --git a/os/pl-files.c b/os/pl-files.c index 97982ee78..027a2be62 100644 --- a/os/pl-files.c +++ b/os/pl-files.c @@ -122,25 +122,12 @@ LastModifiedFile(const char *name, double *tp) char tmp[MAXPATHLEN]; statstruct buf; #ifdef __ANDROID__ - if (strstr(name,"/assets")) { - AAssetManager* mgr = GLOBAL_assetManager; - *tp = (double)0; - if (!strcmp(name,"/assets")) - return TRUE; - const char *bufp=name+strlen("/assets/"); - // check if file is a directory. - AAssetDir *assetDir = AAssetManager_openDir(mgr, bufp); - if (assetDir) { - const char *ptr = AAssetDir_getNextFileName(assetDir) ; - AAssetDir_close(assetDir); - if (ptr) - return TRUE; - } - AAsset *asset = AAssetManager_open(mgr, bufp, AASSET_MODE_UNKNOWN); - if (!asset) - return FALSE; - AAsset_close(asset); - return TRUE; + if (Yap_isAsset(name)) { + if ( statfunc(OsPath("/", tmp), &buf) < 0 ) + return FALSE; + + *tp = (double)buf.st_mtime; + return Yap_AccessAsset(name, R_OK); } #endif @@ -202,31 +189,19 @@ LastModifiedFile64(const char *name, int64_t *tp) char tmp[MAXPATHLEN]; statstruct buf; #ifdef __ANDROID__ - if (strstr(name,"/assets")) { - AAssetManager* mgr = GLOBAL_assetManager; - *tp = (int64_t)0; - if (!strcmp(name,"/assets")) - return TRUE; - const char *bufp=name+strlen("/assets/"); - // check if file is a directory. - AAssetDir *assetDir = AAssetManager_openDir(mgr, bufp); - if (assetDir) { - const char *ptr = AAssetDir_getNextFileName(assetDir) ; - AAssetDir_close(assetDir); - if (ptr) - return TRUE; - } - AAsset *asset = AAssetManager_open(mgr, bufp, AASSET_MODE_UNKNOWN); - if (!asset) - return FALSE; - AAsset_close(asset); - return TRUE; - } + if (Yap_isAsset(name)) { + if ( statfunc(OsPath("/", tmp), &buf) < 0 ) { + return FALSE; + } + *tp = (int64_t)buf.st_mtime; + return Yap_AccessAsset(name, R_OK); + } #endif - if ( statfunc(OsPath(name, tmp), &buf) < 0 ) - return FALSE; + if ( statfunc(OsPath(name, tmp), &buf) < 0 ){ + return FALSE; + } *tp = (int64_t)buf.st_mtime; return TRUE; @@ -246,26 +221,9 @@ SizeFile(const char *path) statstruct buf; #ifdef __ANDROID__ - if (strstr(path,"/assets")) { - AAssetManager* mgr = GLOBAL_assetManager; - if (!strcmp(path,"/assets")) - return 0; - const char *bufp=path+strlen("/assets/"); - // check if file is a directory. - AAssetDir *assetDir = AAssetManager_openDir(mgr, bufp); - if (assetDir) { - const char *ptr = AAssetDir_getNextFileName(assetDir) ; - AAssetDir_close(assetDir); - if (ptr) - return 0; - } - AAsset *asset = AAssetManager_open(mgr, bufp, AASSET_MODE_UNKNOWN); - if (!asset) - return -1; - AAsset_close(asset); - return 0; - } - + if (Yap_isAsset(path)) { + return Yap_AssetSize( path ); + } #endif if ( statfunc(OsPath(path, tmp), &buf) < 0 ) return -1; @@ -288,36 +246,6 @@ ACCESS_WRITE and ACCESS_EXECUTE. int AccessFile(const char *path, int mode) { char tmp[MAXPATHLEN]; -#ifdef __ANDROID__ - if (strstr(path,"/assets")) { - AAssetManager* mgr = GLOBAL_assetManager; - if (!strcmp(path,"/assets")) - return !(mode & ACCESS_WRITE ); - const char *bufp=path+strlen("/assets/"); - // check if file is a directory. - AAssetDir *assetDir = AAssetManager_openDir(mgr, bufp); - if (assetDir) { - const char *ptr = AAssetDir_getNextFileName(assetDir) ; - AAssetDir_close(assetDir); - if (ptr) - return !(mode & ACCESS_WRITE ); - } - AAsset *asset = AAssetManager_open(mgr, bufp, AASSET_MODE_UNKNOWN); - if (!asset) - return FALSE; - AAsset_close(asset); - if ( mode == ACCESS_EXIST ) - return TRUE; - else - { - if ( mode & ACCESS_WRITE ) return FALSE; - #ifdef X_OK - if ( mode & ACCESS_EXECUTE ) return FALSE; - #endif - return TRUE; - } - } -#endif #ifdef HAVE_ACCESS int m = 0; @@ -331,6 +259,11 @@ AccessFile(const char *path, int mode) #endif } +#ifdef __ANDROID__ + if (Yap_isAsset(path)) { + return !(mode & ACCESS_WRITE ) && Yap_AccessAsset(path, m); + } +#endif return access(OsPath(path, tmp), m) == 0 ? TRUE : FALSE; #else # error "No implementation for AccessFile()" @@ -348,25 +281,9 @@ ExistsFile(const char *path) statstruct buf; #ifdef __ANDROID__ - if (strstr(path,"/assets")) { - AAssetManager* mgr = GLOBAL_assetManager; - if (!strcmp(path,"/assets")) - return TRUE; - const char *bufp=path+strlen("/assets/"); - // check if file is a directory. - AAssetDir *assetDir = AAssetManager_openDir(mgr, bufp); - if (assetDir) { - const char *ptr = AAssetDir_getNextFileName(assetDir) ; - AAssetDir_close(assetDir); - if (ptr) - return TRUE; - } - AAsset *asset = AAssetManager_open(mgr, bufp, AASSET_MODE_UNKNOWN); - if (!asset) - return FALSE; - AAsset_close(asset); - return TRUE; - } + if (Yap_isAsset(path)) { + return Yap_AssetIsFile(path); + } #endif if ( statfunc(OsPath(path, tmp), &buf) == -1 || !S_ISREG(buf.st_mode) ) { DEBUG(2, perror(tmp)); @@ -388,22 +305,9 @@ ExistsDirectory(const char *path) statstruct buf; #ifdef __ANDROID__ - if (strstr(ospath,"/assets")) { - AAssetManager* mgr = GLOBAL_assetManager; - const char *ptr = NULL; - - if (!strcmp(path,"/assets")) - return TRUE; - const char *bufp=path+strlen("/assets/"); - // check if file is a directory. - AAssetDir *assetDir = AAssetManager_openDir(mgr, bufp); - if (assetDir) - ptr = AAssetDir_getNextFileName(assetDir); - if (assetDir) { - AAssetDir_close(assetDir); - } - return ptr != NULL; - } + if (Yap_isAsset(ospath)) { + return Yap_AssetIsDir(ospath); + } #endif if ( statfunc(ospath, &buf) < 0 ) return FALSE; @@ -688,12 +592,10 @@ get_file_name(term_t n, char **namep, char *tmp, int flags) if ( len+1 >= MAXPATHLEN ) return PL_error(NULL, 0, NULL, ERR_REPRESENTATION, ATOM_max_path_length); - if ( truePrologFlag(PLFLAG_FILEVARS) ) { if ( !(name = expandVars(name, tmp, MAXPATHLEN)) ) return FALSE; } - if ( !(flags & PL_FILE_NOERRORS) ) { atom_t op = 0; @@ -732,10 +634,9 @@ PL_get_file_name(term_t n, char **namep, int flags) if ( (rc=get_file_name(n, &name, buf, flags)) ) { if ( (flags & PL_FILE_OSPATH) ) - { if ( !(name = OsPath(name, ospath)) ) + { if ( !(name = OsPath(name, ospath)) ) return FALSE; } - *namep = buffer_string(name, BUF_RING); } @@ -836,11 +737,11 @@ PRED_IMPL("size_file", 2, size_file, 0) static PRED_IMPL("access_file", 2, access_file, 0) -/** @pred access_file(+ _F_,+ _M_) +/** @pred access_file(+ _F_,+ _M_) Is the file accessible? - + */ { PRED_LD char *n; @@ -873,7 +774,7 @@ Is the file accessible? return TRUE; if ( md == ACCESS_WRITE && !AccessFile(n, ACCESS_EXIST) ) - { + { char *dir = DirName(n); if ( dir[0] ) @@ -956,12 +857,12 @@ PRED_IMPL("same_file", 2, same_file, 0) } -/** @pred file_base_name(+ _Name_,- _FileName_) +/** @pred file_base_name(+ _Name_,- _FileName_) Give the path a full path _FullPath_ extract the _FileName_. - + */ static PRED_IMPL("file_base_name", 2, file_base_name, 0) @@ -969,7 +870,7 @@ PRED_IMPL("file_base_name", 2, file_base_name, 0) if ( !PL_get_chars(A1, &n, CVT_ALL|REP_FN|CVT_EXCEPTION) ) return FALSE; - + return PL_unify_chars(A2, PL_ATOM|REP_FN, -1, BaseName(n)); } @@ -977,7 +878,7 @@ PRED_IMPL("file_base_name", 2, file_base_name, 0) static PRED_IMPL("file_directory_name", 2, file_directory_name, 0) { char *n; - + if ( !PL_get_chars(A1, &n, CVT_ALL|REP_FN|CVT_EXCEPTION) ) return FALSE; int out = PL_unify_chars(A2, PL_ATOM|REP_FN, -1, DirName(n)); @@ -1138,7 +1039,6 @@ PRED_IMPL("$absolute_file_name", 2, absolute_file_name, 0) term_t name = A1; term_t expanded = A2; - if ( PL_get_file_name(name, &n, 0) && (n = AbsoluteFile(n, tmp)) ) return PL_unify_chars(expanded, PL_ATOM|REP_FN, -1, n); @@ -1212,7 +1112,7 @@ name_too_long(void) } -/** @pred file_name_extension(? _Base_,? _Extension_, ? _Name_) +/** @pred file_name_extension(? _Base_,? _Extension_, ? _Name_) @@ -1224,7 +1124,7 @@ case-insensitive too. _Extension_ may be specified with or without a leading dot (.). If an _Extension_ is generated, it will not have a leading dot. - + */ static PRED_IMPL("file_name_extension", 3, file_name_extension, 0) diff --git a/os/pl-os.c b/os/pl-os.c index 4b664551a..ecfa30510 100755 --- a/os/pl-os.c +++ b/os/pl-os.c @@ -149,11 +149,6 @@ initOs(void) GD->statistics.start_time = WallTime(); -#ifndef __YAP_PROLOG__ - DEBUG(1, Sdprintf("OS:initExpand() ...\n")); - initExpand(); - DEBUG(1, Sdprintf("OS:initEnviron() ...\n")); -#endif initEnviron(); #ifdef __WINDOWS__ @@ -172,9 +167,6 @@ initOs(void) void cleanupOs(void) { -#ifndef __YAP_PROLOG__ - cleanupExpand(); -#endif } @@ -538,1189 +530,6 @@ _PL_Random(void) #endif } -#ifndef __YAP_PROLOG__ - -static void initExpand(void); -static void cleanupExpand(void); - - /******************************** - * FILES * - *********************************/ - - /* (Everything you always wanted to know about files ...) */ - -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Generation and administration of temporary files. Currently only used -by the foreign language linker. It might be useful to make a predicate -available to the Prolog user based on these functions. These functions -are in this module as non-UNIX OS probably don't have getpid() or put -temporaries on /tmp. - - atom_t TemporaryFile(const char *id, int *fdp) - - The return value of this call is an atom, whose string represents - the path name of a unique file that can be used as temporary file. - `id' is a char * that can be used to make it easier to identify the - file as a specific kind of SWI-Prolog intermediate file. - - void RemoveTemporaryFiles() - - Remove all temporary files. This function should be aware of the - fact that some of the file names generated by TemporaryFile() might - not be created at all, or might already have been deleted. -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef DEFTMPDIR -#ifdef __WINDOWS__ -#define DEFTMPDIR "c:/tmp" -#else -#define DEFTMPDIR "/tmp" -#endif -#endif - -static int -free_tmp_symbol(Symbol s) -{ int rc; - atom_t tname = (atom_t)s->name; - PL_chars_t txt; - - get_atom_text(tname, &txt); - PL_mb_text(&txt, REP_FN); - rc = RemoveFile(txt.text.t); - PL_free_text(&txt); - - PL_unregister_atom(tname); - return rc; -} - - -static void -void_free_tmp_symbol(Symbol s) -{ (void)free_tmp_symbol(s); -} - - -#ifndef O_EXCL -#define O_EXCL 0 -#endif -#ifndef O_BINARY -#define O_BINARY 0 -#endif - -atom_t -TemporaryFile(const char *id, int *fdp) -{ char temp[MAXPATHLEN]; - static char *tmpdir = NULL; - atom_t tname; - int retries = 0; - - if ( !tmpdir ) - { LOCK(); - if ( !tmpdir ) - { char envbuf[MAXPATHLEN]; - char *td; - - if ( (td = Getenv("TEMP", envbuf, sizeof(envbuf))) || - (td = Getenv("TMP", envbuf, sizeof(envbuf))) ) - tmpdir = strdup(td); - else - tmpdir = DEFTMPDIR; - } - UNLOCK(); - } - -retry: -#ifdef __unix__ -{ static int MTOK_temp_counter = 0; - const char *sep = id[0] ? "_" : ""; - - Ssprintf(temp, "%s/pl_%s%s%d_%d", - tmpdir, id, sep, (int) getpid(), MTOK_temp_counter++); -} -#endif - -#ifdef __WINDOWS__ -{ char *tmp; - static int temp_counter = 0; - -#ifdef __LCC__ - if ( (tmp = tmpnam(NULL)) ) -#else - if ( (tmp = _tempnam(tmpdir, id)) ) -#endif - { PrologPath(tmp, temp, sizeof(temp)); - } else - { const char *sep = id[0] ? "_" : ""; - - Ssprintf(temp, "%s/pl_%s%s%d", tmpdir, id, sep, temp_counter++); - } -} -#endif - - if ( fdp ) - { int fd; - - if ( (fd=open(temp, O_CREAT|O_EXCL|O_WRONLY|O_BINARY, 0600)) < 0 ) - { if ( ++retries < 10000 ) - goto retry; - else - return NULL_ATOM; - } - - *fdp = fd; - } - - tname = PL_new_atom(temp); /* locked: ok! */ - - LOCK(); - if ( !GD->os.tmp_files ) - { GD->os.tmp_files = newHTable(4); - GD->os.tmp_files->free_symbol = void_free_tmp_symbol; - } - UNLOCK(); - - addHTable(GD->os.tmp_files, (void*)tname, (void*)TRUE); - - return tname; -} - - -int -DeleteTemporaryFile(atom_t name) -{ int rc = FALSE; - - if ( GD->os.tmp_files ) - { LOCK(); - if ( GD->os.tmp_files && GD->os.tmp_files->size > 0 ) - { Symbol s = lookupHTable(GD->os.tmp_files, (void*)name); - - if ( s ) - { rc = free_tmp_symbol(s); - deleteSymbolHTable(GD->os.tmp_files, s); - } - } - UNLOCK(); - } - - return rc; -} - - -void -RemoveTemporaryFiles(void) -{ LOCK(); - if ( GD->os.tmp_files ) - { Table t = GD->os.tmp_files; - - GD->os.tmp_files = NULL; - UNLOCK(); - destroyHTable(t); - } else - { UNLOCK(); - } -} - - -#if O_HPFS - -/* Conversion rules Prolog <-> OS/2 (using HPFS) - / <-> \ - /x:/ <-> x:\ (embedded drive letter) - No length restrictions up to MAXPATHLEN, no case conversions. -*/ - -char * -PrologPath(char *ospath, char *path, size_t len) -{ char *s = ospath, *p = path; - int limit = len-1; - - if (isLetter(s[0]) && s[1] == ':') - { *p++ = '/'; - *p++ = *s++; - *p++ = *s++; - limit -= 3; - } - for(; *s && limit; s++, p++, limit--) - *p = (*s == '\\' ? '/' : makeLower(*s)); - *p = EOS; - - return path; -} - - -char * -OsPath(const char *plpath, char *path) -{ const char *s = plpath, *p = path; - int limit = MAXPATHLEN-1; - - if ( s[0] == '/' && isLetter(s[1]) && s[2] == ':') /* embedded drive letter*/ - { s++; - *p++ = *s++; - *p++ = *s++; - if ( *s != '/' ) - *p++ = '\\'; - limit -= 2; - } - - for(; *s && limit; s++, p++, limit--) - *p = (*s == '/' ? '\\' : *s); - if ( p[-1] == '\\' && p > path ) - p--; - *p = EOS; - - return path; -} -#endif /* O_HPFS */ - -#ifdef __unix__ -char * -PrologPath(const char *p, char *buf, size_t len) -{ strncpy(buf, p, len); - - return buf; -} - -char * -OsPath(const char *p, char *buf) -{ strcpy(buf, p); - - return buf; -} -#endif /*__unix__*/ - -#if O_XOS -char * -PrologPath(const char *p, char *buf, size_t len) -{ GET_LD - int flags = (truePrologFlag(PLFLAG_FILE_CASE) ? 0 : XOS_DOWNCASE); - - return _xos_canonical_filename(p, buf, len, flags); -} - -char * -OsPath(const char *p, char *buf) -{ strcpy(buf, p); - - return buf; -} -#endif /* O_XOS */ - - -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - char *AbsoluteFile1(const char *file, char *path) - - Expand a file specification to a system-wide unique description of - the file that can be passed to the file functions that take a path - as argument. Path should refer to the same file, regardless of the - current working directory. On Unix absolute file names are used - for this purpose. - - This function is based on a similar (primitive) function in - Edinburgh C-Prolog. - - char *BaseName(path) - char *path; - - Return the basic file name for a file having path `path'. - - char *DirName(const char *path, char *dir) - - Return the directory name for a file having path `path'. -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#if defined(HAVE_SYMLINKS) && (defined(HAVE_STAT) || defined(__unix__)) -#define O_CANONISE_DIRS - -struct canonical_dir -{ char * name; /* name of directory */ - char * canonical; /* canonical name of directory */ - dev_t device; /* device number */ - ino_t inode; /* inode number */ - CanonicalDir next; /* next in chain */ -}; - -#define canonical_dirlist (GD->os._canonical_dirlist) - -forwards char *canoniseDir(char *); -#endif /*O_CANONISE_DIRS*/ - -static void -initExpand(void) -{ -#ifdef O_CANONISE_DIRS - char *dir; - char *cpaths; -#endif - - GD->paths.CWDdir = NULL; - GD->paths.CWDlen = 0; - -#ifdef O_CANONISE_DIRS -{ char envbuf[MAXPATHLEN]; - - if ( (cpaths = Getenv("CANONICAL_PATHS", envbuf, sizeof(envbuf))) ) - { char buf[MAXPATHLEN]; - - while(*cpaths) - { char *e; - - if ( (e = strchr(cpaths, ':')) ) - { int l = e-cpaths; - - strncpy(buf, cpaths, l); - buf[l] = EOS; - cpaths += l+1; - canoniseDir(buf); - } else - { canoniseDir(cpaths); - break; - } - } - } - - if ( (dir = Getenv("HOME", envbuf, sizeof(envbuf))) ) canoniseDir(dir); - if ( (dir = Getenv("PWD", envbuf, sizeof(envbuf))) ) canoniseDir(dir); - if ( (dir = Getenv("CWD", envbuf, sizeof(envbuf))) ) canoniseDir(dir); -} -#endif -} - -#ifdef O_CANONISE_DIRS - -static void -cleanupExpand(void) -{ CanonicalDir dn = canonical_dirlist, next; - - canonical_dirlist = NULL; - for( ; dn; dn = next ) - { next = dn->next; - if ( dn->canonical && dn->canonical != dn->name ) - remove_string(dn->canonical); - remove_string(dn->name); - PL_free(dn); - } - if ( GD->paths.CWDdir ) - { remove_string(GD->paths.CWDdir); - GD->paths.CWDdir = NULL; - GD->paths.CWDlen = 0; - } -} - - -static void -registerParentDirs(const char *path) -{ const char *e = path + strlen(path); - - while(e>path) - { char dirname[MAXPATHLEN]; - char tmp[MAXPATHLEN]; - CanonicalDir d; - statstruct buf; - - for(e--; *e != '/' && e > path + 1; e-- ) - ; - - strncpy(dirname, path, e-path); - dirname[e-path] = EOS; - - for(d = canonical_dirlist; d; d = d->next) - { if ( streq(d->name, dirname) ) - return; - } - - if ( statfunc(OsPath(dirname, tmp), &buf) == 0 ) - { CanonicalDir dn = PL_malloc(sizeof(*dn)); - - dn->name = store_string(dirname); - dn->inode = buf.st_ino; - dn->device = buf.st_dev; - dn->canonical = dn->name; - dn->next = canonical_dirlist; - canonical_dirlist = dn; - - DEBUG(1, Sdprintf("Registered canonical dir %s\n", dirname)); - } else - return; - } -} - - -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -verify_entry() verifies the path cache for this path is still safe. If -not it updates the cache and returns FALSE. -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -static int -verify_entry(CanonicalDir d) -{ char tmp[MAXPATHLEN]; - statstruct buf; - - if ( statfunc(OsPath(d->canonical, tmp), &buf) == 0 ) - { if ( d->inode == buf.st_ino && - d->device == buf.st_dev ) - return TRUE; - - DEBUG(1, Sdprintf("%s: inode/device changed\n", d->canonical)); - - d->inode = buf.st_ino; - d->device = buf.st_dev; - return TRUE; - } else - { DEBUG(1, Sdprintf("%s: no longer exists\n", d->canonical)); - - if ( d == canonical_dirlist ) - { canonical_dirlist = d->next; - } else - { CanonicalDir cd; - - for(cd=canonical_dirlist; cd; cd=cd->next) - { if ( cd->next == d ) - { cd->next = d->next; - break; - } - } - } - - remove_string(d->name); - if ( d->canonical != d->name ) - remove_string(d->canonical); - PL_free(d); - } - - return FALSE; -} - - -static char * -canoniseDir(char *path) -{ CanonicalDir d, next; - statstruct buf; - char tmp[MAXPATHLEN]; - - DEBUG(1, Sdprintf("canoniseDir(%s) --> ", path)); - - for(d = canonical_dirlist; d; d = next) - { next = d->next; - - if ( streq(d->name, path) && verify_entry(d) ) - { if ( d->name != d->canonical ) - strcpy(path, d->canonical); - - DEBUG(1, Sdprintf("(lookup) %s\n", path)); - return path; - } - } - - /* we need to use malloc() here */ - /* because allocHeapOrHalt() only ensures */ - /* alignment for `word', and inode_t */ - /* is sometimes bigger! */ - - if ( statfunc(OsPath(path, tmp), &buf) == 0 ) - { CanonicalDir dn = PL_malloc(sizeof(*dn)); - char dirname[MAXPATHLEN]; - char *e = path + strlen(path); - - dn->name = store_string(path); - dn->inode = buf.st_ino; - dn->device = buf.st_dev; - - do - { strncpy(dirname, path, e-path); - dirname[e-path] = EOS; - if ( statfunc(OsPath(dirname, tmp), &buf) < 0 ) - break; - - DEBUG(2, Sdprintf("Checking %s (dev=%d,ino=%d)\n", - dirname, buf.st_dev, buf.st_ino)); - - for(d = canonical_dirlist; d; d = next) - { next = d->next; - - if ( d->inode == buf.st_ino && d->device == buf.st_dev && - verify_entry(d) ) - { DEBUG(2, Sdprintf("Hit with %s (dev=%d,ino=%d)\n", - d->canonical, d->device, d->inode)); - - strcpy(dirname, d->canonical); - strcat(dirname, e); - strcpy(path, dirname); - dn->canonical = store_string(path); - dn->next = canonical_dirlist; - canonical_dirlist = dn; - DEBUG(1, Sdprintf("(replace) %s\n", path)); - registerParentDirs(path); - return path; - } - } - - for(e--; *e != '/' && e > path + 1; e-- ) - ; - } while( e > path ); - - dn->canonical = dn->name; - dn->next = canonical_dirlist; - canonical_dirlist = dn; - - DEBUG(1, Sdprintf("(new, existing) %s\n", path)); - registerParentDirs(path); - return path; - } - - DEBUG(1, Sdprintf("(nonexisting) %s\n", path)); - return path; -} - -#else - -#define canoniseDir(d) - -static void -cleanupExpand(void) -{ -} - -#endif /*O_CANONISE_DIRS*/ - -char * -canoniseFileName(char *path) -{ char *out = path, *in = path, *start = path; - tmp_buffer saveb; - -#ifdef O_HASDRIVES /* C: */ - if ( in[1] == ':' && isLetter(in[0]) ) - { in += 2; - - out = start = in; - } -#ifdef __MINGW32__ /* /c/ in MINGW is the same as c: */ - else if ( in[0] == '/' && isLetter(in[1]) && - in[2] == '/' ) - { - out[0] = in[1]; - out[1] = ':'; - in += 3; - out = start = in; - } -#endif -#endif - -#ifdef O_HASSHARES /* //host/ */ - if ( in[0] == '/' && in[1] == '/' && isAlpha(in[2]) ) - { char *s; - - for(s = in+3; *s && (isAlpha(*s) || *s == '-' || *s == '.'); s++) - ; - if ( *s == '/' ) - { in = out = s+1; - start = in-1; - } - } -#endif - - while( in[0] == '/' && in[1] == '.' && in[2] == '.' && in[3] == '/' ) - in += 3; - while( in[0] == '.' && in[1] == '/' ) - in += 2; - if ( in[0] == '/' ) - *out++ = '/'; - initBuffer(&saveb); - addBuffer(&saveb, out, char*); - - while(*in) - { if (*in == '/') - { - again: - if ( *in ) - { while( in[1] == '/' ) /* delete multiple / */ - in++; - if ( in[1] == '.' ) - { if ( in[2] == '/' ) /* delete /./ */ - { in += 2; - goto again; - } - if ( in[2] == EOS ) /* delete trailing /. */ - { *out = EOS; - goto out; - } - if ( in[2] == '.' && (in[3] == '/' || in[3] == EOS) ) - { if ( !isEmptyBuffer(&saveb) ) /* delete /foo/../ */ - { out = popBuffer(&saveb, char*); - in += 3; - if ( in[0] == EOS && out > start+1 ) - { out[-1] = EOS; /* delete trailing / */ - goto out; - } - goto again; - } else if ( start[0] == '/' && out == start+1 ) - { in += 3; - goto again; - } - } - } - } - if ( *in ) - in++; - if ( out > path && out[-1] != '/' ) - *out++ = '/'; - addBuffer(&saveb, out, char*); - } else - *out++ = *in++; - } - *out++ = *in++; - -out: - discardBuffer(&saveb); - - return path; -} - - -static char * -utf8_strlwr(char *s) -{ char tmp[MAXPATHLEN]; - char *o, *i; - - strcpy(tmp, s); - for(i=tmp, o=s; *i; ) - { int c; - - i = utf8_get_char(i, &c); - c = towlower((wint_t)c); - o = utf8_put_char(o, c); - } - *o = EOS; - - return s; -} - - -char * -canonisePath(char *path) -{ GET_LD - - if ( !truePrologFlag(PLFLAG_FILE_CASE) ) - utf8_strlwr(path); - - canoniseFileName(path); - -#ifdef O_CANONISE_DIRS -{ char *e; - char dirname[MAXPATHLEN]; - size_t plen = strlen(path); - - if ( plen > 0 ) - { e = path + plen - 1; - for( ; *e != '/' && e > path; e-- ) - ; - strncpy(dirname, path, e-path); - dirname[e-path] = EOS; - canoniseDir(dirname); - strcat(dirname, e); - strcpy(path, dirname); - } -} -#endif - - return path; -} - - -static char * -takeWord(const char **string, char *wrd, int maxlen) -{ const char *s = *string; - char *q = wrd; - int left = maxlen-1; - - while( isAlpha(*s) || *s == '_' ) - { if ( --left < 0 ) - { PL_error(NULL, 0, NULL, ERR_REPRESENTATION, - ATOM_max_variable_length); - return NULL; - } - *q++ = *s++; - } - *q = EOS; - - *string = s; - return wrd; -} - - -char * -expandVars(const char *pattern, char *expanded, int maxlen) -{ GET_LD - int size = 0; - char wordbuf[MAXPATHLEN]; - char *rc = expanded; - - if ( *pattern == '~' ) - { char *user; - char *value; - int l; - - pattern++; - user = takeWord(&pattern, wordbuf, sizeof(wordbuf)); - - LOCK(); - - if ( user[0] == EOS ) /* ~/bla */ - { -#ifdef O_XOS - value = _xos_home(); -#else /*O_XOS*/ - if ( !(value = GD->os.myhome) ) - { char envbuf[MAXPATHLEN]; - - if ( (value = Getenv("HOME", envbuf, sizeof(envbuf))) && - (value = PrologPath(value, wordbuf, sizeof(wordbuf))) ) - { GD->os.myhome = store_string(value); - } else - { value = GD->os.myhome = store_string("/"); - } - } -#endif /*O_XOS*/ - } else /* ~fred */ -#ifdef HAVE_GETPWNAM - { struct passwd *pwent; - - if ( GD->os.fred && streq(GD->os.fred, user) ) - { value = GD->os.fredshome; - } else - { if ( !(pwent = getpwnam(user)) ) - { if ( truePrologFlag(PLFLAG_FILEERRORS) ) - { term_t name = PL_new_term_ref(); - - PL_put_atom_chars(name, user); - PL_error(NULL, 0, NULL, ERR_EXISTENCE, ATOM_user, name); - } - UNLOCK(); - fail; - } - if ( GD->os.fred ) - remove_string(GD->os.fred); - if ( GD->os.fredshome ) - remove_string(GD->os.fredshome); - - GD->os.fred = store_string(user); - value = GD->os.fredshome = store_string(pwent->pw_dir); - } - } -#else - { if ( truePrologFlag(PLFLAG_FILEERRORS) ) - PL_error(NULL, 0, NULL, ERR_NOT_IMPLEMENTED, "user_info"); - - UNLOCK(); - fail; - } -#endif - size += (l = (int) strlen(value)); - if ( size+1 >= maxlen ) - { PL_error(NULL, 0, NULL, ERR_REPRESENTATION, ATOM_max_path_length); - return NULL; - } - strcpy(expanded, value); - expanded += l; - UNLOCK(); - - /* ~/ should not become // */ - if ( expanded[-1] == '/' && pattern[0] == '/' ) - pattern++; - } - - for( ;; ) - { int c = *pattern++; - - switch( c ) - { case EOS: - break; - case '$': - { char envbuf[MAXPATHLEN]; - char *var; - char *value, ch; - int l, i; - - if (pattern[0] == '{') { - pattern++; - for (i = 0; i < sizeof(envbuf)-1; i++) { - if ((ch = *pattern++) == '}') - break; - envbuf[i] = ch; - } - envbuf[i] = '\0'; - var = envbuf; - } else { - var = takeWord(&pattern, wordbuf, sizeof(wordbuf)); - } - - if ( var[0] == EOS ) - goto def; - LOCK(); - value = Getenv(var, envbuf, sizeof(envbuf)); - if ( value == (char *) NULL ) - { if ( truePrologFlag(PLFLAG_FILEERRORS) ) - { term_t name = PL_new_term_ref(); - - PL_put_atom_chars(name, var); - PL_error(NULL, 0, NULL, ERR_EXISTENCE, ATOM_variable, name); - } - - UNLOCK(); - fail; - } - size += (l = (int)strlen(value)); - if ( size+1 >= maxlen ) - { UNLOCK(); - PL_error(NULL, 0, NULL, ERR_REPRESENTATION, - ATOM_max_path_length); - return NULL; - } - strcpy(expanded, value); - UNLOCK(); - - expanded += l; - - continue; - } - default: - def: - size++; - if ( size+1 >= maxlen ) - { PL_error(NULL, 0, NULL, ERR_REPRESENTATION, - ATOM_max_path_length); - return NULL; - } - *expanded++ = c; - - continue; - } - break; - } - - if ( ++size >= maxlen ) - { PL_error(NULL, 0, NULL, ERR_REPRESENTATION, - ATOM_max_path_length); - return NULL; - } - - *expanded = EOS; - - return rc; -} - - -#ifdef O_HASDRIVES - -#define IS_DIR_SEPARATOR(c) ((c) == '/' || (c) == '\\') - -int -IsAbsolutePath(const char *p) /* /d:/ */ -{ if ( p[0] == '/' && p[2] == ':' && isLetter(p[1]) && - (p[3] == '/' || p[3] == '\0') ) - succeed; - -#ifdef __MINGW32__ /* /c/ in MINGW is the same as c: */ - if ( p[0] == '/' && isLetter(p[1]) && - (p[2] == '/' || p[2] == '\0') ) - succeed; -#endif - - if ( p[1] == ':' && isLetter(p[0]) && /* d:/ or d:\ */ - (IS_DIR_SEPARATOR(p[2]) || p[2] == '\0') ) - succeed; - -#ifdef O_HASSHARES - if ( (p[0] == '/' && p[1] == '/') || /* //host/share */ - (p[0] == '\\' && p[1] == '\\') ) /* \\host\share */ - succeed; -#endif - - fail; -} - - -static inline int -isDriveRelativePath(const char *p) /* '/...' */ -{ return IS_DIR_SEPARATOR(p[0]) && !IsAbsolutePath(p); -} - -#ifdef __WINDOWS__ -#undef mkdir -#include -#define mkdir _xos_mkdir -#endif - -static int -GetCurrentDriveLetter( void ) -{ -#ifdef OS2 - return _getdrive(); -#endif -#ifdef __WINDOWS__ - return _getdrive() + 'a' - 1; -#endif -#ifdef __WATCOMC__ - { unsigned drive; - _dos_getdrive(&drive); - return = 'a' + drive - 1; - } -#endif -} - -#else /*O_HASDRIVES*/ - -int -IsAbsolutePath(const char *p) -{ return p[0] == '/'; -} - -#endif /*O_HASDRIVES*/ - -char * -AbsoluteFile(const char *spec, char *path) -{ GET_LD - char tmp[MAXPATHLEN]; - char buf[MAXPATHLEN]; - char *file = PrologPath(spec, buf, sizeof(buf)); - - if ( !file ) - return (char *) NULL; - if ( truePrologFlag(PLFLAG_FILEVARS) ) - { if ( !(file = expandVars(buf, tmp, sizeof(tmp))) ) - return (char *) NULL; - } - - if ( IsAbsolutePath(file) ) - { strcpy(path, file); - - return canonisePath(path); - } - -#ifdef O_HASDRIVES - if ( isDriveRelativePath(file) ) /* /something --> d:/something */ - { if ((strlen(file) + 3) > MAXPATHLEN) - { PL_error(NULL, 0, NULL, ERR_REPRESENTATION, ATOM_max_path_length); - return (char *) NULL; - } - path[0] = GetCurrentDriveLetter(); - path[1] = ':'; - strcpy(&path[2], file); - return canonisePath(path); - } -#endif /*O_HASDRIVES*/ - - if ( !PL_cwd(path, MAXPATHLEN) ) - return NULL; - - if ( (GD->paths.CWDlen + strlen(file) + 1) >= MAXPATHLEN ) - { PL_error(NULL, 0, NULL, ERR_REPRESENTATION, ATOM_max_path_length); - return (char *) NULL; - } - - strcpy(path, GD->paths.CWDdir); - strcpy(&path[GD->paths.CWDlen], file); - - return canonisePath(path); -} - - -void -PL_changed_cwd(void) -{ LOCK(); - if ( GD->paths.CWDdir ) - remove_string(GD->paths.CWDdir); - GD->paths.CWDdir = NULL; - GD->paths.CWDlen = 0; - UNLOCK(); -} - -static char * -cwd_unlocked(char *cwd, size_t cwdlen) -{ GET_LD - - if ( GD->paths.CWDlen == 0 ) - { char buf[MAXPATHLEN]; - char *rval; - -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -On SunOs, getcwd() is using popen() to read the output of /bin/pwd. This -is slow and appears not to cooperate with profile/3. getwd() is supposed -to be implemented directly. What about other Unixes? -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#if defined(HAVE_GETWD) && (defined(__sun__) || defined(__sun)) -#undef HAVE_GETCWD -#endif - -#if __ANDROID__ - if (LOCAL_InAssetDir ) { - rval = strncpy(buf, LOCAL_InAssetDir, sizeof(buf)); - } else -#endif -#if defined(HAVE_GETWD) && !defined(HAVE_GETCWD) - rval = getwd(buf); -#else - rval = getcwd(buf, sizeof(buf)); -#endif - if ( !rval ) - { term_t tmp = PL_new_term_ref(); - - PL_put_atom(tmp, ATOM_dot); - PL_error(NULL, 0, OsError(), ERR_FILE_OPERATION, - ATOM_getcwd, ATOM_directory, tmp); - - return NULL; - } - - canonisePath(buf); - GD->paths.CWDlen = strlen(buf); - buf[GD->paths.CWDlen++] = '/'; - buf[GD->paths.CWDlen] = EOS; - - if ( GD->paths.CWDdir ) - remove_string(GD->paths.CWDdir); - GD->paths.CWDdir = store_string(buf); - } - - if ( GD->paths.CWDlen < cwdlen ) - { memcpy(cwd, GD->paths.CWDdir, GD->paths.CWDlen+1); - return cwd; - } else - { PL_error(NULL, 0, NULL, ERR_REPRESENTATION, ATOM_max_path_length); - return NULL; - } -} - - -char * -PL_cwd(char *cwd, size_t cwdlen) -{ char *rc; - - LOCK(); -#if __ANDROID__ - __android_log_print(ANDROID_LOG_DEBUG, "YapJava", "CD=%s; yeah", cwd); -#endif - - rc = cwd_unlocked(cwd, cwdlen); - UNLOCK(); - - return rc; -} - - -char * -BaseName(const char *f) -{ const char *base; - - for(base = f; *f; f++) - { if (*f == '/') - base = f+1; - } - - return (char *)base; -} - - -char * -DirName(const char *f) -{ const char *base, *p; - - for(base = p = f; *p; p++) - { if (*p == '/' && p[1] != EOS ) - base = p; - } - if ( base == f ) - { if ( *f == '/' ) - strcpy(dir, "/"); - else - strcpy(dir, "."); - } else - { if ( dir != f ) /* otherwise it is in-place */ - strncpy(dir, f, base-f); - dir[base-f] = EOS; - } - - return dir; -} - - -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bool ChDir(path) - char *path; - - Change the current working directory to `path'. File names may depend - on `path'. -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -bool -ChDir(const char *path) -{ char ospath[MAXPATHLEN]; - char tmp[MAXPATHLEN]; -#if __ANDROID__ - __android_log_print(ANDROID_LOG_DEBUG, "YapJava", "ChDir=%s", path); -#endif - OsPath(path, ospath); - - if ( path[0] == EOS || streq(path, ".") || - (GD->paths.CWDdir && streq(path, GD->paths.CWDdir)) ) - succeed; - - AbsoluteFile(path, tmp); -#if __ANDROID__ - /* treat "/assets" as a directory (actually as a mounted file system). - * - */ - if (LOCAL_InAssetDir) { - free(LOCAL_InAssetDir); - LOCAL_InAssetDir = NULL; - } - if (strstr(ospath, "/assets/") == ospath) { - const char *dirName = ospath+strlen("/assets/"); - AAssetManager* mgr = GLOBAL_assetManager; - AAssetDir* dir; - - if (( dir = AAssetManager_openDir(mgr, dirName) ) && - AAssetDir_getNextFileName( dir ) ) { - // valid directpry - size_t sz = strlen(ospath)+1; - AAssetDir_close(dir); - LOCAL_InAssetDir = (char *)malloc(sz); - strncpy(LOCAL_InAssetDir, ospath, sz); - succeed; - } else { - fail; - } - } else if ( !strcmp(ospath,"/assets") || - !strcmp(ospath,"/assets/") ) { - // valid directpry - size_t sz = strlen("/assets")+1; - LOCAL_InAssetDir = (char *)malloc(sz); - strncpy(LOCAL_InAssetDir, ospath, sz); - succeed; - } - #endif - - if ( chdir(ospath) == 0 ) - { size_t len; - len = strlen(tmp); - if ( len == 0 || tmp[len-1] != '/' ) - { tmp[len++] = '/'; - tmp[len] = EOS; - } - LOCK(); /* Lock with PL_changed_cwd() */ - GD->paths.CWDlen = len; /* and PL_cwd() */ - if ( GD->paths.CWDdir ) - remove_string(GD->paths.CWDdir); - GD->paths.CWDdir = store_string(tmp); - UNLOCK(); - - succeed; - } - - fail; -} - -#endif /* files in SWI */ /******************************** @@ -2410,7 +1219,7 @@ System(char *cmd) char *shell = "/bin/sh"; int rval; sigf_t old_int, old_stop; - + if ( (pid = fork()) == -1 ) { return PL_error("shell", 2, OsError(), ERR_SYSCALL, "fork"); } else if ( pid == 0 ) /* The child */ @@ -2540,7 +1349,7 @@ char *command; -#ifndef __YAP_PROLOG__ +#ifndef _YAP_NOT_INSTALLED_ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - char *findExecutable(char *buf) diff --git a/os/pl-privitf.c b/os/pl-privitf.c index 631829a21..4236d685d 100644 --- a/os/pl-privitf.c +++ b/os/pl-privitf.c @@ -144,16 +144,16 @@ unifyList(term_t term, list_ctx *ctx) CACHE_REGS if (!CloseList(ctx->gstore, TermNil)) return FALSE; - return Yap_unify(Yap_GetFromSlot(term PASS_REGS), ctx->start); + return Yap_unify(Yap_GetFromSlot(term), ctx->start); } int unifyDiffList(term_t head, term_t tail, list_ctx *ctx) { CACHE_REGS - if (!CloseList(ctx->gstore, Yap_GetFromSlot(tail PASS_REGS))) + if (!CloseList(ctx->gstore, Yap_GetFromSlot(tail))) return FALSE; - return Yap_unify(Yap_GetFromSlot(head PASS_REGS), ctx->start); + return Yap_unify(Yap_GetFromSlot(head), ctx->start); } #else diff --git a/os/pl-read.c b/os/pl-read.c index 8e9d06601..1ad26b24f 100644 --- a/os/pl-read.c +++ b/os/pl-read.c @@ -40,10 +40,10 @@ _PL_rd->backquoted_string = truePrologFlag(PLFLAG_BACKQUOTED_STRING); void free_read_data(ReadData _PL_rd) -{ +{ } -static int +static int read_term(term_t t, ReadData _PL_rd ARG_LD) { return Yap_read_term(t, rb.stream, _PL_rd); @@ -1182,7 +1182,7 @@ read_clause(IOSTREAM *s, term_t term, term_t options ARG_LD) PL_TERM, term, PL_TERM, tpos ); } - ap = Yap_PredFromClause( Yap_GetFromSlot(term PASS_REGS) PASS_REGS); + ap = Yap_PredFromClause( Yap_GetFromSlot(term) PASS_REGS); if (rd.styleCheck & (DISCONTIGUOUS_STYLE|MULTIPLE_CHECK) && ap != NULL ) { if ( rd.styleCheck & (DISCONTIGUOUS_STYLE) && Yap_discontiguous( ap PASS_REGS) ) { printMessage(ATOM_warning, @@ -1377,7 +1377,7 @@ return rval; Reads term _T_ from stream _Stream_ with execution controlled by the same options as read_term/2. - + */ static PRED_IMPL("read_term", 3, read_term, PL_FA_ISO) @@ -1400,18 +1400,18 @@ return FALSE; */ -/** @pred read_term(- _T_,+ _Options_) is iso +/** @pred read_term(- _T_,+ _Options_) is iso Reads term _T_ from the current input stream with execution controlled by the following options: -+ comments(- _Comments_) ++ comments(- _Comments_) Unify _Comments_ with a list of string terms including comments before and within the term. -+ module( + _Module_) ++ module( + _Module_) Read term using _Module_ as source module. @@ -1419,13 +1419,13 @@ and within the term. Unify _List_ with the quasi-quotations present in the term. -+ term_position(- _Position_) ++ term_position(- _Position_) Unify _Position_ with a term describing the position of the stream at the start of parse. Use stream_position_data/3 to obtain extra information. -+ singletons(- _Names_) ++ singletons(- _Names_) Unify _Names_ with a list of the form _Name=Var_, where _Name_ is the name of a non-anonymous singleton variable in the @@ -1433,12 +1433,12 @@ original term, and `Var` is the variable's representation in YAP. The variables occur in left-to-right traversal order. -+ syntax_errors(+ _Val_) ++ syntax_errors(+ _Val_) Control action to be taken after syntax errors. See yap_flag/2 for detailed information. -+ variables(- _Names_) ++ variables(- _Names_) Unify _Names_ with a list of the form _Name=Var_, where _Name_ is the name of a non-anonymous variable in the original term, and _Var_ @@ -1541,7 +1541,7 @@ Yap_StringToTerm(const char *s, size_t len, term_t bindings) init_read_data(&rd, stream PASS_LD); rd.varnames = bindings; -term_t tt = Yap_NewSlots(1 PASS_REGS); +term_t tt = Yap_NewSlots(1); if ( !(rval = read_term(tt, &rd PASS_LD)) && rd.has_exception ) { rval = PL_raise_exception(rd.exception); @@ -1552,15 +1552,15 @@ Sclose(stream); LD->read_source = oldsrc; // getchar(); -return Yap_GetFromSlot( tt PASS_REGS); +return Yap_GetFromSlot( tt); } -/** @pred atom_to_term(+ _Atom_, - _Term_, - _Bindings_) +/** @pred atom_to_term(+ _Atom_, - _Term_, - _Bindings_) Use _Atom_ as input to read_term/2 using the option `variable_names` and return the read term in _Term_ and the variable bindings in _Bindings_. _Bindings_ is a list of `Name = Var` couples, thus providing access to the actual variable names. See also read_term/2. If Atom has no valid syntax, a syntax_error exception is raised. - + */ static PRED_IMPL("atom_to_term", 3, atom_to_term, 0) @@ -1583,7 +1583,7 @@ PRED_IMPL("$context_variables", 1, context_variables, 0) static PRED_IMPL("$set_source", 2, set_source, 0) -{ +{ GET_LD atom_t at; term_t a = PL_new_term_ref(); @@ -1638,4 +1638,3 @@ PRED_DEF("$qq_open", 2, qq_open, 0) EndPredDefs //! @} - diff --git a/os/pl-stream.c b/os/pl-stream.c index d66a46516..a69c62028 100755 --- a/os/pl-stream.c +++ b/os/pl-stream.c @@ -44,11 +44,16 @@ #include #include #include + +int Yap_isAsset( const char *path ); + +#define LOG(...) __android_log_print(ANDROID_LOG_DEBUG,"YAP Stream", __VA_ARGS__) #else #define __android_log_print(i,loc,msg,...) #define ANDROID_LOG_INFO 0 #define ANDROID_LOG_ERROR 0 #define ANDROID_LOG_DEBUG 0 +#define LOG(...) #endif @@ -768,7 +773,8 @@ unget_byte(int c, IOSTREAM *s) int Sungetc(int c, IOSTREAM *s) -{ if ( s->bufp > s->unbuffer ) +{ + if ( s->bufp > s->unbuffer ) { unget_byte(c, s); return c; @@ -1153,7 +1159,6 @@ Speekcode(IOSTREAM *s) { int c; char *start; size_t safe = (size_t)-1; - if ( !s->buffer ) { if ( (s->flags & SIO_NBUF) ) { errno = EINVAL; @@ -1786,6 +1791,11 @@ object, which in turn calls the ->unlink which may wish to close the associated stream. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +#if __ANDROID__ +static int +Sclose_asset(void *handle); +#endif + int Sclose(IOSTREAM *s) { int rval = 0; @@ -1825,12 +1835,19 @@ Sclose(IOSTREAM *s) rval = -1; } +#if __ANDROID__ + + if (s->functions->close == Sclose_asset) { +#endif while(s->locks > 0) /* remove buffer-locks */ { int rc = Sunlock(s); if ( rval == 0 ) rval = rc; } +#if __ANDROID__ + } +#endif if ( rval < 0 ) reportStreamError(s); run_close_hooks(s); /* deletes Prolog registration */ @@ -2916,11 +2933,41 @@ Sopen_file(const char *path, const char *how) #endif #if __ANDROID__ - if (strstr(path, "/assets/") == path) { - AAssetManager *Yap_assetManager( void ); - char * p = (char *)path + strlen("/assets/"); - return Sopen_asset( p, how-1, Yap_assetManager()); - } + if (Yap_isAsset(path)) { + extern IOFUNCTIONS Sassetfunctions; + extern void *Yap_openAssetFile(const char *); + + if (op != 'r') + return NULL; + for( ; *how; how++) + { switch(*how) + { + case 'b': /* binary */ + flags &= ~SIO_TEXT; + enc = ENC_OCTET; + break; + case 'r': /* no record */ + flags &= ~SIO_RECORDPOS; + break; + default: + errno = EINVAL; + return NULL; + } + } +#if O_LARGEFILES && defined(O_LARGEFILE) + oflags |= O_LARGEFILE; +#endif + + lfd = (intptr_t)Yap_openAssetFile( path ); + if (!lfd) { + errno = EINVAL; + return NULL; + } + Sfilefunctions = Sassetfunctions; + lock = 0; + flags |= SIO_INPUT; + goto build_stream; + } #endif for( ; *how; how++) @@ -3037,6 +3084,9 @@ Sopen_file(const char *path, const char *how) } lfd = (intptr_t)fd; +#if __ANDROID__ + build_stream: +#endif s = Snew((void *)lfd, flags, &Sfilefunctions); if ( enc != ENC_UNKNOWN ) s->encoding = enc; @@ -3332,66 +3382,6 @@ Sopen_asset(char **buffer, size_t *sizep, const char* mode) Open an Android asset, essentially a read-only part of a ZIP archive. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -IOSTREAM * -Sopen_asset(char *bufp, const char *how, AAssetManager* mgr) -{ - AAsset* asset; - int flags = SIO_FILE|SIO_TEXT|SIO_RECORDPOS|SIO_FBUF; - int op = *how++; - IOSTREAM *s; - IOENC enc = ENC_UNKNOWN; - - for( ; *how; how++) - { switch(*how) - { case 'b': /* binary */ - flags &= ~SIO_TEXT; - enc = ENC_OCTET; - break; - case 'r': /* no record */ - flags &= ~SIO_RECORDPOS; - break; - case 'L': /* lock r: read, w: write */ - case 'l': /* lock r: read, w: write */ - // read-only, nothing changes. - break; - default: - errno = EINVAL; - return NULL; - } - } - -#if O_LARGEFILES && defined(O_LARGEFILE) - oflags |= O_LARGEFILE; -#endif - - switch(op) - { case 'w': - return NULL; - case 'a': - return NULL; - case 'u': - return NULL; - case 'r': - //const char *utf8 = (*env)->GetStringUTFChars(env, bufp, NULL); - asset = AAssetManager_open(mgr, bufp, AASSET_MODE_UNKNOWN); - flags |= SIO_INPUT; - break; - default: - errno = EINVAL; - return NULL; - } - - if ( !asset ) - return NULL; - - - s = Snew((void *)asset, flags, &Sassetfunctions); - if ( enc != ENC_UNKNOWN ) - s->encoding = enc; - - return s; -} - #endif /* __ANDROID__ */ /******************************* diff --git a/os/pl-util.c b/os/pl-util.c index d214937a7..ed5c00da4 100644 --- a/os/pl-util.c +++ b/os/pl-util.c @@ -7,7 +7,7 @@ int stricmp(const char *s1, const char *s2) { while(*s1 && makeLower(*s1) == makeLower(*s2)) s1++, s2++; - + return makeLower(*s1) - makeLower(*s2); } #endif @@ -67,6 +67,3 @@ out: return rc; } #endif - - - diff --git a/os/pl-write.c b/os/pl-write.c index f979d9efd..94b19503f 100644 --- a/os/pl-write.c +++ b/os/pl-write.c @@ -193,7 +193,7 @@ static int bind_varnames(term_t varnames ARG_LD) { CACHE_REGS - Term t = Yap_GetFromSlot(varnames PASS_REGS); + Term t = Yap_GetFromSlot(varnames); while(!IsVarTerm(t) && IsPairTerm(t)) { Term tl = HeadOfTerm(t); Functor f; @@ -221,7 +221,7 @@ char * varName(term_t t, char *name) { CACHE_REGS - CELL *adr = (CELL *)Yap_GetFromSlot(t PASS_REGS); + CELL *adr = (CELL *)Yap_GetFromSlot(t); if (IsAttVar(adr)) { Ssprintf(name, "_D%ld", (CELL)adr - (CELL)H0); @@ -262,20 +262,10 @@ writeTopTerm(term_t t, int prec, write_options *options) if (flags & PL_WRT_BLOB_PORTRAY) yap_flag |= Blob_Portray_f; old_module = CurrentModule; - char * buf[1024]; - size_t length; - int encode; Term tn; - - __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__, "Yap_REGS=%p\n", Yap_REGS); + CurrentModule = Yap_GetModuleFromEntry(options->module); - __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__, "t=%d\n", t) ; - -__android_log_print(ANDROID_LOG_ERROR, __FUNCTION__, "LOCAl_SlotBase[t]=%ld\n", LOCAL_SlotBase[t]); - __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__, "LOCAl_SlotBase=%ld\n", Deref(LOCAL_SlotBase[t])); - - -Yap_plwrite(Yap_GetFromSlot(t PASS_REGS), options->out, options->max_depth, yap_flag, prec); +Yap_plwrite(Yap_GetFromSlot(t), options->out, options->max_depth, yap_flag, prec); CurrentModule = old_module; return TRUE; } diff --git a/packages/gecode/clpfd.yap b/packages/gecode/clpfd.yap index 9e5a41428..1d14385c7 100644 --- a/packages/gecode/clpfd.yap +++ b/packages/gecode/clpfd.yap @@ -29,7 +29,7 @@ Constraints supported are: :- module(gecode_clpfd, [ - op(100, yf, []), + op(100, yf, []), op(760, yfx, #<==>), op(750, xfy, #==>), op(750, yfx, #<==), @@ -116,7 +116,7 @@ Constraints supported are: ]). /** @pred _X_ #< _B_ is det -reified implication +reified implication As an example. consider finding out the people who wanted to sit next to a friend and that are are actually sitting together: @@ -127,7 +127,7 @@ preference_satisfied(X-Y, B) :- ~~~~~ Note that not all constraints may be reifiable. - + */ /** @pred _X_ #< _Y_ is semidet smaller or equal @@ -137,7 +137,7 @@ Arguments to this constraint may be an arithmetic expression with +, count, and abs. Boolean variables support conjunction (/\), disjunction (\/), implication (=>), equivalence (<=>), and xor. The sum constraint allows a two argument version using the -`where` conditional, in Zinc style. +`where` conditional, in Zinc style. The send more money equation may be written as: @@ -157,35 +157,35 @@ OutFlow[I] #= sum(J in 1..N where D[J,I]count constraint counts the number of elements that match a certain constant or variable (integer sets are not available). - + */ /** @pred _X_ #<==> _B_ is det reified equivalence - + */ /** @pred _X_ #= _Y_ is semidet equality - + */ /** @pred _X_ #=< _Y_ is semidet smaller - + */ /** @pred _X_ #==> _B_ is det Reified implication - + */ /** @pred _X_ #> _Y_ is semidet larger - + */ /** @pred _X_ #>= _Y_ is semidet larger or equal - + */ /** @pred _X_ #\= _Y_ is semidet disequality - + */ /** @pred labeling( _Opts_, _Xs_) performs labeling, several variable and value selection options are @@ -217,14 +217,14 @@ median all value starting from the minimum. - + */ /** @pred scalar_product(+ _Cs_, + _Vs_, + _Rel_, ? _V_ ) The product of constant _Cs_ by _Vs_ must be in relation _Rel_ with _V_ . - + */ :- use_module(library(gecode)). @@ -341,7 +341,7 @@ process_constraints(B, B, _Env). post( rel(NA, (#=)), Env, _). /** @pred _X_ #= is det all elements of _X_ must take the same value - + */ ( A #\= ) :- get_home(Env), @@ -350,7 +350,7 @@ all elements of _X_ must take the same value /** @pred _X_ #< is det elements of _X_ must be decreasing or equal - + */ ( A #< ) :- get_home(Env), @@ -358,7 +358,7 @@ elements of _X_ must be decreasing or equal post( rel(NA, (#<)), Env, _). /** @pred _X_ #> is det elements of _X_ must be increasing - + */ ( A #> ) :- get_home(Env), @@ -366,7 +366,7 @@ elements of _X_ must be increasing post( rel(NA, (#>)), Env, _). /** @pred _X_ #=< is det elements of _X_ must be decreasing - + */ ( A #=< ) :- get_home(Env), @@ -374,7 +374,7 @@ elements of _X_ must be decreasing post( rel(NA, (#=<) ), Env, _). /** @pred _X_ #>= is det elements of _X_ must be increasinga or equal - + */ ( A #>= ) :- get_home(Env), @@ -537,7 +537,7 @@ clause( or, Ps, Ns, V ) :- labeling(Opts, Xs) :- get_home(Space-Map), - foldl2( processs_lab_opt, Opts, 'INT_VAR_SIZE_MIN', BranchVar, 'INT_VAL_MIN', BranchVal), + foldl2( processs_lab_opt, Opts, 'INT_VAR_SIZE_MIN', BranchVar, 'INT_VAL_MIN', BranchVal), term_variables(Xs, Vs), check( Vs, X1s ), ( X1s == [] -> true ; @@ -602,7 +602,7 @@ post( rel( A, Op), Space-Map, Reify):- (var(Reify) -> Space += rel(IA, GOP) ; Space += rel(IA, GOP, Reify) ). -% X #< Y +% X #< Y % X #< 2 post( rel( A, Op, B), Space-Map, Reify):- var(A), @@ -672,12 +672,12 @@ post( rel(A1+A2, Op, B), Space-Map, Reify):- (var(Reify) -> ( checklist(is_one, CAs) -> Space += linear(As, GOP, B0); - Space += linear(CAs, As, GOP, B0) + Space += linear(CAs, As, GOP, B0) ) ; ( checklist(is_one, CAs) -> Space += linear(As, GOP, B0, Reify); - Space += linear(CAs, As, GOP, B0, Reify) + Space += linear(CAs, As, GOP, B0, Reify) ) ). @@ -689,18 +689,18 @@ post( rel(A1-A2, Op, B), Space-Map, Reify):- (var(Reify) -> ( checklist(is_one, CAs) -> Space += linear(As, GOP, B0); - Space += linear(CAs, As, GOP, B0) + Space += linear(CAs, As, GOP, B0) ) ; ( checklist(is_one, CAs) -> Space += linear(As, GOP, B0, Reify); - Space += linear(CAs, As, GOP, B0, Reify) + Space += linear(CAs, As, GOP, B0, Reify) ) ). post( rel(A, Op, B), Space-Map, Reify):- arith(A, Name), - A =.. [_Op,A1], + A =.. [_Op,A1], is_list(A1), !, ( _Op = min -> true ; _Op = max ), maplist(equality_l( Space-Map), A1, NA1), @@ -710,7 +710,7 @@ post( rel(A, Op, B), Space-Map, Reify):- post( rel(A, Op, B), Space-Map, Reify):- arith(A, Name), - A =.. [_Op,A1], !, + A =.. [_Op,A1], !, equality(A1, NA1, Space-Map), in_c(NA1, VA1, Space-Map), !, equality(B, B1, Space-Map), @@ -718,7 +718,7 @@ post( rel(A, Op, B), Space-Map, Reify):- post( rel(A, Op, B), Space-Map, Reify):- arith(A, Name), - A =.. [_Op,A1,A2], !, + A =.. [_Op,A1,A2], !, equality(A1, NA1, Space-Map), in_c(NA1, VA1, Space-Map), equality(A2, NA2, Space-Map), @@ -828,7 +828,7 @@ reverse_arith_op( (#>=) , (#=<) ). reverse_arith_op( (#<) , (#>) ). reverse_arith_op( (#=<) , (#>=) ). -linearize(V, C, [A|As], As, [C|CAs], CAs, I, I, _-Map) :- +linearize(V, C, [A|As], As, [C|CAs], CAs, I, I, _-Map) :- var(V), !, l(V, A, Map). linearize(A+B, C, As, Bs, CAs, CBs, I, IF, Env) :- @@ -953,7 +953,7 @@ out_c(Name, A1, B, Op, Space-Map, Reify) :- new_arith( Name, A1, NB, Space-Map), gecode_arith_op( Op, BOP ), l(NB, IB, Map), - ( var(Reify) -> + ( var(Reify) -> Space += rel(IB, BOP, B) ; Space += rel(IB, BOP, B, Reify) @@ -988,7 +988,7 @@ out_c(Name, A1, A2, B, Op, Space-Map, Reify) :- new_arith( Name, A1, A2, NB, Space-Map), l(NB, IB, Map), gecode_arith_op( Op, BOP ), - ( var(Reify) -> + ( var(Reify) -> Space += rel(IB, BOP, B) ; Space += rel(IB, BOP, B, Reify) @@ -1198,7 +1198,7 @@ sum_l(Map, V, Min0, Min, Max0, Max) :- in_c(A, A, _y) :- var(A), !. in_c(C, A, Space-Map) :- - integer(C), + integer(C), Min is C-1, NX := intvar(Space, Min, C), m(A, NX, Min, C, Map), @@ -1221,7 +1221,7 @@ init_gecode(Space-Map, new) :- b_setval(gecode_space, Space-Map). close_gecode(_Space, _Vs, old) :- !. -close_gecode(Space-Map, Vs0, new) :- +close_gecode(Space-Map, Vs0, new) :- term_variables(Vs0, Vs), selectlist(intvar(Map), Vs, CVs), maplist(ll(Map), CVs, IVs), @@ -1294,7 +1294,7 @@ l(NV, OV, [v(V, OV, _A, _B)|_Vs]) :- l(NV, OV, [_|Vs]) :- l(NV, OV, Vs). */ - + ll(Map, X, Y) :- l(X, Y, Map). diff --git a/packages/myddas/Makefile.in b/packages/myddas/Makefile.in index 9c4e8e56d..831055925 100644 --- a/packages/myddas/Makefile.in +++ b/packages/myddas/Makefile.in @@ -62,7 +62,7 @@ MYDDAS_PROLOG= \ myddas_assert_predicates.ypp \ myddas_mysql.ypp \ myddas_sqlite3.ypp \ - myddas_top_level.ypp \ + myddas_top_level.ypp \ myddas_errors.ypp \ myddas_postgres.ypp \ myddas_prolog2sql.ypp \ @@ -85,7 +85,7 @@ all: $(SOBJS) $(MYDDAS_YAP) $(CC) -c $(CFLAGS) $< -o $@ %.yap: $(srcdir)/pl/%.ypp - $(ECPP) $(YAP_EXTRAS) -P -w $< -o $@ + $(ECPP) $(YAP_EXTRAS) -P -w $< > $@ @DO_SECOND_LD@%.@SO@: $(OBJS) @DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ @MYDDAS_LIBS@ diff --git a/packages/myddas/configure.in b/packages/myddas/configure.in index 5b871b6ce..2bb0101ef 100644 --- a/packages/myddas/configure.in +++ b/packages/myddas/configure.in @@ -195,14 +195,14 @@ else ENABLE_MYDDAS="" fi -INCLUDE_MYDDAS="#" +OBJECTS_MYDDAS="#" if test x"$ENABLE_MYDDAS" = x -a x"$STARTUP_ANDROID" = x then #in Android we have to actually include myddas in the binary - INCLUDE_MYDDAS="" + OBJECTS_MYDDAS="$(ALL_MYDDAS_OBJECTS)" fi AC_SUBST(PKG_MYDDAS) -AC_SUBST(INCLUDE_MYDDAS) +AC_SUBST(OBJECTS_MYDDAS) AC_SUBST(MYDDAS_CPPFLAGS) AC_SUBST(MYDDAS_LIBS) diff --git a/packages/myddas/myddas_shared.c b/packages/myddas/myddas_shared.c index 100de1e7b..c107d7636 100644 --- a/packages/myddas/myddas_shared.c +++ b/packages/myddas/myddas_shared.c @@ -127,7 +127,7 @@ c_db_connection_type ( USES_REGS1 ){ switch (type) { case API_MYSQL: - /* MYSQL Connection */ + /* MYSQL Connection */ return Yap_unify(arg_type, MkAtomTerm(Yap_LookupAtom("mysql"))); case API_ODBC: /* ODBC Connection */ diff --git a/packages/swig/Android.mk.in b/packages/swig/Android.mk.in index 12dde37d6..64db72168 100644 --- a/packages/swig/Android.mk.in +++ b/packages/swig/Android.mk.in @@ -26,9 +26,8 @@ LOCAL_MODULE := example LOCAL_SHARED_LIBRARIES := yap0 yap1 sqliteX yap2 LOCAL_STATIC_LIBRARIES := @abs_top_builddir@/libYap.ar LOCAL_SRC_FILES += @abs_top_builddir@/packages/swig/android/jni/yap_wrap.cpp -LOCAL_SRC_FILES += @srcdir@/../prosqlite/c/prosqlite.c LOCAL_C_INCLUDES := @abs_top_builddir@ @GMPDIR@/include @srcdir@/../../H @srcdir@/../../include @srcdir@/../../os @srcdir@/../../OPTYap @srcdir@/../../BEAM @srcdir@/../../CXX sqlite LOCAL_CFLAGS := @YAP_EXTRAS@ @DEFS@ -D_YAP_NOT_INSTALLED_=1 -DDESTDIR=\"\" LOCAL_CPP_FEATURES := rtti -# LOCAL_ALLOW_UNDEFINED_SYMBOLS := true +LOCAL_ALLOW_UNDEFINED_SYMBOLS := false include $(BUILD_SHARED_LIBRARY) diff --git a/packages/swig/Makefile.in b/packages/swig/Makefile.in index 6151e5029..cbfec82c6 100644 --- a/packages/swig/Makefile.in +++ b/packages/swig/Makefile.in @@ -26,11 +26,9 @@ JAVA_SQLITE="$(srcdir)/android/src/org" SQLITE=$(JNI_SQLITE) $(JAVA_SQLITE) -PROSQLITE=$(srcdir)/../prosqlite/prolog/prosqlite.pl - PYTHON_PROGRAMS = $(srcdir)/python/demo.py -ANDROID_PROGRAMS=$(srcdir)/android/JavaYap.java $(PROSQLITE) $(SQLITE) +ANDROID_PROGRAMS=$(srcdir)/android/JavaYap.java $(SQLITE) PROGRAMS= $(PYTHON_PROGRAMS) $(JAVA_PROGRAMS) $(ANDROID_PROGRAMS) @@ -42,7 +40,7 @@ YAP_EXPORT_SAVED_STATE="../../startup.yss" PYTHON_PROGRAMS = $(srcdir)/python/demo.py -ANDROID_PROGRAMS=$(srcdir)/android/JavaYap.java $(PROSQLITE) $(SQLITE) +ANDROID_PROGRAMS=$(srcdir)/android/JavaYap.java $(SQLITE) SWIG_FILES= \ $(srcdir)/yap.i @@ -89,9 +87,6 @@ JavaYap-debug.apk: android/libs/armeabi/libexample.so android/libs/armeabi/libexample.so: android/jni/Android.mk android/jni/Application.mk android/jni/yap_wrap.cpp ( cd android/jni && NDK_DEBUG=1 ndk-build ) - cp -r $(YAP_EXPORT_PLS)/* android/assets/share/Yap - cp -r $(YAP_EXPORT_DLLS)/*.so android/jni - cp -r $(YAP_EXPORT_SAVED_STATE) android/assets/lib/Yap android/jni/Application.mk: android/jni/Android.mk cp $(srcdir)/android/jni/Application.mk android/jni @@ -124,11 +119,13 @@ R: yap.i: $(srcdir)/../../../../include/YapInterface.h -install: +install: all clean: - rm -fr android/* jni/* java/* python/* + rm -fr android/libs/armeabi/libexample.so JavaYap-debug.apk android/jni/Application.mk \ + android/jni/Android.mk android/jni/yap_wrap.cpp python/_yap.so jni/yap_wrap.o \ + python/yap_wrap.cpp python/yap.py jni/yap_wrap.cpp java/yap.java distclean: clean rm -f *def Makefile diff --git a/packages/swig/android/JavaYap.java b/packages/swig/android/JavaYap.java index 21a25e83e..4f35f20d1 100644 --- a/packages/swig/android/JavaYap.java +++ b/packages/swig/android/JavaYap.java @@ -60,9 +60,10 @@ public class JavaYap extends Activity String str; String buf; YAPQuery q; - Boolean running = false; + Boolean running = false, compute = true; int i=1; YAPListTerm vs0; + private AssetManager mgr; void runQuery(String str, Boolean more) { @@ -70,13 +71,18 @@ public class JavaYap extends Activity { // check if at initial query if (!running) { + + if (BuildConfig.DEBUG) { + Log.i(TAG, "query "+str); + } + q = eng.query( str ); // get the uninstantiated query variables. vs0 = q.namedVars(); running = true; } // start computing - Boolean compute = true; + compute = true; if (BuildConfig.DEBUG) { Log.i(TAG, "onQueryButtonClick called"); @@ -89,7 +95,7 @@ public class JavaYap extends Activity if (BuildConfig.DEBUG) { Log.i(TAG, "q0=\n"); } - if (compute && q.next()) { + if (compute && (rc = q.next())) { outputText.append( "yes\n" ); running = compute = more; } else { @@ -102,7 +108,7 @@ public class JavaYap extends Activity Log.i(TAG, "q1= "+vs0.text()+"\n"); } while (compute && (rc = q.next()) ) { - YAPListTerm vs = vs0; + YAPListTerm vs = q.namedVars(); while(!vs.nil()){ if (BuildConfig.DEBUG) { Log.i(TAG, "q= "+vs0.text()+"\n"); @@ -118,11 +124,14 @@ public class JavaYap extends Activity } if ( !rc) { q.close(); - running = compute = false; + compute = true; + running = false; } } catch(Exception e){ outputText.append("Exception thrown :" + e); - return; + q.close(); + compute = true; + running = false; } } @@ -139,8 +148,8 @@ public class JavaYap extends Activity s = getPackageName(); PackageInfo p = m.getPackageInfo(s, 0); //s = p.applicationInfo.dataDir; - AssetManager mgr = getResources().getAssets(); - Log.i(TAG, "mgr=" +mgr + " " + s); + mgr = getResources().getAssets(); + Log.i(TAG, "mgr0=" +mgr + " " + s); load(mgr); } catch(NameNotFoundException e) { Log.e(TAG, "Couldn't find package information in PackageManager", e); @@ -239,8 +248,6 @@ public class JavaYap extends Activity private static native void load(AssetManager mgr); - private AssetManager mgr; - private static final String TAG = "JavaYap"; } @@ -256,13 +263,6 @@ class JavaCallback extends YAPCallback Log.i(TAG, "java callback init"); } - - public void run() - { - Log.i(TAG, "java callback "); - System.out.println("JavaCallback.run() "); - } - public void run(String s) { Log.i(TAG, "java callback "); diff --git a/packages/swig/android/jni/sqlite/sqlite3.c b/packages/swig/android/jni/sqlite/sqlite3.c index c81ac1de4..cbf8ca1a8 100644 --- a/packages/swig/android/jni/sqlite/sqlite3.c +++ b/packages/swig/android/jni/sqlite/sqlite3.c @@ -3567,7 +3567,7 @@ SQLITE_API const void *sqlite3_column_name16(sqlite3_stmt*, int N); ** UTF-16 encoded strings and the other functions return UTF-8. ** ** ^These APIs are only available if the library was compiled with the -** [SQLITE_ENABLE_COLUMN_METADATA] C-preprocessor symbol. +** [SQLITE_ENABLE_COLUMN_METAPDATA] C-preprocessor symbol. ** ** If two or more threads call one or more of these routines against the same ** prepared statement and column at the same time then the results are @@ -5130,7 +5130,7 @@ SQLITE_API SQLITE_DEPRECATED void sqlite3_soft_heap_limit(int N); ** in the [database connection] (to be retrieved using sqlite3_errmsg()).)^ ** ** ^This API is only available if the library was compiled with the -** [SQLITE_ENABLE_COLUMN_METADATA] C-preprocessor symbol defined. +** [SQLITE_ENABLE_COLUMN_METAPDATA] C-preprocessor symbol defined. */ SQLITE_API int sqlite3_table_column_metadata( sqlite3 *db, /* Connection handle */ @@ -8674,7 +8674,7 @@ typedef struct WhereInfo WhereInfo; /* TODO: This definition is just included so other modules compile. It ** needs to be revisited. */ -#define SQLITE_N_BTREE_META 10 +#define SQLITE_N_BTREE_METAP 10 /* ** If defined as non-zero, auto-vacuum is enabled by default. Otherwise @@ -9045,7 +9045,7 @@ typedef struct VdbeOpList VdbeOpList; #define COLNAME_DATABASE 2 #define COLNAME_TABLE 3 #define COLNAME_COLUMN 4 -#ifdef SQLITE_ENABLE_COLUMN_METADATA +#ifdef SQLITE_ENABLE_COLUMN_METAPDATA # define COLNAME_N 5 /* Number of COLNAME_xxx symbols */ #else # ifdef SQLITE_OMIT_DECLTYPE @@ -13104,8 +13104,8 @@ static const char * const azCompileOpt[] = { #ifdef SQLITE_ENABLE_CEROD "ENABLE_CEROD", #endif -#ifdef SQLITE_ENABLE_COLUMN_METADATA - "ENABLE_COLUMN_METADATA", +#ifdef SQLITE_ENABLE_COLUMN_METAPDATA + "ENABLE_COLUMN_METAPDATA", #endif #ifdef SQLITE_ENABLE_EXPENSIVE_ASSERT "ENABLE_EXPENSIVE_ASSERT", @@ -65428,12 +65428,12 @@ SQLITE_API const void *sqlite3_column_name16(sqlite3_stmt *pStmt, int N){ #endif /* -** Constraint: If you have ENABLE_COLUMN_METADATA then you must +** Constraint: If you have ENABLE_COLUMN_METAPDATA then you must ** not define OMIT_DECLTYPE. */ -#if defined(SQLITE_OMIT_DECLTYPE) && defined(SQLITE_ENABLE_COLUMN_METADATA) +#if defined(SQLITE_OMIT_DECLTYPE) && defined(SQLITE_ENABLE_COLUMN_METAPDATA) # error "Must not define both SQLITE_OMIT_DECLTYPE \ - and SQLITE_ENABLE_COLUMN_METADATA" + and SQLITE_ENABLE_COLUMN_METAPDATA" #endif #ifndef SQLITE_OMIT_DECLTYPE @@ -65453,7 +65453,7 @@ SQLITE_API const void *sqlite3_column_decltype16(sqlite3_stmt *pStmt, int N){ #endif /* SQLITE_OMIT_UTF16 */ #endif /* SQLITE_OMIT_DECLTYPE */ -#ifdef SQLITE_ENABLE_COLUMN_METADATA +#ifdef SQLITE_ENABLE_COLUMN_METAPDATA /* ** Return the name of the database from which a result column derives. ** NULL is returned if the result column is an expression or constant or @@ -65501,7 +65501,7 @@ SQLITE_API const void *sqlite3_column_origin_name16(sqlite3_stmt *pStmt, int N){ pStmt, N, (const void*(*)(Mem*))sqlite3_value_text16, COLNAME_COLUMN); } #endif /* SQLITE_OMIT_UTF16 */ -#endif /* SQLITE_ENABLE_COLUMN_METADATA */ +#endif /* SQLITE_ENABLE_COLUMN_METAPDATA */ /******************************* sqlite3_bind_ *************************** @@ -69285,7 +69285,7 @@ case OP_ReadCookie: { /* out2-prerelease */ assert( p->bIsReader ); iDb = pOp->p1; iCookie = pOp->p3; - assert( pOp->p3p3=0 && iDbnDb ); assert( db->aDb[iDb].pBt!=0 ); assert( (p->btreeMask & (((yDbMask)1)<p2p2p1>=0 && pOp->p1nDb ); assert( (p->btreeMask & (((yDbMask)1)<p1))!=0 ); assert( p->readOnly==0 ); @@ -95154,7 +95154,7 @@ struct sqlite3_api_routines { ** excluded from a build of SQLite. Substitute a NULL pointer ** for any missing APIs. */ -#ifndef SQLITE_ENABLE_COLUMN_METADATA +#ifndef SQLITE_ENABLE_COLUMN_METAPDATA # define sqlite3_column_database_name 0 # define sqlite3_column_database_name16 0 # define sqlite3_column_table_name 0 @@ -100186,9 +100186,9 @@ static void generateSortTail( ** The declaration type for any expression other than a column is NULL. ** ** This routine has either 3 or 6 parameters depending on whether or not -** the SQLITE_ENABLE_COLUMN_METADATA compile-time option is used. +** the SQLITE_ENABLE_COLUMN_METAPDATA compile-time option is used. */ -#ifdef SQLITE_ENABLE_COLUMN_METADATA +#ifdef SQLITE_ENABLE_COLUMN_METAPDATA # define columnType(A,B,C,D,E,F) columnTypeImpl(A,B,C,D,E,F) static const char *columnTypeImpl( NameContext *pNC, @@ -100201,14 +100201,14 @@ static const char *columnTypeImpl( char const *zOrigDb = 0; char const *zOrigTab = 0; char const *zOrigCol = 0; -#else /* if !defined(SQLITE_ENABLE_COLUMN_METADATA) */ +#else /* if !defined(SQLITE_ENABLE_COLUMN_METAPDATA) */ # define columnType(A,B,C,D,E,F) columnTypeImpl(A,B,F) static const char *columnTypeImpl( NameContext *pNC, Expr *pExpr, u8 *pEstWidth ){ -#endif /* !defined(SQLITE_ENABLE_COLUMN_METADATA) */ +#endif /* !defined(SQLITE_ENABLE_COLUMN_METAPDATA) */ char const *zType = 0; int j; u8 estWidth = 1; @@ -100281,7 +100281,7 @@ static const char *columnTypeImpl( assert( !pS ); if( iCol<0 ) iCol = pTab->iPKey; assert( iCol==-1 || (iCol>=0 && iColnCol) ); -#ifdef SQLITE_ENABLE_COLUMN_METADATA +#ifdef SQLITE_ENABLE_COLUMN_METAPDATA if( iCol<0 ){ zType = "INTEGER"; zOrigCol = "rowid"; @@ -100325,7 +100325,7 @@ static const char *columnTypeImpl( #endif } -#ifdef SQLITE_ENABLE_COLUMN_METADATA +#ifdef SQLITE_ENABLE_COLUMN_METAPDATA if( pzOrigDb ){ assert( pzOrigTab && pzOrigCol ); *pzOrigDb = zOrigDb; @@ -100355,7 +100355,7 @@ static void generateColumnTypes( for(i=0; inExpr; i++){ Expr *p = pEList->a[i].pExpr; const char *zType; -#ifdef SQLITE_ENABLE_COLUMN_METADATA +#ifdef SQLITE_ENABLE_COLUMN_METAPDATA const char *zOrigDb = 0; const char *zOrigTab = 0; const char *zOrigCol = 0; @@ -121509,7 +121509,7 @@ SQLITE_API void sqlite3_thread_cleanup(void){ ** Return meta information about a specific column of a database table. ** See comment in sqlite3.h (sqlite.h.in) for details. */ -#ifdef SQLITE_ENABLE_COLUMN_METADATA +#ifdef SQLITE_ENABLE_COLUMN_METAPDATA SQLITE_API int sqlite3_table_column_metadata( sqlite3 *db, /* Connection handle */ const char *zDbName, /* Database name or NULL */ diff --git a/packages/swig/android/jni/sqlite/sqlite3.h b/packages/swig/android/jni/sqlite/sqlite3.h index ececf6ead..debf67b85 100644 --- a/packages/swig/android/jni/sqlite/sqlite3.h +++ b/packages/swig/android/jni/sqlite/sqlite3.h @@ -135,8 +135,8 @@ extern "C" { ** function is provided for use in DLLs since DLL users usually do not have ** direct access to string constants within the DLL. ^The ** sqlite3_libversion_number() function returns an integer equal to -** [SQLITE_VERSION_NUMBER]. ^The sqlite3_sourceid() function returns -** a pointer to a string constant whose value is the same as the +** [SQLITE_VERSION_NUMBER]. ^The sqlite3_sourceid() function returns +** a pointer to a string constant whose value is the same as the ** [SQLITE_SOURCE_ID] C preprocessor macro. ** ** See also: [sqlite_version()] and [sqlite_source_id()]. @@ -149,20 +149,20 @@ SQLITE_API int sqlite3_libversion_number(void); /* ** CAPI3REF: Run-Time Library Compilation Options Diagnostics ** -** ^The sqlite3_compileoption_used() function returns 0 or 1 -** indicating whether the specified option was defined at -** compile time. ^The SQLITE_ prefix may be omitted from the -** option name passed to sqlite3_compileoption_used(). +** ^The sqlite3_compileoption_used() function returns 0 or 1 +** indicating whether the specified option was defined at +** compile time. ^The SQLITE_ prefix may be omitted from the +** option name passed to sqlite3_compileoption_used(). ** ** ^The sqlite3_compileoption_get() function allows iterating ** over the list of options that were defined at compile time by ** returning the N-th compile time option string. ^If N is out of range, -** sqlite3_compileoption_get() returns a NULL pointer. ^The SQLITE_ -** prefix is omitted from any strings returned by +** sqlite3_compileoption_get() returns a NULL pointer. ^The SQLITE_ +** prefix is omitted from any strings returned by ** sqlite3_compileoption_get(). ** ** ^Support for the diagnostic functions sqlite3_compileoption_used() -** and sqlite3_compileoption_get() may be omitted by specifying the +** and sqlite3_compileoption_get() may be omitted by specifying the ** [SQLITE_OMIT_COMPILEOPTION_DIAGS] option at compile time. ** ** See also: SQL functions [sqlite_compileoption_used()] and @@ -183,7 +183,7 @@ SQLITE_API const char *sqlite3_compileoption_get(int N); ** SQLite can be compiled with or without mutexes. When ** the [SQLITE_THREADSAFE] C preprocessor macro is 1 or 2, mutexes ** are enabled and SQLite is threadsafe. When the -** [SQLITE_THREADSAFE] macro is 0, +** [SQLITE_THREADSAFE] macro is 0, ** the mutexes are omitted. Without the mutexes, it is not safe ** to use SQLite concurrently from more than one thread. ** @@ -240,7 +240,7 @@ typedef struct sqlite3 sqlite3; ** ** ^The sqlite3_int64 and sqlite_int64 types can store integer values ** between -9223372036854775808 and +9223372036854775807 inclusive. ^The -** sqlite3_uint64 and sqlite_uint64 types can store integer values +** sqlite3_uint64 and sqlite_uint64 types can store integer values ** between 0 and +18446744073709551615 inclusive. */ #ifdef SQLITE_INT64_TYPE @@ -285,7 +285,7 @@ typedef sqlite_uint64 sqlite3_uint64; ** destructors are called is arbitrary. ** ** Applications should [sqlite3_finalize | finalize] all [prepared statements], -** [sqlite3_blob_close | close] all [BLOB handles], and +** [sqlite3_blob_close | close] all [BLOB handles], and ** [sqlite3_backup_finish | finish] all [sqlite3_backup] objects associated ** with the [sqlite3] object prior to attempting to close the object. ^If ** sqlite3_close_v2() is called on a [database connection] that still has @@ -321,7 +321,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**); ** The sqlite3_exec() interface is a convenience wrapper around ** [sqlite3_prepare_v2()], [sqlite3_step()], and [sqlite3_finalize()], ** that allows an application to run multiple statements of SQL -** without having to use a lot of C code. +** without having to use a lot of C code. ** ** ^The sqlite3_exec() interface runs zero or more UTF-8 encoded, ** semicolon-separate SQL statements passed into its 2nd argument, @@ -361,7 +361,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**); ** from [sqlite3_column_name()]. ** ** ^If the 2nd parameter to sqlite3_exec() is a NULL pointer, a pointer -** to an empty string, or a pointer that contains only whitespace and/or +** to an empty string, or a pointer that contains only whitespace and/or ** SQL comments, then no SQL statements are evaluated and the database ** is not changed. ** @@ -622,7 +622,7 @@ SQLITE_API int sqlite3_exec( /* ** CAPI3REF: OS Interface Open File Handle ** -** An [sqlite3_file] object represents an open file in the +** An [sqlite3_file] object represents an open file in the ** [sqlite3_vfs | OS interface layer]. Individual OS interface ** implementations will ** want to subclass this object by appending additional fields @@ -644,7 +644,7 @@ struct sqlite3_file { ** This object defines the methods used to perform various operations ** against the open file represented by the [sqlite3_file] object. ** -** If the [sqlite3_vfs.xOpen] method sets the sqlite3_file.pMethods element +** If the [sqlite3_vfs.xOpen] method sets the sqlite3_file.pMethods element ** to a non-NULL pointer, then the sqlite3_io_methods.xClose method ** may be invoked even if the [sqlite3_vfs.xOpen] reported that it failed. The ** only way to prevent a call to xClose following a failed [sqlite3_vfs.xOpen] @@ -778,7 +778,7 @@ struct sqlite3_io_methods { **
  • [[SQLITE_FCNTL_CHUNK_SIZE]] ** The [SQLITE_FCNTL_CHUNK_SIZE] opcode is used to request that the VFS ** extends and truncates the database file in chunks of a size specified -** by the user. The fourth argument to [sqlite3_file_control()] should +** by the user. The fourth argument to [sqlite3_file_control()] should ** point to an integer (type int) containing the new chunk-size to use ** for the nominated database. Allocating database file space in large ** chunks (say 1MB at a time), may reduce file-system fragmentation and @@ -796,24 +796,24 @@ struct sqlite3_io_methods { **
  • [[SQLITE_FCNTL_SYNC]] ** The [SQLITE_FCNTL_SYNC] opcode is generated internally by SQLite and ** sent to the VFS immediately before the xSync method is invoked on a -** database file descriptor. Or, if the xSync method is not invoked -** because the user has configured SQLite with -** [PRAGMA synchronous | PRAGMA synchronous=OFF] it is invoked in place +** database file descriptor. Or, if the xSync method is not invoked +** because the user has configured SQLite with +** [PRAGMA synchronous | PRAGMA synchronous=OFF] it is invoked in place ** of the xSync method. In most cases, the pointer argument passed with ** this file-control is NULL. However, if the database file is being synced ** as part of a multi-database commit, the argument points to a nul-terminated -** string containing the transactions master-journal file name. VFSes that -** do not need this signal should silently ignore this opcode. Applications -** should not call [sqlite3_file_control()] with this opcode as doing so may -** disrupt the operation of the specialized VFSes that do require it. +** string containing the transactions master-journal file name. VFSes that +** do not need this signal should silently ignore this opcode. Applications +** should not call [sqlite3_file_control()] with this opcode as doing so may +** disrupt the operation of the specialized VFSes that do require it. ** **
  • [[SQLITE_FCNTL_COMMIT_PHASETWO]] ** The [SQLITE_FCNTL_COMMIT_PHASETWO] opcode is generated internally by SQLite ** and sent to the VFS after a transaction has been committed immediately ** but before the database is unlocked. VFSes that do not need this signal ** should silently ignore this opcode. Applications should not call -** [sqlite3_file_control()] with this opcode as doing so may disrupt the -** operation of the specialized VFSes that do require it. +** [sqlite3_file_control()] with this opcode as doing so may disrupt the +** operation of the specialized VFSes that do require it. ** **
  • [[SQLITE_FCNTL_WIN32_AV_RETRY]] ** ^The [SQLITE_FCNTL_WIN32_AV_RETRY] opcode is used to configure automatic @@ -860,13 +860,13 @@ struct sqlite3_io_methods { **
  • [[SQLITE_FCNTL_OVERWRITE]] ** ^The [SQLITE_FCNTL_OVERWRITE] opcode is invoked by SQLite after opening ** a write transaction to indicate that, unless it is rolled back for some -** reason, the entire database file will be overwritten by the current +** reason, the entire database file will be overwritten by the current ** transaction. This is used by VACUUM operations. ** **
  • [[SQLITE_FCNTL_VFSNAME]] ** ^The [SQLITE_FCNTL_VFSNAME] opcode can be used to obtain the names of ** all [VFSes] in the VFS stack. The names are of all VFS shims and the -** final bottom-level VFS are written into memory obtained from +** final bottom-level VFS are written into memory obtained from ** [sqlite3_malloc()] and the result is stored in the char* variable ** that the fourth parameter of [sqlite3_file_control()] points to. ** The caller is responsible for freeing the memory when done. As with @@ -876,7 +876,7 @@ struct sqlite3_io_methods { ** is intended for diagnostic use only. ** **
  • [[SQLITE_FCNTL_PRAGMA]] -** ^Whenever a [PRAGMA] statement is parsed, an [SQLITE_FCNTL_PRAGMA] +** ^Whenever a [PRAGMA] statement is parsed, an [SQLITE_FCNTL_PRAGMA] ** file control is sent to the open [sqlite3_file] object corresponding ** to the database file to which the pragma statement refers. ^The argument ** to the [SQLITE_FCNTL_PRAGMA] file control is an array of @@ -887,7 +887,7 @@ struct sqlite3_io_methods { ** of the char** argument point to a string obtained from [sqlite3_mprintf()] ** or the equivalent and that string will become the result of the pragma or ** the error message if the pragma fails. ^If the -** [SQLITE_FCNTL_PRAGMA] file control returns [SQLITE_NOTFOUND], then normal +** [SQLITE_FCNTL_PRAGMA] file control returns [SQLITE_NOTFOUND], then normal ** [PRAGMA] processing continues. ^If the [SQLITE_FCNTL_PRAGMA] ** file control returns [SQLITE_OK], then the parser assumes that the ** VFS has handled the PRAGMA itself and the parser generates a no-op @@ -925,7 +925,7 @@ struct sqlite3_io_methods { ** The argument is a pointer to a value of type sqlite3_int64 that ** is an advisory maximum number of bytes in the file to memory map. The ** pointer is overwritten with the old value. The limit is not changed if -** the value originally pointed to is negative, and so the current limit +** the value originally pointed to is negative, and so the current limit ** can be queried by passing in a pointer to a negative number. This ** file-control is used internally to implement [PRAGMA mmap_size]. ** @@ -1027,14 +1027,14 @@ typedef struct sqlite3_mutex sqlite3_mutex; ** the [sqlite3_file] can safely store a pointer to the ** filename if it needs to remember the filename for some reason. ** If the zFilename parameter to xOpen is a NULL pointer then xOpen -** must invent its own temporary name for the file. ^Whenever the +** must invent its own temporary name for the file. ^Whenever the ** xFilename parameter is NULL it will also be the case that the ** flags parameter will include [SQLITE_OPEN_DELETEONCLOSE]. ** ** The flags argument to xOpen() includes all bits set in ** the flags argument to [sqlite3_open_v2()]. Or if [sqlite3_open()] ** or [sqlite3_open16()] is used, then flags includes at least -** [SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE]. +** [SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE]. ** If xOpen() opens a file read-only then it sets *pOutFlags to ** include [SQLITE_OPEN_READONLY]. Other bits in *pOutFlags may be set. ** @@ -1076,10 +1076,10 @@ typedef struct sqlite3_mutex sqlite3_mutex; ** ^The [SQLITE_OPEN_EXCLUSIVE] flag is always used in conjunction ** with the [SQLITE_OPEN_CREATE] flag, which are both directly ** analogous to the O_EXCL and O_CREAT flags of the POSIX open() -** API. The SQLITE_OPEN_EXCLUSIVE flag, when paired with the +** API. The SQLITE_OPEN_EXCLUSIVE flag, when paired with the ** SQLITE_OPEN_CREATE, is used to indicate that file should always ** be created, and that it is an error if it already exists. -** It is not used to indicate the file should be opened +** It is not used to indicate the file should be opened ** for exclusive access. ** ** ^At least szOsFile bytes of memory are allocated by SQLite @@ -1117,16 +1117,16 @@ typedef struct sqlite3_mutex sqlite3_mutex; ** method returns a Julian Day Number for the current date and time as ** a floating point value. ** ^The xCurrentTimeInt64() method returns, as an integer, the Julian -** Day Number multiplied by 86400000 (the number of milliseconds in -** a 24-hour day). +** Day Number multiplied by 86400000 (the number of milliseconds in +** a 24-hour day). ** ^SQLite will use the xCurrentTimeInt64() method to get the current -** date and time if that method is available (if iVersion is 2 or +** date and time if that method is available (if iVersion is 2 or ** greater and the function pointer is not NULL) and will fall back ** to xCurrentTime() if xCurrentTimeInt64() is unavailable. ** ** ^The xSetSystemCall(), xGetSystemCall(), and xNestSystemCall() interfaces ** are not used by the SQLite core. These optional interfaces are provided -** by some VFSes to facilitate testing of the VFS code. By overriding +** by some VFSes to facilitate testing of the VFS code. By overriding ** system calls with functions under its control, a test program can ** simulate faults and error conditions that would otherwise be difficult ** or impossible to induce. The set of system calls that can be overridden @@ -1173,7 +1173,7 @@ struct sqlite3_vfs { /* ** The methods above are in versions 1 through 3 of the sqlite_vfs object. ** New fields may be appended in figure versions. The iVersion - ** value will increment whenever this happens. + ** value will increment whenever this happens. */ }; @@ -1217,7 +1217,7 @@ struct sqlite3_vfs { ** ** ** When unlocking, the same SHARED or EXCLUSIVE flag must be supplied as -** was given no the corresponding lock. +** was given no the corresponding lock. ** ** The xShmLock method can transition between unlocked and SHARED or ** between unlocked and EXCLUSIVE. It cannot transition between SHARED @@ -1359,7 +1359,7 @@ SQLITE_API int sqlite3_config(int, ...); ** [database connection] (specified in the first argument). ** ** The second argument to sqlite3_db_config(D,V,...) is the -** [SQLITE_DBCONFIG_LOOKASIDE | configuration verb] - an integer code +** [SQLITE_DBCONFIG_LOOKASIDE | configuration verb] - an integer code ** that indicates what aspect of the [database connection] is being configured. ** Subsequent arguments vary depending on the configuration verb. ** @@ -1377,7 +1377,7 @@ SQLITE_API int sqlite3_db_config(sqlite3*, int op, ...); ** This object is used in only one place in the SQLite interface. ** A pointer to an instance of this object is the argument to ** [sqlite3_config()] when the configuration option is -** [SQLITE_CONFIG_MALLOC] or [SQLITE_CONFIG_GETMALLOC]. +** [SQLITE_CONFIG_MALLOC] or [SQLITE_CONFIG_GETMALLOC]. ** By creating an instance of this object ** and passing it to [sqlite3_config]([SQLITE_CONFIG_MALLOC]) ** during configuration, an application can specify an alternative @@ -1407,7 +1407,7 @@ SQLITE_API int sqlite3_db_config(sqlite3*, int op, ...); ** allocators round up memory allocations at least to the next multiple ** of 8. Some allocators round up to a larger multiple or to a power of 2. ** Every memory allocation request coming in through [sqlite3_malloc()] -** or [sqlite3_realloc()] first calls xRoundup. If xRoundup returns 0, +** or [sqlite3_realloc()] first calls xRoundup. If xRoundup returns 0, ** that causes the corresponding memory allocation to fail. ** ** The xInit method initializes the memory allocator. For example, @@ -1465,7 +1465,7 @@ struct sqlite3_mem_methods { ** by a single thread. ^If SQLite is compiled with ** the [SQLITE_THREADSAFE | SQLITE_THREADSAFE=0] compile-time option then ** it is not possible to change the [threading mode] from its default -** value of Single-thread and so [sqlite3_config()] will return +** value of Single-thread and so [sqlite3_config()] will return ** [SQLITE_ERROR] if called with the SQLITE_CONFIG_SINGLETHREAD ** configuration option. ** @@ -1516,9 +1516,9 @@ struct sqlite3_mem_methods { ** tracks memory usage, for example. ** ** [[SQLITE_CONFIG_MEMSTATUS]]
    SQLITE_CONFIG_MEMSTATUS
    -**
    ^This option takes single argument of type int, interpreted as a -** boolean, which enables or disables the collection of memory allocation -** statistics. ^(When memory allocation statistics are disabled, the +**
    ^This option takes single argument of type int, interpreted as a +** boolean, which enables or disables the collection of memory allocation +** statistics. ^(When memory allocation statistics are disabled, the ** following SQLite interfaces become non-operational: **
      **
    • [sqlite3_memory_used()] @@ -1544,12 +1544,12 @@ struct sqlite3_mem_methods { ** N should be set to twice the expected maximum number of threads. ** ^SQLite will never require a scratch buffer that is more than 6 ** times the database page size. ^If SQLite needs needs additional -** scratch memory beyond what is provided by this configuration option, then +** scratch memory beyond what is provided by this configuration option, then ** [sqlite3_malloc()] will be used to obtain the memory needed.
    ** ** [[SQLITE_CONFIG_PAGECACHE]]
    SQLITE_CONFIG_PAGECACHE
    **
    ^This option specifies a static memory buffer that SQLite can use for -** the database page cache with the default page cache implementation. +** the database page cache with the default page cache implementation. ** This configuration should not be used if an application-define page ** cache implementation is loaded using the SQLITE_CONFIG_PCACHE2 option. ** There are three arguments to this option: A pointer to 8-byte aligned @@ -1635,7 +1635,7 @@ struct sqlite3_mem_methods { **
    The SQLITE_CONFIG_LOG option is used to configure the SQLite ** global [error log]. ** (^The SQLITE_CONFIG_LOG option takes two arguments: a pointer to a -** function with a call signature of void(*)(void*,int,const char*), +** function with a call signature of void(*)(void*,int,const char*), ** and a pointer to void. ^If the function pointer is not NULL, it is ** invoked by [sqlite3_log()] to process each logging event. ^If the ** function pointer is NULL, the [sqlite3_log()] interface becomes a no-op. @@ -1732,7 +1732,7 @@ struct sqlite3_mem_methods { #define SQLITE_CONFIG_MEMSTATUS 9 /* boolean */ #define SQLITE_CONFIG_MUTEX 10 /* sqlite3_mutex_methods* */ #define SQLITE_CONFIG_GETMUTEX 11 /* sqlite3_mutex_methods* */ -/* previously SQLITE_CONFIG_CHUNKALLOC 12 which is now unused. */ +/* previously SQLITE_CONFIG_CHUNKALLOC 12 which is now unused. */ #define SQLITE_CONFIG_LOOKASIDE 13 /* int int */ #define SQLITE_CONFIG_PCACHE 14 /* no-op */ #define SQLITE_CONFIG_GETPCACHE 15 /* no-op */ @@ -1760,7 +1760,7 @@ struct sqlite3_mem_methods { ** **
    **
    SQLITE_DBCONFIG_LOOKASIDE
    -**
    ^This option takes three additional arguments that determine the +**
    ^This option takes three additional arguments that determine the ** [lookaside memory allocator] configuration for the [database connection]. ** ^The first argument (the third parameter to [sqlite3_db_config()] is a ** pointer to a memory buffer to use for lookaside memory. @@ -1778,7 +1778,7 @@ struct sqlite3_mem_methods { ** when the "current value" returned by ** [sqlite3_db_status](D,[SQLITE_CONFIG_LOOKASIDE],...) is zero. ** Any attempt to change the lookaside memory configuration when lookaside -** memory is in use leaves the configuration unchanged and returns +** memory is in use leaves the configuration unchanged and returns ** [SQLITE_BUSY].)^
    ** **
    SQLITE_DBCONFIG_ENABLE_FKEY
    @@ -1828,18 +1828,18 @@ SQLITE_API int sqlite3_extended_result_codes(sqlite3*, int onoff); ** the table has a column of type [INTEGER PRIMARY KEY] then that column ** is another alias for the rowid. ** -** ^The sqlite3_last_insert_rowid(D) interface returns the [rowid] of the +** ^The sqlite3_last_insert_rowid(D) interface returns the [rowid] of the ** most recent successful [INSERT] into a rowid table or [virtual table] ** on database connection D. ** ^Inserts into [WITHOUT ROWID] tables are not recorded. ** ^If no successful [INSERT]s into rowid tables -** have ever occurred on the database connection D, +** have ever occurred on the database connection D, ** then sqlite3_last_insert_rowid(D) returns zero. ** ** ^(If an [INSERT] occurs within a trigger or within a [virtual table] ** method, then this routine will return the [rowid] of the inserted ** row as long as the trigger or virtual table method is running. -** But once the trigger or virtual table method ends, the value returned +** But once the trigger or virtual table method ends, the value returned ** by this routine reverts to what it was before the trigger or virtual ** table method began.)^ ** @@ -1890,7 +1890,7 @@ SQLITE_API sqlite3_int64 sqlite3_last_insert_rowid(sqlite3*); ** mechanisms do not count as direct row changes.)^ ** ** A "trigger context" is a scope of execution that begins and -** ends with the script of a [CREATE TRIGGER | trigger]. +** ends with the script of a [CREATE TRIGGER | trigger]. ** Most SQL statements are ** evaluated outside of any trigger. This is the "top level" ** trigger context. If a trigger fires from the top level, a @@ -1933,7 +1933,7 @@ SQLITE_API int sqlite3_changes(sqlite3*); ** the count does not include changes used to implement [REPLACE] constraints, ** do rollbacks or ABORT processing, or [DROP TABLE] processing. The ** count does not include rows of views that fire an [INSTEAD OF trigger], -** though if the INSTEAD OF trigger makes changes of its own, those changes +** though if the INSTEAD OF trigger makes changes of its own, those changes ** are counted.)^ ** ^The sqlite3_total_changes() function counts the changes as soon as ** the statement that makes them is completed (when the statement handle @@ -1973,7 +1973,7 @@ SQLITE_API int sqlite3_total_changes(sqlite3*); ** ** ^The sqlite3_interrupt(D) call is in effect until all currently running ** SQL statements on [database connection] D complete. ^Any new SQL statements -** that are started after the sqlite3_interrupt() call and before the +** that are started after the sqlite3_interrupt() call and before the ** running statements reaches zero are interrupted as if they had been ** running prior to the sqlite3_interrupt() call. ^New SQL statements ** that are started after the running statement count reaches zero are @@ -2008,7 +2008,7 @@ SQLITE_API void sqlite3_interrupt(sqlite3*); ** ^These routines do not parse the SQL statements thus ** will not detect syntactically incorrect SQL. ** -** ^(If SQLite has not been initialized using [sqlite3_initialize()] prior +** ^(If SQLite has not been initialized using [sqlite3_initialize()] prior ** to invoking sqlite3_complete16() then sqlite3_initialize() is invoked ** automatically by sqlite3_complete16(). If that initialization fails, ** then the return value from sqlite3_complete16() will be non-zero @@ -2083,7 +2083,7 @@ SQLITE_API int sqlite3_complete16(const void *sql); ** The busy callback should not take any actions which modify the ** database connection that invoked the busy handler. Any such actions ** result in undefined behavior. -** +** ** A busy handler must not close the database connection ** or [prepared statement] that invoked the busy handler. */ @@ -2433,7 +2433,7 @@ SQLITE_API void sqlite3_randomness(int N, void *P); ** requested is ok. ^When the callback returns [SQLITE_DENY], the ** [sqlite3_prepare_v2()] or equivalent call that triggered the ** authorizer will fail with an error message explaining that -** access is denied. +** access is denied. ** ** ^The first parameter to the authorizer callback is a copy of the third ** parameter to the sqlite3_set_authorizer() interface. ^The second parameter @@ -2480,7 +2480,7 @@ SQLITE_API void sqlite3_randomness(int N, void *P); ** database connections for the meaning of "modify" in this paragraph. ** ** ^When [sqlite3_prepare_v2()] is used to prepare a statement, the -** statement might be re-prepared during [sqlite3_step()] due to a +** statement might be re-prepared during [sqlite3_step()] due to a ** schema change. Hence, the application should ensure that the ** correct authorizer callback remains in place during the [sqlite3_step()]. ** @@ -2606,8 +2606,8 @@ SQLITE_API SQLITE_EXPERIMENTAL void *sqlite3_profile(sqlite3*, ** database connection D. An example use for this ** interface is to keep a GUI updated during a large query. ** -** ^The parameter P is passed through as the only parameter to the -** callback function X. ^The parameter N is the approximate number of +** ^The parameter P is passed through as the only parameter to the +** callback function X. ^The parameter N is the approximate number of ** [virtual machine instructions] that are evaluated between successive ** invocations of the callback X. ^If N is less than one then the progress ** handler is disabled. @@ -2633,7 +2633,7 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); /* ** CAPI3REF: Opening A New Database Connection ** -** ^These routines open an SQLite database file as specified by the +** ^These routines open an SQLite database file as specified by the ** filename argument. ^The filename argument is interpreted as UTF-8 for ** sqlite3_open() and sqlite3_open_v2() and as UTF-16 in the native byte ** order for sqlite3_open16(). ^(A [database connection] handle is usually @@ -2658,7 +2658,7 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); ** except that it accepts two additional parameters for additional control ** over the new database connection. ^(The flags parameter to ** sqlite3_open_v2() can take one of -** the following three values, optionally combined with the +** the following three values, optionally combined with the ** [SQLITE_OPEN_NOMUTEX], [SQLITE_OPEN_FULLMUTEX], [SQLITE_OPEN_SHAREDCACHE], ** [SQLITE_OPEN_PRIVATECACHE], and/or [SQLITE_OPEN_URI] flags:)^ ** @@ -2726,17 +2726,17 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); ** information. ** ** URI filenames are parsed according to RFC 3986. ^If the URI contains an -** authority, then it must be either an empty string or the string -** "localhost". ^If the authority is not an empty string or "localhost", an -** error is returned to the caller. ^The fragment component of a URI, if +** authority, then it must be either an empty string or the string +** "localhost". ^If the authority is not an empty string or "localhost", an +** error is returned to the caller. ^The fragment component of a URI, if ** present, is ignored. ** ** ^SQLite uses the path component of the URI as the name of the disk file -** which contains the database. ^If the path begins with a '/' character, -** then it is interpreted as an absolute path. ^If the path does not begin +** which contains the database. ^If the path begins with a '/' character, +** then it is interpreted as an absolute path. ^If the path does not begin ** with a '/' (meaning that the authority section is omitted from the URI) -** then the path is interpreted as a relative path. -** ^On windows, the first component of an absolute path +** then the path is interpreted as a relative path. +** ^On windows, the first component of an absolute path ** is a drive specification (e.g. "C:"). ** ** [[core URI query parameters]] @@ -2755,13 +2755,13 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); ** **
  • mode: ^(The mode parameter may be set to either "ro", "rw", ** "rwc", or "memory". Attempting to set it to any other value is -** an error)^. -** ^If "ro" is specified, then the database is opened for read-only -** access, just as if the [SQLITE_OPEN_READONLY] flag had been set in the -** third argument to sqlite3_open_v2(). ^If the mode option is set to -** "rw", then the database is opened for read-write (but not create) -** access, as if SQLITE_OPEN_READWRITE (but not SQLITE_OPEN_CREATE) had -** been set. ^Value "rwc" is equivalent to setting both +** an error)^. +** ^If "ro" is specified, then the database is opened for read-only +** access, just as if the [SQLITE_OPEN_READONLY] flag had been set in the +** third argument to sqlite3_open_v2(). ^If the mode option is set to +** "rw", then the database is opened for read-write (but not create) +** access, as if SQLITE_OPEN_READWRITE (but not SQLITE_OPEN_CREATE) had +** been set. ^Value "rwc" is equivalent to setting both ** SQLITE_OPEN_READWRITE and SQLITE_OPEN_CREATE. ^If the mode option is ** set to "memory" then a pure [in-memory database] that never reads ** or writes from disk is used. ^It is an error to specify a value for @@ -2771,7 +2771,7 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); **
  • cache: ^The cache parameter may be set to either "shared" or ** "private". ^Setting it to "shared" is equivalent to setting the ** SQLITE_OPEN_SHAREDCACHE bit in the flags argument passed to -** sqlite3_open_v2(). ^Setting the cache parameter to "private" is +** sqlite3_open_v2(). ^Setting the cache parameter to "private" is ** equivalent to setting the SQLITE_OPEN_PRIVATECACHE bit. ** ^If sqlite3_open_v2() is used and the "cache" parameter is present in ** a URI filename, its value overrides any behavior requested by setting @@ -2787,35 +2787,35 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); ** ** **
    URI filenames Results -**
    file:data.db +**
    file:data.db ** Open the file "data.db" in the current directory. **
    file:/home/fred/data.db
    -** file:///home/fred/data.db
    -** file://localhost/home/fred/data.db
    		+** file:///home/fred/data.db
    +** file://localhost/home/fred/data.db
    		** Open the database file "/home/fred/data.db". -**
    file://darkstar/home/fred/data.db +**
    file://darkstar/home/fred/data.db ** An error. "darkstar" is not a recognized authority. -**
    +**
    ** file:///C:/Documents%20and%20Settings/fred/Desktop/data.db ** Windows only: Open the file "data.db" on fred's desktop on drive -** C:. Note that the %20 escaping in this example is not strictly +** C:. Note that the %20 escaping in this example is not strictly ** necessary - space characters can be used literally ** in URI filenames. -**
    file:data.db?mode=ro&cache=private +**
    file:data.db?mode=ro&cache=private ** Open file "data.db" in the current directory for read-only access. ** Regardless of whether or not shared-cache mode is enabled by ** default, use a private cache. **
    file:/home/fred/data.db?vfs=unix-nolock ** Open file "/home/fred/data.db". Use the special VFS "unix-nolock". -**
    file:data.db?mode=readonly +**
    file:data.db?mode=readonly ** An error. "readonly" is not a valid option for the "mode" parameter. **
    ** ** ^URI hexadecimal escape sequences (%HH) are supported within the path and ** query components of a URI. A hexadecimal escape sequence consists of a -** percent sign - "%" - followed by exactly two hexadecimal digits +** percent sign - "%" - followed by exactly two hexadecimal digits ** specifying an octet value. ^Before the path or query components of a -** URI filename are interpreted, they are encoded using UTF-8 and all +** URI filename are interpreted, they are encoded using UTF-8 and all ** hexadecimal escape sequences replaced by a single byte containing the ** corresponding octet. If this process generates an invalid UTF-8 encoding, ** the results are undefined. @@ -2851,15 +2851,15 @@ SQLITE_API int sqlite3_open_v2( ** CAPI3REF: Obtain Values For URI Parameters ** ** These are utility routines, useful to VFS implementations, that check -** to see if a database file was a URI that contained a specific query +** to see if a database file was a URI that contained a specific query ** parameter, and if so obtains the value of that query parameter. ** -** If F is the database filename pointer passed into the xOpen() method of -** a VFS implementation when the flags parameter to xOpen() has one or +** If F is the database filename pointer passed into the xOpen() method of +** a VFS implementation when the flags parameter to xOpen() has one or ** more of the [SQLITE_OPEN_URI] or [SQLITE_OPEN_MAIN_DB] bits set and ** P is the name of the query parameter, then ** sqlite3_uri_parameter(F,P) returns the value of the P -** parameter if it exists or a NULL pointer if P does not appear as a +** parameter if it exists or a NULL pointer if P does not appear as a ** query parameter on F. If P is a query parameter of F ** has no explicit value, then sqlite3_uri_parameter(F,P) returns ** a pointer to an empty string. @@ -2868,7 +2868,7 @@ SQLITE_API int sqlite3_open_v2( ** parameter and returns true (1) or false (0) according to the value ** of P. The sqlite3_uri_boolean(F,P,B) routine returns true (1) if the ** value of query parameter P is one of "yes", "true", or "on" in any -** case or if the value begins with a non-zero number. The +** case or if the value begins with a non-zero number. The ** sqlite3_uri_boolean(F,P,B) routines returns false (0) if the value of ** query parameter P is one of "no", "false", or "off" in any case or ** if the value begins with a numeric zero. If P is not a query @@ -2879,7 +2879,7 @@ SQLITE_API int sqlite3_open_v2( ** 64-bit signed integer and returns that integer, or D if P does not ** exist. If the value of P is something other than an integer, then ** zero is returned. -** +** ** If F is a NULL pointer, then sqlite3_uri_parameter(F,P) returns NULL and ** sqlite3_uri_boolean(F,P,B) returns B. If F is not a NULL pointer and ** is not a database file pathname pointer that SQLite passed into the xOpen @@ -2899,7 +2899,7 @@ SQLITE_API sqlite3_int64 sqlite3_uri_int64(const char*, const char*, sqlite3_int ** associated with a [database connection]. If a prior API call failed ** but the most recent API call succeeded, the return value from ** sqlite3_errcode() is undefined. ^The sqlite3_extended_errcode() -** interface is the same except that it always returns the +** interface is the same except that it always returns the ** [extended result code] even when extended result codes are ** disabled. ** @@ -2972,7 +2972,7 @@ typedef struct sqlite3_stmt sqlite3_stmt; ** new limit for that construct.)^ ** ** ^If the new limit is a negative number, the limit is unchanged. -** ^(For each limit category SQLITE_LIMIT_NAME there is a +** ^(For each limit category SQLITE_LIMIT_NAME there is a ** [limits | hard upper bound] ** set at compile-time by a C preprocessor macro called ** [limits | SQLITE_MAX_NAME]. @@ -2980,7 +2980,7 @@ typedef struct sqlite3_stmt sqlite3_stmt; ** ^Attempts to increase a limit above its hard upper bound are ** silently truncated to the hard upper bound. ** -** ^Regardless of whether or not the limit was changed, the +** ^Regardless of whether or not the limit was changed, the ** [sqlite3_limit()] interface returns the prior value of the limit. ** ^Hence, to find the current value of a limit without changing it, ** simply invoke this interface with the third parameter set to -1. @@ -3135,12 +3135,12 @@ SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal); **
    • ** **
  • -** ^If the specific value bound to [parameter | host parameter] in the +** ^If the specific value bound to [parameter | host parameter] in the ** WHERE clause might influence the choice of query plan for a statement, -** then the statement will be automatically recompiled, as if there had been +** then the statement will be automatically recompiled, as if there had been ** a schema change, on the first [sqlite3_step()] call following any change -** to the [sqlite3_bind_text | bindings] of that [parameter]. -** ^The specific value of WHERE-clause [parameter] might influence the +** to the [sqlite3_bind_text | bindings] of that [parameter]. +** ^The specific value of WHERE-clause [parameter] might influence the ** choice of query plan if the parameter is the left-hand side of a [LIKE] ** or [GLOB] operator or if the parameter is compared to an indexed column ** and the [SQLITE_ENABLE_STAT3] compile-time option is enabled. @@ -3193,8 +3193,8 @@ SQLITE_API const char *sqlite3_sql(sqlite3_stmt *pStmt); ** the content of the database file. ** ** Note that [application-defined SQL functions] or -** [virtual tables] might change the database indirectly as a side effect. -** ^(For example, if an application defines a function "eval()" that +** [virtual tables] might change the database indirectly as a side effect. +** ^(For example, if an application defines a function "eval()" that ** calls [sqlite3_exec()], then the following SQL statement would ** change the database file through side-effects: ** @@ -3208,10 +3208,10 @@ SQLITE_API const char *sqlite3_sql(sqlite3_stmt *pStmt); ** ^Transaction control statements such as [BEGIN], [COMMIT], [ROLLBACK], ** [SAVEPOINT], and [RELEASE] cause sqlite3_stmt_readonly() to return true, ** since the statements themselves do not actually modify the database but -** rather they control the timing of when other statements modify the +** rather they control the timing of when other statements modify the ** database. ^The [ATTACH] and [DETACH] statements also cause ** sqlite3_stmt_readonly() to return true since, while those statements -** change the configuration of a database connection, they do not make +** change the configuration of a database connection, they do not make ** changes to the content of the database files on disk. */ SQLITE_API int sqlite3_stmt_readonly(sqlite3_stmt *pStmt); @@ -3220,17 +3220,17 @@ SQLITE_API int sqlite3_stmt_readonly(sqlite3_stmt *pStmt); ** CAPI3REF: Determine If A Prepared Statement Has Been Reset ** ** ^The sqlite3_stmt_busy(S) interface returns true (non-zero) if the -** [prepared statement] S has been stepped at least once using -** [sqlite3_step(S)] but has not run to completion and/or has not +** [prepared statement] S has been stepped at least once using +** [sqlite3_step(S)] but has not run to completion and/or has not ** been reset using [sqlite3_reset(S)]. ^The sqlite3_stmt_busy(S) -** interface returns false if S is a NULL pointer. If S is not a +** interface returns false if S is a NULL pointer. If S is not a ** NULL pointer and is not a pointer to a valid [prepared statement] ** object, then the behavior is undefined and probably undesirable. ** ** This interface can be used in combination [sqlite3_next_stmt()] -** to locate all prepared statements associated with a database +** to locate all prepared statements associated with a database ** connection that are in need of being reset. This can be used, -** for example, in diagnostic routines to search for prepared +** for example, in diagnostic routines to search for prepared ** statements that are holding a transaction open. */ SQLITE_API int sqlite3_stmt_busy(sqlite3_stmt*); @@ -3255,7 +3255,7 @@ SQLITE_API int sqlite3_stmt_busy(sqlite3_stmt*); ** sqlite3_value object but no mutex is held for an unprotected ** sqlite3_value object. If SQLite is compiled to be single-threaded ** (with [SQLITE_THREADSAFE=0] and with [sqlite3_threadsafe()] returning 0) -** or if SQLite is run in one of reduced mutex modes +** or if SQLite is run in one of reduced mutex modes ** [SQLITE_CONFIG_SINGLETHREAD] or [SQLITE_CONFIG_MULTITHREAD] ** then there is no distinction between protected and unprotected ** sqlite3_value objects and they can be used interchangeably. However, @@ -3340,7 +3340,7 @@ typedef struct sqlite3_context sqlite3_context; ** If a non-negative fourth parameter is provided to sqlite3_bind_text() ** or sqlite3_bind_text16() then that parameter must be the byte offset ** where the NUL terminator would occur assuming the string were NUL -** terminated. If any NUL characters occur at byte offsets less than +** terminated. If any NUL characters occur at byte offsets less than ** the value of the fourth parameter then the resulting string value will ** contain embedded NULs. The result of expressions involving strings ** with embedded NULs is undefined. @@ -3349,7 +3349,7 @@ typedef struct sqlite3_context sqlite3_context; ** sqlite3_bind_text16() is a destructor used to dispose of the BLOB or ** string after SQLite has finished with it. ^The destructor is called ** to dispose of the BLOB or string even if the call to sqlite3_bind_blob(), -** sqlite3_bind_text(), or sqlite3_bind_text16() fails. +** sqlite3_bind_text(), or sqlite3_bind_text16() fails. ** ^If the fifth argument is ** the special value [SQLITE_STATIC], then SQLite assumes that the ** information is in static, unmanaged space and does not need to be freed. @@ -3645,7 +3645,7 @@ SQLITE_API const void *sqlite3_column_decltype16(sqlite3_stmt*,int); ** For all versions of SQLite up to and including 3.6.23.1, a call to ** [sqlite3_reset()] was required after sqlite3_step() returned anything ** other than [SQLITE_ROW] before any subsequent invocation of -** sqlite3_step(). Failure to reset the prepared statement using +** sqlite3_step(). Failure to reset the prepared statement using ** [sqlite3_reset()] would result in an [SQLITE_MISUSE] return from ** sqlite3_step(). But after version 3.6.23.1, sqlite3_step() began ** calling [sqlite3_reset()] automatically in this circumstance rather @@ -3775,7 +3775,7 @@ SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt); ** the number of bytes in that string. ** ^If the result is NULL, then sqlite3_column_bytes16() returns zero. ** -** ^The values returned by [sqlite3_column_bytes()] and +** ^The values returned by [sqlite3_column_bytes()] and ** [sqlite3_column_bytes16()] do not include the zero terminators at the end ** of the string. ^For clarity: the values returned by ** [sqlite3_column_bytes()] and [sqlite3_column_bytes16()] are the number of @@ -3968,7 +3968,7 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt); ** ^The second parameter is the name of the SQL function to be created or ** redefined. ^The length of the name is limited to 255 bytes in a UTF-8 ** representation, exclusive of the zero-terminator. ^Note that the name -** length limit is in UTF-8 bytes, not characters nor UTF-16 bytes. +** length limit is in UTF-8 bytes, not characters nor UTF-16 bytes. ** ^Any attempt to create a function with a longer name ** will result in [SQLITE_MISUSE] being returned. ** @@ -3983,7 +3983,7 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt); ** ^The fourth parameter, eTextRep, specifies what ** [SQLITE_UTF8 | text encoding] this SQL function prefers for ** its parameters. The application should set this parameter to -** [SQLITE_UTF16LE] if the function implementation invokes +** [SQLITE_UTF16LE] if the function implementation invokes ** [sqlite3_value_text16le()] on an input, or [SQLITE_UTF16BE] if the ** implementation invokes [sqlite3_value_text16be()] on an input, or ** [SQLITE_UTF16] if [sqlite3_value_text16()] is used, or [SQLITE_UTF8] @@ -4014,13 +4014,13 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt); ** callbacks. ** ** ^(If the ninth parameter to sqlite3_create_function_v2() is not NULL, -** then it is destructor for the application data pointer. +** then it is destructor for the application data pointer. ** The destructor is invoked when the function is deleted, either by being ** overloaded or when the database connection closes.)^ ** ^The destructor is also invoked if the call to ** sqlite3_create_function_v2() fails. ** ^When the destructor callback of the tenth parameter is invoked, it -** is passed a single argument which is a copy of the application data +** is passed a single argument which is a copy of the application data ** pointer which was the fifth parameter to sqlite3_create_function_v2(). ** ** ^It is permitted to register multiple implementations of the same @@ -4031,7 +4031,7 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt); ** nArg parameter is a better match than a function implementation with ** a negative nArg. ^A function where the preferred text encoding ** matches the database encoding is a better -** match than a function where the encoding is different. +** match than a function where the encoding is different. ** ^A function where the encoding difference is between UTF16le and UTF16be ** is a closer match than a function where the encoding difference is ** between UTF8 and UTF16. @@ -4091,7 +4091,7 @@ SQLITE_API int sqlite3_create_function_v2( /* ** CAPI3REF: Function Flags ** -** These constants may be ORed together with the +** These constants may be ORed together with the ** [SQLITE_UTF8 | preferred text encoding] as the fourth argument ** to [sqlite3_create_function()], [sqlite3_create_function16()], or ** [sqlite3_create_function_v2()]. @@ -4103,7 +4103,7 @@ SQLITE_API int sqlite3_create_function_v2( ** DEPRECATED ** ** These functions are [deprecated]. In order to maintain -** backwards compatibility with older code, these functions continue +** backwards compatibility with older code, these functions continue ** to be supported. However, new applications should avoid ** the use of these functions. To help encourage people to avoid ** using these functions, we are not going to tell you what they do. @@ -4182,7 +4182,7 @@ SQLITE_API int sqlite3_value_numeric_type(sqlite3_value*); ** Implementations of aggregate SQL functions use this ** routine to allocate memory for storing their state. ** -** ^The first time the sqlite3_aggregate_context(C,N) routine is called +** ^The first time the sqlite3_aggregate_context(C,N) routine is called ** for a particular aggregate function, SQLite ** allocates N of memory, zeroes out that memory, and returns a pointer ** to the new memory. ^On second and subsequent calls to @@ -4195,7 +4195,7 @@ SQLITE_API int sqlite3_value_numeric_type(sqlite3_value*); ** In those cases, sqlite3_aggregate_context() might be called for the ** first time from within xFinal().)^ ** -** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer +** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer ** when first called if N is less than or equal to zero or if a memory ** allocate error occurs. ** @@ -4204,10 +4204,10 @@ SQLITE_API int sqlite3_value_numeric_type(sqlite3_value*); ** value of N in subsequent call to sqlite3_aggregate_context() within ** the same aggregate function instance will not resize the memory ** allocation.)^ Within the xFinal callback, it is customary to set -** N=0 in calls to sqlite3_aggregate_context(C,N) so that no +** N=0 in calls to sqlite3_aggregate_context(C,N) so that no ** pointless memory allocations occur. ** -** ^SQLite automatically frees the memory allocated by +** ^SQLite automatically frees the memory allocated by ** sqlite3_aggregate_context() when the aggregate query concludes. ** ** The first parameter must be a copy of the @@ -4254,7 +4254,7 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*); ** some circumstances the associated metadata may be preserved. An example ** of where this might be useful is in a regular-expression matching ** function. The compiled version of the regular expression can be stored as -** metadata associated with the pattern string. +** metadata associated with the pattern string. ** Then as long as the pattern string remains the same, ** the compiled regular expression can be reused on multiple ** invocations of the same function. @@ -4278,10 +4278,10 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*); **
  • when [sqlite3_reset()] or [sqlite3_finalize()] is called for the ** SQL statement, or **
  • when sqlite3_set_auxdata() is invoked again on the same parameter, or -**
  • during the original sqlite3_set_auxdata() call when a memory +**
  • during the original sqlite3_set_auxdata() call when a memory ** allocation error occurs. )^ ** -** Note the last bullet in particular. The destructor X in +** Note the last bullet in particular. The destructor X in ** sqlite3_set_auxdata(C,N,P,X) might be called immediately, before the ** sqlite3_set_auxdata() interface even returns. Hence sqlite3_set_auxdata() ** should be called near the end of the function implementation and the @@ -4482,7 +4482,7 @@ SQLITE_API void sqlite3_result_zeroblob(sqlite3_context*, int n); ** deleted. ^When all collating functions having the same name are deleted, ** that collation is no longer usable. ** -** ^The collating function callback is invoked with a copy of the pArg +** ^The collating function callback is invoked with a copy of the pArg ** application data pointer and with two strings in the encoding specified ** by the eTextRep argument. The collating function must return an ** integer that is negative, zero, or positive @@ -4512,36 +4512,36 @@ SQLITE_API void sqlite3_result_zeroblob(sqlite3_context*, int n); ** calls to the collation creation functions or when the ** [database connection] is closed using [sqlite3_close()]. ** -** ^The xDestroy callback is not called if the +** ^The xDestroy callback is not called if the ** sqlite3_create_collation_v2() function fails. Applications that invoke -** sqlite3_create_collation_v2() with a non-NULL xDestroy argument should +** sqlite3_create_collation_v2() with a non-NULL xDestroy argument should ** check the return code and dispose of the application data pointer ** themselves rather than expecting SQLite to deal with it for them. -** This is different from every other SQLite interface. The inconsistency -** is unfortunate but cannot be changed without breaking backwards +** This is different from every other SQLite interface. The inconsistency +** is unfortunate but cannot be changed without breaking backwards ** compatibility. ** ** See also: [sqlite3_collation_needed()] and [sqlite3_collation_needed16()]. */ SQLITE_API int sqlite3_create_collation( - sqlite3*, - const char *zName, - int eTextRep, + sqlite3*, + const char *zName, + int eTextRep, void *pArg, int(*xCompare)(void*,int,const void*,int,const void*) ); SQLITE_API int sqlite3_create_collation_v2( - sqlite3*, - const char *zName, - int eTextRep, + sqlite3*, + const char *zName, + int eTextRep, void *pArg, int(*xCompare)(void*,int,const void*,int,const void*), void(*xDestroy)(void*) ); SQLITE_API int sqlite3_create_collation16( - sqlite3*, + sqlite3*, const void *zName, - int eTextRep, + int eTextRep, void *pArg, int(*xCompare)(void*,int,const void*,int,const void*) ); @@ -4573,12 +4573,12 @@ SQLITE_API int sqlite3_create_collation16( ** [sqlite3_create_collation_v2()]. */ SQLITE_API int sqlite3_collation_needed( - sqlite3*, - void*, + sqlite3*, + void*, void(*)(void*,sqlite3*,int eTextRep,const char*) ); SQLITE_API int sqlite3_collation_needed16( - sqlite3*, + sqlite3*, void*, void(*)(void*,sqlite3*,int eTextRep,const void*) ); @@ -4620,7 +4620,7 @@ SQLITE_API int sqlite3_rekey_v2( ); /* -** Specify the activation key for a SEE database. Unless +** Specify the activation key for a SEE database. Unless ** activated, none of the SEE routines will work. */ SQLITE_API void sqlite3_activate_see( @@ -4630,7 +4630,7 @@ SQLITE_API void sqlite3_activate_see( #ifdef SQLITE_ENABLE_CEROD /* -** Specify the activation key for a CEROD database. Unless +** Specify the activation key for a CEROD database. Unless ** activated, none of the CEROD routines will work. */ SQLITE_API void sqlite3_activate_cerod( @@ -4679,7 +4679,7 @@ SQLITE_API int sqlite3_sleep(int); ** ^The [temp_store_directory pragma] may modify this variable and cause ** it to point to memory obtained from [sqlite3_malloc]. ^Furthermore, ** the [temp_store_directory pragma] always assumes that any string -** that this variable points to is held in memory obtained from +** that this variable points to is held in memory obtained from ** [sqlite3_malloc] and the pragma may attempt to free that memory ** using [sqlite3_free]. ** Hence, if this variable is modified directly, either it should be @@ -4731,7 +4731,7 @@ SQLITE_API SQLITE_EXTERN char *sqlite3_temp_directory; ** ^The [data_store_directory pragma] may modify this variable and cause ** it to point to memory obtained from [sqlite3_malloc]. ^Furthermore, ** the [data_store_directory pragma] always assumes that any string -** that this variable points to is held in memory obtained from +** that this variable points to is held in memory obtained from ** [sqlite3_malloc] and the pragma may attempt to free that memory ** using [sqlite3_free]. ** Hence, if this variable is modified directly, either it should be @@ -4913,7 +4913,7 @@ SQLITE_API void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*); ** interfaces. */ SQLITE_API void *sqlite3_update_hook( - sqlite3*, + sqlite3*, void(*)(void *,int ,char const *,char const *,sqlite3_int64), void* ); @@ -4988,7 +4988,7 @@ SQLITE_API int sqlite3_db_release_memory(sqlite3*); ** as heap memory usages approaches the limit. ** ^The soft heap limit is "soft" because even though SQLite strives to stay ** below the limit, it will exceed the limit rather than generate -** an [SQLITE_NOMEM] error. In other words, the soft heap limit +** an [SQLITE_NOMEM] error. In other words, the soft heap limit ** is advisory only. ** ** ^The return value from sqlite3_soft_heap_limit64() is the size of @@ -5216,7 +5216,7 @@ SQLITE_API int sqlite3_auto_extension(void (*xEntryPoint)(void)); ** ^The [sqlite3_cancel_auto_extension(X)] interface unregisters the ** initialization routine X that was registered using a prior call to ** [sqlite3_auto_extension(X)]. ^The [sqlite3_cancel_auto_extension(X)] -** routine returns 1 if initialization routine X was successfully +** routine returns 1 if initialization routine X was successfully ** unregistered and it returns 0 if X was not on the list of initialization ** routines. */ @@ -5251,8 +5251,8 @@ typedef struct sqlite3_module sqlite3_module; ** CAPI3REF: Virtual Table Object ** KEYWORDS: sqlite3_module {virtual table module} ** -** This structure, sometimes called a "virtual table module", -** defines the implementation of a [virtual tables]. +** This structure, sometimes called a "virtual table module", +** defines the implementation of a [virtual tables]. ** This structure consists mostly of methods for the module. ** ** ^A virtual table module is created by filling in a persistent @@ -5291,7 +5291,7 @@ struct sqlite3_module { void (**pxFunc)(sqlite3_context*,int,sqlite3_value**), void **ppArg); int (*xRename)(sqlite3_vtab *pVtab, const char *zNew); - /* The methods above are in version 1 of the sqlite_module object. Those + /* The methods above are in version 1 of the sqlite_module object. Those ** below are for version 2 and greater. */ int (*xSavepoint)(sqlite3_vtab *pVTab, int); int (*xRelease)(sqlite3_vtab *pVTab, int); @@ -5348,7 +5348,7 @@ struct sqlite3_module { ** ** ^The estimatedCost value is an estimate of the cost of a particular ** strategy. A cost of N indicates that the cost of the strategy is similar -** to a linear scan of an SQLite table with N rows. A cost of log(N) +** to a linear scan of an SQLite table with N rows. A cost of log(N) ** indicates that the expense of the operation is similar to that of a ** binary search on a unique indexed field of an SQLite table with N rows. ** @@ -5357,8 +5357,8 @@ struct sqlite3_module { ** ** IMPORTANT: The estimatedRows field was added to the sqlite3_index_info ** structure for SQLite version 3.8.2. If a virtual table extension is -** used with an SQLite version earlier than 3.8.2, the results of attempting -** to read or write the estimatedRows field are undefined (but are likely +** used with an SQLite version earlier than 3.8.2, the results of attempting +** to read or write the estimatedRows field are undefined (but are likely ** to included crashing the application). The estimatedRows field should ** therefore only be used if [sqlite3_libversion_number()] returns a ** value greater than or equal to 3008002. @@ -5415,7 +5415,7 @@ struct sqlite3_index_info { ** preexisting [virtual table] for the module. ** ** ^The module name is registered on the [database connection] specified -** by the first parameter. ^The name of the module is given by the +** by the first parameter. ^The name of the module is given by the ** second parameter. ^The third parameter is a pointer to ** the implementation of the [virtual table module]. ^The fourth ** parameter is an arbitrary client data pointer that is passed through @@ -5506,7 +5506,7 @@ SQLITE_API int sqlite3_declare_vtab(sqlite3*, const char *zSQL); ** CAPI3REF: Overload A Function For A Virtual Table ** ** ^(Virtual tables can provide alternative implementations of functions -** using the [xFindFunction] method of the [virtual table module]. +** using the [xFindFunction] method of the [virtual table module]. ** But global versions of those functions ** must exist in order to be overloaded.)^ ** @@ -5557,8 +5557,8 @@ typedef struct sqlite3_blob sqlite3_blob; ** ** ^If the flags parameter is non-zero, then the BLOB is opened for read ** and write access. ^If it is zero, the BLOB is opened for read access. -** ^It is not possible to open a column that is part of an index or primary -** key for writing. ^If [foreign key constraints] are enabled, it is +** ^It is not possible to open a column that is part of an index or primary +** key for writing. ^If [foreign key constraints] are enabled, it is ** not possible to open a column that is part of a [child key] for writing. ** ** ^Note that the database name is not the filename that contains @@ -5664,7 +5664,7 @@ SQLITE_API int sqlite3_blob_close(sqlite3_blob *); /* ** CAPI3REF: Return The Size Of An Open BLOB ** -** ^Returns the size in bytes of the BLOB accessible via the +** ^Returns the size in bytes of the BLOB accessible via the ** successfully opened [BLOB handle] in its only argument. ^The ** incremental blob I/O routines can only read or overwriting existing ** blob content; they cannot change the size of a blob. @@ -6030,7 +6030,7 @@ SQLITE_API int sqlite3_mutex_notheld(sqlite3_mutex*); /* ** CAPI3REF: Retrieve the mutex for a database connection ** -** ^This interface returns a pointer the [sqlite3_mutex] object that +** ^This interface returns a pointer the [sqlite3_mutex] object that ** serializes access to the [database connection] given in the argument ** when the [threading mode] is Serialized. ** ^If the [threading mode] is Single-thread or Multi-thread then this @@ -6175,7 +6175,7 @@ SQLITE_API int sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetF **
    This parameter records the largest memory allocation request ** handed to [sqlite3_malloc()] or [sqlite3_realloc()] (or their ** internal equivalents). Only the value returned in the -** *pHighwater parameter to [sqlite3_status()] is of interest. +** *pHighwater parameter to [sqlite3_status()] is of interest. ** The value written into the *pCurrent parameter is undefined.
    )^ ** ** [[SQLITE_STATUS_MALLOC_COUNT]] ^(
    SQLITE_STATUS_MALLOC_COUNT
    @@ -6184,11 +6184,11 @@ SQLITE_API int sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetF ** ** [[SQLITE_STATUS_PAGECACHE_USED]] ^(
    SQLITE_STATUS_PAGECACHE_USED
    **
    This parameter returns the number of pages used out of the -** [pagecache memory allocator] that was configured using +** [pagecache memory allocator] that was configured using ** [SQLITE_CONFIG_PAGECACHE]. The ** value returned is in pages, not in bytes.
    )^ ** -** [[SQLITE_STATUS_PAGECACHE_OVERFLOW]] +** [[SQLITE_STATUS_PAGECACHE_OVERFLOW]] ** ^(
    SQLITE_STATUS_PAGECACHE_OVERFLOW
    **
    This parameter returns the number of bytes of page cache ** allocation which could not be satisfied by the [SQLITE_CONFIG_PAGECACHE] @@ -6201,7 +6201,7 @@ SQLITE_API int sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetF ** [[SQLITE_STATUS_PAGECACHE_SIZE]] ^(
    SQLITE_STATUS_PAGECACHE_SIZE
    **
    This parameter records the largest memory allocation request ** handed to [pagecache memory allocator]. Only the value returned in the -** *pHighwater parameter to [sqlite3_status()] is of interest. +** *pHighwater parameter to [sqlite3_status()] is of interest. ** The value written into the *pCurrent parameter is undefined.
    )^ ** ** [[SQLITE_STATUS_SCRATCH_USED]] ^(
    SQLITE_STATUS_SCRATCH_USED
    @@ -6225,7 +6225,7 @@ SQLITE_API int sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetF ** [[SQLITE_STATUS_SCRATCH_SIZE]] ^(
    SQLITE_STATUS_SCRATCH_SIZE
    **
    This parameter records the largest memory allocation request ** handed to [scratch memory allocator]. Only the value returned in the -** *pHighwater parameter to [sqlite3_status()] is of interest. +** *pHighwater parameter to [sqlite3_status()] is of interest. ** The value written into the *pCurrent parameter is undefined.
    )^ ** ** [[SQLITE_STATUS_PARSER_STACK]] ^(
    SQLITE_STATUS_PARSER_STACK
    @@ -6249,12 +6249,12 @@ SQLITE_API int sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetF /* ** CAPI3REF: Database Connection Status ** -** ^This interface is used to retrieve runtime status information +** ^This interface is used to retrieve runtime status information ** about a single [database connection]. ^The first argument is the ** database connection object to be interrogated. ^The second argument ** is an integer constant, taken from the set of ** [SQLITE_DBSTATUS options], that -** determines the parameter to interrogate. The set of +** determines the parameter to interrogate. The set of ** [SQLITE_DBSTATUS options] is likely ** to grow in future releases of SQLite. ** @@ -6289,7 +6289,7 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r ** checked out.
    • )^ ** ** [[SQLITE_DBSTATUS_LOOKASIDE_HIT]] ^(
    SQLITE_DBSTATUS_LOOKASIDE_HIT
    -**
    This parameter returns the number malloc attempts that were +**
    This parameter returns the number malloc attempts that were ** satisfied using lookaside memory. Only the high-water value is meaningful; ** the current value is always zero.)^ ** @@ -6317,7 +6317,7 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r ** [[SQLITE_DBSTATUS_SCHEMA_USED]] ^(
    SQLITE_DBSTATUS_SCHEMA_USED
    **
    This parameter returns the approximate number of of bytes of heap ** memory used to store the schema for all databases associated -** with the connection - main, temp, and any [ATTACH]-ed databases.)^ +** with the connection - main, temp, and any [ATTACH]-ed databases.)^ ** ^The full amount of memory used by the schemas is reported, even if the ** schema memory is shared with other database connections due to ** [shared cache mode] being enabled. @@ -6332,13 +6332,13 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r ** ** [[SQLITE_DBSTATUS_CACHE_HIT]] ^(
    SQLITE_DBSTATUS_CACHE_HIT
    **
    This parameter returns the number of pager cache hits that have -** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_HIT +** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_HIT ** is always 0. **
    ** ** [[SQLITE_DBSTATUS_CACHE_MISS]] ^(
    SQLITE_DBSTATUS_CACHE_MISS
    **
    This parameter returns the number of pager cache misses that have -** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_MISS +** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_MISS ** is always 0. **
    ** @@ -6384,7 +6384,7 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r ** statements. For example, if the number of table steps greatly exceeds ** the number of table searches or result rows, that would tend to indicate ** that the prepared statement is using a full table scan rather than -** an index. +** an index. ** ** ^(This interface is used to retrieve and reset counter values from ** a [prepared statement]. The first argument is the prepared statement @@ -6411,7 +6411,7 @@ SQLITE_API int sqlite3_stmt_status(sqlite3_stmt*, int op,int resetFlg); ** [[SQLITE_STMTSTATUS_FULLSCAN_STEP]]
    SQLITE_STMTSTATUS_FULLSCAN_STEP
    **
    ^This is the number of times that SQLite has stepped forward in ** a table as part of a full table scan. Large numbers for this counter -** may indicate opportunities for performance improvement through +** may indicate opportunities for performance improvement through ** careful use of indices.
    ** ** [[SQLITE_STMTSTATUS_SORT]]
    SQLITE_STMTSTATUS_SORT
    @@ -6429,7 +6429,7 @@ SQLITE_API int sqlite3_stmt_status(sqlite3_stmt*, int op,int resetFlg); ** [[SQLITE_STMTSTATUS_VM_STEP]]
    SQLITE_STMTSTATUS_VM_STEP
    **
    ^This is the number of virtual machine operations executed ** by the prepared statement if that number is less than or equal -** to 2147483647. The number of virtual machine operations can be +** to 2147483647. The number of virtual machine operations can be ** used as a proxy for the total work done by the prepared statement. ** If the number of virtual machine operations exceeds 2147483647 ** then the value returned by this statement status code is undefined. @@ -6475,15 +6475,15 @@ struct sqlite3_pcache_page { ** KEYWORDS: {page cache} ** ** ^(The [sqlite3_config]([SQLITE_CONFIG_PCACHE2], ...) interface can -** register an alternative page cache implementation by passing in an +** register an alternative page cache implementation by passing in an ** instance of the sqlite3_pcache_methods2 structure.)^ -** In many applications, most of the heap memory allocated by +** In many applications, most of the heap memory allocated by ** SQLite is used for the page cache. -** By implementing a +** By implementing a ** custom page cache using this API, an application can better control -** the amount of memory consumed by SQLite, the way in which -** that memory is allocated and released, and the policies used to -** determine exactly which parts of a database file are cached and for +** the amount of memory consumed by SQLite, the way in which +** that memory is allocated and released, and the policies used to +** determine exactly which parts of a database file are cached and for ** how long. ** ** The alternative page cache mechanism is an @@ -6496,19 +6496,19 @@ struct sqlite3_pcache_page { ** [sqlite3_config()] returns.)^ ** ** [[the xInit() page cache method]] -** ^(The xInit() method is called once for each effective +** ^(The xInit() method is called once for each effective ** call to [sqlite3_initialize()])^ ** (usually only once during the lifetime of the process). ^(The xInit() ** method is passed a copy of the sqlite3_pcache_methods2.pArg value.)^ -** The intent of the xInit() method is to set up global data structures -** required by the custom page cache implementation. -** ^(If the xInit() method is NULL, then the +** The intent of the xInit() method is to set up global data structures +** required by the custom page cache implementation. +** ^(If the xInit() method is NULL, then the ** built-in default page cache is used instead of the application defined ** page cache.)^ ** ** [[the xShutdown() page cache method]] ** ^The xShutdown() method is called by [sqlite3_shutdown()]. -** It can be used to clean up +** It can be used to clean up ** any outstanding resources before process shutdown, if required. ** ^The xShutdown() method may be NULL. ** @@ -6527,7 +6527,7 @@ struct sqlite3_pcache_page { ** though this is not guaranteed. ^The ** first parameter, szPage, is the size in bytes of the pages that must ** be allocated by the cache. ^szPage will always a power of two. ^The -** second parameter szExtra is a number of bytes of extra storage +** second parameter szExtra is a number of bytes of extra storage ** associated with each page cache entry. ^The szExtra parameter will ** a number less than 250. SQLite will use the ** extra szExtra bytes on each page to store metadata about the underlying @@ -6540,7 +6540,7 @@ struct sqlite3_pcache_page { ** it is purely advisory. ^On a cache where bPurgeable is false, SQLite will ** never invoke xUnpin() except to deliberately delete a page. ** ^In other words, calls to xUnpin() on a cache with bPurgeable set to -** false will always have the "discard" flag set to true. +** false will always have the "discard" flag set to true. ** ^Hence, a cache created with bPurgeable false will ** never contain any unpinned pages. ** @@ -6555,12 +6555,12 @@ struct sqlite3_pcache_page { ** [[the xPagecount() page cache methods]] ** The xPagecount() method must return the number of pages currently ** stored in the cache, both pinned and unpinned. -** +** ** [[the xFetch() page cache methods]] -** The xFetch() method locates a page in the cache and returns a pointer to +** The xFetch() method locates a page in the cache and returns a pointer to ** an sqlite3_pcache_page object associated with that page, or a NULL pointer. ** The pBuf element of the returned sqlite3_pcache_page object will be a -** pointer to a buffer of szPage bytes used to store the content of a +** pointer to a buffer of szPage bytes used to store the content of a ** single database page. The pExtra element of sqlite3_pcache_page will be ** a pointer to the szExtra bytes of extra storage that SQLite has requested ** for each entry in the page cache. @@ -6599,8 +6599,8 @@ struct sqlite3_pcache_page { ** page cache implementation. ^The page cache implementation ** may choose to evict unpinned pages at any time. ** -** The cache must not perform any reference counting. A single -** call to xUnpin() unpins the page regardless of the number of prior calls +** The cache must not perform any reference counting. A single +** call to xUnpin() unpins the page regardless of the number of prior calls ** to xFetch(). ** ** [[the xRekey() page cache methods]] @@ -6640,7 +6640,7 @@ struct sqlite3_pcache_methods2 { int (*xPagecount)(sqlite3_pcache*); sqlite3_pcache_page *(*xFetch)(sqlite3_pcache*, unsigned key, int createFlag); void (*xUnpin)(sqlite3_pcache*, sqlite3_pcache_page*, int discard); - void (*xRekey)(sqlite3_pcache*, sqlite3_pcache_page*, + void (*xRekey)(sqlite3_pcache*, sqlite3_pcache_page*, unsigned oldKey, unsigned newKey); void (*xTruncate)(sqlite3_pcache*, unsigned iLimit); void (*xDestroy)(sqlite3_pcache*); @@ -6685,7 +6685,7 @@ typedef struct sqlite3_backup sqlite3_backup; ** ** The backup API copies the content of one database into another. ** It is useful either for creating backups of databases or -** for copying in-memory databases to or from persistent files. +** for copying in-memory databases to or from persistent files. ** ** See Also: [Using the SQLite Online Backup API] ** @@ -6696,28 +6696,28 @@ typedef struct sqlite3_backup sqlite3_backup; ** ^Thus, the backup may be performed on a live source database without ** preventing other database connections from ** reading or writing to the source database while the backup is underway. -** -** ^(To perform a backup operation: +** +** ^(To perform a backup operation: **
      **
    1. sqlite3_backup_init() is called once to initialize the -** backup, -**
    2. sqlite3_backup_step() is called one or more times to transfer +** backup, +**
    3. sqlite3_backup_step() is called one or more times to transfer ** the data between the two databases, and finally -**
    4. sqlite3_backup_finish() is called to release all resources -** associated with the backup operation. +**
    5. sqlite3_backup_finish() is called to release all resources +** associated with the backup operation. **
    )^ ** There should be exactly one call to sqlite3_backup_finish() for each ** successful call to sqlite3_backup_init(). ** ** [[sqlite3_backup_init()]] sqlite3_backup_init() ** -** ^The D and N arguments to sqlite3_backup_init(D,N,S,M) are the -** [database connection] associated with the destination database +** ^The D and N arguments to sqlite3_backup_init(D,N,S,M) are the +** [database connection] associated with the destination database ** and the database name, respectively. ** ^The database name is "main" for the main database, "temp" for the ** temporary database, or the name specified after the AS keyword in ** an [ATTACH] statement for an attached database. -** ^The S and M arguments passed to +** ^The S and M arguments passed to ** sqlite3_backup_init(D,N,S,M) identify the [database connection] ** and database name of the source database, respectively. ** ^The source and destination [database connections] (parameters S and D) @@ -6733,14 +6733,14 @@ typedef struct sqlite3_backup sqlite3_backup; ** ^A successful call to sqlite3_backup_init() returns a pointer to an ** [sqlite3_backup] object. ** ^The [sqlite3_backup] object may be used with the sqlite3_backup_step() and -** sqlite3_backup_finish() functions to perform the specified backup +** sqlite3_backup_finish() functions to perform the specified backup ** operation. ** ** [[sqlite3_backup_step()]] sqlite3_backup_step() ** -** ^Function sqlite3_backup_step(B,N) will copy up to N pages between +** ^Function sqlite3_backup_step(B,N) will copy up to N pages between ** the source and destination databases specified by [sqlite3_backup] object B. -** ^If N is negative, all remaining source pages are copied. +** ^If N is negative, all remaining source pages are copied. ** ^If sqlite3_backup_step(B,N) successfully copies N pages and there ** are still more pages to be copied, then the function returns [SQLITE_OK]. ** ^If sqlite3_backup_step(B,N) successfully finishes copying all pages @@ -6762,8 +6762,8 @@ typedef struct sqlite3_backup sqlite3_backup; ** ** ^If sqlite3_backup_step() cannot obtain a required file-system lock, then ** the [sqlite3_busy_handler | busy-handler function] -** is invoked (if one is specified). ^If the -** busy-handler returns non-zero before the lock is available, then +** is invoked (if one is specified). ^If the +** busy-handler returns non-zero before the lock is available, then ** [SQLITE_BUSY] is returned to the caller. ^In this case the call to ** sqlite3_backup_step() can be retried later. ^If the source ** [database connection] @@ -6771,15 +6771,15 @@ typedef struct sqlite3_backup sqlite3_backup; ** is called, then [SQLITE_LOCKED] is returned immediately. ^Again, in this ** case the call to sqlite3_backup_step() can be retried later on. ^(If ** [SQLITE_IOERR_ACCESS | SQLITE_IOERR_XXX], [SQLITE_NOMEM], or -** [SQLITE_READONLY] is returned, then -** there is no point in retrying the call to sqlite3_backup_step(). These -** errors are considered fatal.)^ The application must accept -** that the backup operation has failed and pass the backup operation handle +** [SQLITE_READONLY] is returned, then +** there is no point in retrying the call to sqlite3_backup_step(). These +** errors are considered fatal.)^ The application must accept +** that the backup operation has failed and pass the backup operation handle ** to the sqlite3_backup_finish() to release associated resources. ** ** ^The first call to sqlite3_backup_step() obtains an exclusive lock -** on the destination file. ^The exclusive lock is not released until either -** sqlite3_backup_finish() is called or the backup operation is complete +** on the destination file. ^The exclusive lock is not released until either +** sqlite3_backup_finish() is called or the backup operation is complete ** and sqlite3_backup_step() returns [SQLITE_DONE]. ^Every call to ** sqlite3_backup_step() obtains a [shared lock] on the source database that ** lasts for the duration of the sqlite3_backup_step() call. @@ -6788,18 +6788,18 @@ typedef struct sqlite3_backup sqlite3_backup; ** through the backup process. ^If the source database is modified by an ** external process or via a database connection other than the one being ** used by the backup operation, then the backup will be automatically -** restarted by the next call to sqlite3_backup_step(). ^If the source +** restarted by the next call to sqlite3_backup_step(). ^If the source ** database is modified by the using the same database connection as is used ** by the backup operation, then the backup database is automatically ** updated at the same time. ** ** [[sqlite3_backup_finish()]] sqlite3_backup_finish() ** -** When sqlite3_backup_step() has returned [SQLITE_DONE], or when the +** When sqlite3_backup_step() has returned [SQLITE_DONE], or when the ** application wishes to abandon the backup operation, the application ** should destroy the [sqlite3_backup] by passing it to sqlite3_backup_finish(). ** ^The sqlite3_backup_finish() interfaces releases all -** resources associated with the [sqlite3_backup] object. +** resources associated with the [sqlite3_backup] object. ** ^If sqlite3_backup_step() has not yet returned [SQLITE_DONE], then any ** active write-transaction on the destination database is rolled back. ** The [sqlite3_backup] object is invalid @@ -6839,8 +6839,8 @@ typedef struct sqlite3_backup sqlite3_backup; ** connections, then the source database connection may be used concurrently ** from within other threads. ** -** However, the application must guarantee that the destination -** [database connection] is not passed to any other API (by any thread) after +** However, the application must guarantee that the destination +** [database connection] is not passed to any other API (by any thread) after ** sqlite3_backup_init() is called and before the corresponding call to ** sqlite3_backup_finish(). SQLite does not currently check to see ** if the application incorrectly accesses the destination [database connection] @@ -6851,11 +6851,11 @@ typedef struct sqlite3_backup sqlite3_backup; ** If running in [shared cache mode], the application must ** guarantee that the shared cache used by the destination database ** is not accessed while the backup is running. In practice this means -** that the application must guarantee that the disk file being +** that the application must guarantee that the disk file being ** backed up to is not accessed by any connection within the process, ** not just the specific connection that was passed to sqlite3_backup_init(). ** -** The [sqlite3_backup] object itself is partially threadsafe. Multiple +** The [sqlite3_backup] object itself is partially threadsafe. Multiple ** threads may safely make multiple concurrent calls to sqlite3_backup_step(). ** However, the sqlite3_backup_remaining() and sqlite3_backup_pagecount() ** APIs are not strictly speaking threadsafe. If they are invoked at the @@ -6879,8 +6879,8 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p); ** ^When running in shared-cache mode, a database operation may fail with ** an [SQLITE_LOCKED] error if the required locks on the shared-cache or ** individual tables within the shared-cache cannot be obtained. See -** [SQLite Shared-Cache Mode] for a description of shared-cache locking. -** ^This API may be used to register a callback that SQLite will invoke +** [SQLite Shared-Cache Mode] for a description of shared-cache locking. +** ^This API may be used to register a callback that SQLite will invoke ** when the connection currently holding the required lock relinquishes it. ** ^This API is only available if the library was compiled with the ** [SQLITE_ENABLE_UNLOCK_NOTIFY] C-preprocessor symbol defined. @@ -6888,14 +6888,14 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p); ** See Also: [Using the SQLite Unlock Notification Feature]. ** ** ^Shared-cache locks are released when a database connection concludes -** its current transaction, either by committing it or rolling it back. +** its current transaction, either by committing it or rolling it back. ** ** ^When a connection (known as the blocked connection) fails to obtain a ** shared-cache lock and SQLITE_LOCKED is returned to the caller, the ** identity of the database connection (the blocking connection) that -** has locked the required resource is stored internally. ^After an +** has locked the required resource is stored internally. ^After an ** application receives an SQLITE_LOCKED error, it may call the -** sqlite3_unlock_notify() method with the blocked connection handle as +** sqlite3_unlock_notify() method with the blocked connection handle as ** the first argument to register for a callback that will be invoked ** when the blocking connections current transaction is concluded. ^The ** callback is invoked from within the [sqlite3_step] or [sqlite3_close] @@ -6909,15 +6909,15 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p); ** ** ^If the blocked connection is attempting to obtain a write-lock on a ** shared-cache table, and more than one other connection currently holds -** a read-lock on the same table, then SQLite arbitrarily selects one of +** a read-lock on the same table, then SQLite arbitrarily selects one of ** the other connections to use as the blocking connection. ** -** ^(There may be at most one unlock-notify callback registered by a +** ^(There may be at most one unlock-notify callback registered by a ** blocked connection. If sqlite3_unlock_notify() is called when the ** blocked connection already has a registered unlock-notify callback, ** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is ** called with a NULL pointer as its second argument, then any existing -** unlock-notify callback is canceled. ^The blocked connections +** unlock-notify callback is canceled. ^The blocked connections ** unlock-notify callback may also be canceled by closing the blocked ** connection using [sqlite3_close()]. ** @@ -6930,7 +6930,7 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p); ** ** Callback Invocation Details ** -** When an unlock-notify callback is registered, the application provides a +** When an unlock-notify callback is registered, the application provides a ** single void* pointer that is passed to the callback when it is invoked. ** However, the signature of the callback function allows SQLite to pass ** it an array of void* context pointers. The first argument passed to @@ -6943,12 +6943,12 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p); ** same callback function, then instead of invoking the callback function ** multiple times, it is invoked once with the set of void* context pointers ** specified by the blocked connections bundled together into an array. -** This gives the application an opportunity to prioritize any actions +** This gives the application an opportunity to prioritize any actions ** related to the set of unblocked database connections. ** ** Deadlock Detection ** -** Assuming that after registering for an unlock-notify callback a +** Assuming that after registering for an unlock-notify callback a ** database waits for the callback to be issued before taking any further ** action (a reasonable assumption), then using this API may cause the ** application to deadlock. For example, if connection X is waiting for @@ -6971,7 +6971,7 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p); ** ** The "DROP TABLE" Exception ** -** When a call to [sqlite3_step()] returns SQLITE_LOCKED, it is almost +** When a call to [sqlite3_step()] returns SQLITE_LOCKED, it is almost ** always appropriate to call sqlite3_unlock_notify(). There is however, ** one exception. When executing a "DROP TABLE" or "DROP INDEX" statement, ** SQLite checks if there are any currently executing SELECT statements @@ -6984,7 +6984,7 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p); ** One way around this problem is to check the extended error code returned ** by an sqlite3_step() call. ^(If there is a blocking connection, then the ** extended error code is set to SQLITE_LOCKED_SHAREDCACHE. Otherwise, in -** the special "DROP TABLE/INDEX" case, the extended error code is just +** the special "DROP TABLE/INDEX" case, the extended error code is just ** SQLITE_LOCKED.)^ */ SQLITE_API int sqlite3_unlock_notify( @@ -7049,10 +7049,10 @@ SQLITE_API void sqlite3_log(int iErrCode, const char *zFormat, ...); ** ^The [sqlite3_wal_hook()] function is used to register a callback that ** will be invoked each time a database connection commits data to a ** [write-ahead log] (i.e. whenever a transaction is committed in -** [journal_mode | journal_mode=WAL mode]). +** [journal_mode | journal_mode=WAL mode]). ** -** ^The callback is invoked by SQLite after the commit has taken place and -** the associated write-lock on the database released, so the implementation +** ^The callback is invoked by SQLite after the commit has taken place and +** the associated write-lock on the database released, so the implementation ** may read, write or [checkpoint] the database as required. ** ** ^The first parameter passed to the callback function when it is invoked @@ -7071,7 +7071,7 @@ SQLITE_API void sqlite3_log(int iErrCode, const char *zFormat, ...); ** that does not correspond to any valid SQLite error code, the results ** are undefined. ** -** A single database handle may have at most a single write-ahead log callback +** A single database handle may have at most a single write-ahead log callback ** registered at one time. ^Calling [sqlite3_wal_hook()] replaces any ** previously registered write-ahead log callback. ^Note that the ** [sqlite3_wal_autocheckpoint()] interface and the @@ -7079,7 +7079,7 @@ SQLITE_API void sqlite3_log(int iErrCode, const char *zFormat, ...); ** those overwrite any prior [sqlite3_wal_hook()] settings. */ SQLITE_API void *sqlite3_wal_hook( - sqlite3*, + sqlite3*, int(*)(void *,sqlite3*,const char*,int), void* ); @@ -7091,7 +7091,7 @@ SQLITE_API void *sqlite3_wal_hook( ** [sqlite3_wal_hook()] that causes any database on [database connection] D ** to automatically [checkpoint] ** after committing a transaction if there are N or -** more frames in the [write-ahead log] file. ^Passing zero or +** more frames in the [write-ahead log] file. ^Passing zero or ** a negative value as the nFrame parameter disables automatic ** checkpoints entirely. ** @@ -7132,15 +7132,15 @@ SQLITE_API int sqlite3_wal_checkpoint(sqlite3 *db, const char *zDb); /* ** CAPI3REF: Checkpoint a database ** -** Run a checkpoint operation on WAL database zDb attached to database -** handle db. The specific operation is determined by the value of the +** Run a checkpoint operation on WAL database zDb attached to database +** handle db. The specific operation is determined by the value of the ** eMode parameter: ** **
    **
    SQLITE_CHECKPOINT_PASSIVE
    -** Checkpoint as many frames as possible without waiting for any database +** Checkpoint as many frames as possible without waiting for any database ** readers or writers to finish. Sync the db file if all frames in the log -** are checkpointed. This mode is the same as calling +** are checkpointed. This mode is the same as calling ** sqlite3_wal_checkpoint(). The busy-handler callback is never invoked. ** **
    SQLITE_CHECKPOINT_FULL
    @@ -7151,10 +7151,10 @@ SQLITE_API int sqlite3_wal_checkpoint(sqlite3 *db, const char *zDb); ** but not database readers. ** **
    SQLITE_CHECKPOINT_RESTART
    -** This mode works the same way as SQLITE_CHECKPOINT_FULL, except after +** This mode works the same way as SQLITE_CHECKPOINT_FULL, except after ** checkpointing the log file it blocks (calls the busy-handler callback) -** until all readers are reading from the database file only. This ensures -** that the next client to write to the database file restarts the log file +** until all readers are reading from the database file only. This ensures +** that the next client to write to the database file restarts the log file ** from the beginning. This call blocks database writers while it is running, ** but not database readers. **
    @@ -7168,30 +7168,30 @@ SQLITE_API int sqlite3_wal_checkpoint(sqlite3 *db, const char *zDb); ** before returning to communicate this to the caller. ** ** All calls obtain an exclusive "checkpoint" lock on the database file. If -** any other process is running a checkpoint operation at the same time, the -** lock cannot be obtained and SQLITE_BUSY is returned. Even if there is a +** any other process is running a checkpoint operation at the same time, the +** lock cannot be obtained and SQLITE_BUSY is returned. Even if there is a ** busy-handler configured, it will not be invoked in this case. ** -** The SQLITE_CHECKPOINT_FULL and RESTART modes also obtain the exclusive +** The SQLITE_CHECKPOINT_FULL and RESTART modes also obtain the exclusive ** "writer" lock on the database file. If the writer lock cannot be obtained ** immediately, and a busy-handler is configured, it is invoked and the writer ** lock retried until either the busy-handler returns 0 or the lock is ** successfully obtained. The busy-handler is also invoked while waiting for ** database readers as described above. If the busy-handler returns 0 before ** the writer lock is obtained or while waiting for database readers, the -** checkpoint operation proceeds from that point in the same way as -** SQLITE_CHECKPOINT_PASSIVE - checkpointing as many frames as possible +** checkpoint operation proceeds from that point in the same way as +** SQLITE_CHECKPOINT_PASSIVE - checkpointing as many frames as possible ** without blocking any further. SQLITE_BUSY is returned in this case. ** ** If parameter zDb is NULL or points to a zero length string, then the ** specified operation is attempted on all WAL databases. In this case the -** values written to output parameters *pnLog and *pnCkpt are undefined. If -** an SQLITE_BUSY error is encountered when processing one or more of the -** attached WAL databases, the operation is still attempted on any remaining -** attached databases and SQLITE_BUSY is returned to the caller. If any other -** error occurs while processing an attached database, processing is abandoned -** and the error code returned to the caller immediately. If no error -** (SQLITE_BUSY or otherwise) is encountered while processing the attached +** values written to output parameters *pnLog and *pnCkpt are undefined. If +** an SQLITE_BUSY error is encountered when processing one or more of the +** attached WAL databases, the operation is still attempted on any remaining +** attached databases and SQLITE_BUSY is returned to the caller. If any other +** error occurs while processing an attached database, processing is abandoned +** and the error code returned to the caller immediately. If no error +** (SQLITE_BUSY or otherwise) is encountered while processing the attached ** databases, SQLITE_OK is returned. ** ** If database zDb is the name of an attached database that is not in WAL @@ -7257,20 +7257,20 @@ SQLITE_API int sqlite3_vtab_config(sqlite3*, int op, ...); ** If X is non-zero, then the virtual table implementation guarantees ** that if [xUpdate] returns [SQLITE_CONSTRAINT], it will do so before ** any modifications to internal or persistent data structures have been made. -** If the [ON CONFLICT] mode is ABORT, FAIL, IGNORE or ROLLBACK, SQLite +** If the [ON CONFLICT] mode is ABORT, FAIL, IGNORE or ROLLBACK, SQLite ** is able to roll back a statement or database transaction, and abandon -** or continue processing the current SQL statement as appropriate. +** or continue processing the current SQL statement as appropriate. ** If the ON CONFLICT mode is REPLACE and the [xUpdate] method returns ** [SQLITE_CONSTRAINT], SQLite handles this as if the ON CONFLICT mode ** had been ABORT. ** ** Virtual table implementations that are required to handle OR REPLACE -** must do so within the [xUpdate] method. If a call to the -** [sqlite3_vtab_on_conflict()] function indicates that the current ON -** CONFLICT policy is REPLACE, the virtual table implementation should +** must do so within the [xUpdate] method. If a call to the +** [sqlite3_vtab_on_conflict()] function indicates that the current ON +** CONFLICT policy is REPLACE, the virtual table implementation should ** silently replace the appropriate rows within the xUpdate callback and ** return SQLITE_OK. Or, if this is not possible, it may return -** SQLITE_CONSTRAINT, in which case SQLite falls back to OR ABORT +** SQLITE_CONSTRAINT, in which case SQLite falls back to OR ABORT ** constraint handling. ** */ @@ -7379,4 +7379,3 @@ struct sqlite3_rtree_geometry { #endif #endif /* ifndef _SQLITE3RTREE_H_ */ - diff --git a/packages/swig/configure.in b/packages/swig/configure.in index 26571ba92..204d7f17e 100644 --- a/packages/swig/configure.in +++ b/packages/swig/configure.in @@ -21,10 +21,11 @@ fi if test "$PKG_SWIG" != ""; then +mkdir -p packages/swig/android +mkdir -p packages/swig/android/usr mkdir -p packages/swig/python mkdir -p packages/swig/R mkdir -p packages/swig/java -mkdir -p packages/swig/fli mkdir -p packages/swig/jni AC_SUBST(SWIG) diff --git a/packages/swig/python/demo.py b/packages/swig/python/demo.py index 090312417..829a38aa6 100644 --- a/packages/swig/python/demo.py +++ b/packages/swig/python/demo.py @@ -3,20 +3,31 @@ import sys import yap +# +# initialize engine engine = yap.YAPEngine(); # engine = yap.YAPEngine(yap.YAPParams()); -def go(): - while True: - s = raw_input("Prolog Query: ") - q = engine.query(s) - while q.next(): - vs = q.namedVars(); - if vs.length() == 0: - print "yes" - else: - while vs.length() > 0: - eq = vs.car() - print eq.getArg(1).text() + " = " + eq.getArg(2).text() - vs = vs.cdr() - print "no more answers" +def query( s ): + q = engine.query(s) + while q.next(): + vs = q.namedVars() + if vs.length() == 0: + print( "yes" ) + return + else: + while vs.length() > 0: + eq = vs.car() + print( eq.getArg(1).text() + " = " + eq.getArg(2).text() ) + vs = vs.cdr() + s = raw_input("next: ?") + if s.find(';') != 0 : + return + print( "no more answers" ) + return + +def live(): + loop = True + while loop: + s = raw_input("?- ") + query( s ) diff --git a/packages/swig/yap.i b/packages/swig/yap.i index 6095d4628..6de84c87c 100644 --- a/packages/swig/yap.i +++ b/packages/swig/yap.i @@ -2,7 +2,7 @@ %module(directors="1") yap // Language independent exception handler -%include exception.i +%include exception.i class YAPPredicate; class YAPEngine; @@ -21,7 +21,7 @@ %exception query { try { $action - } + } catch (YAPError YAP_SYMTAX_ERROR) { SWIG_exception(SWIG_SyntaxError,"Syntax Error exception"); } @@ -33,7 +33,7 @@ %exception next { try { $action - } + } catch (...) { SWIG_exception(SWIG_RuntimeError,"Unknown exception"); } @@ -42,16 +42,14 @@ %{ /* Put header files here or function declarations like below */ - + #define YAP_CPP_INTERFACE 1 - - + + #include "yapi.hh" extern "C" { - extern Term Yap_StringToTerm(const char *s, size_t len, term_t bindings); - #if THREADS #define Yap_regp regcache #endif @@ -61,11 +59,11 @@ } %} - - + + /* turn on director wrapping Callback */ %feature("director") YAPCallback; - + %include "yapi.hh" %include "yapa.hh" @@ -89,4 +87,3 @@ } } #endif - diff --git a/pl/consult.yap b/pl/consult.yap index e6d97a4a2..792a25c41 100644 --- a/pl/consult.yap +++ b/pl/consult.yap @@ -16,7 +16,7 @@ *************************************************************************/ :- system_module( '$_consult', [compile/1, consult/1, - db_files/1,- + db_files/1, ensure_loaded/1, exists_source/1, exo_files/1, @@ -879,6 +879,7 @@ db_files(Fs) :- '$do_startup_reconsult'(_). '$skip_unix_header'(Stream) :- + writeln(Stream), peek_code(Stream, 0'#), !, % 35 is ASCII for '# skip(Stream, 10), '$skip_unix_header'(Stream). diff --git a/pl/init.yap b/pl/init.yap index 562520a10..46a9cc9c0 100644 --- a/pl/init.yap +++ b/pl/init.yap @@ -17,10 +17,10 @@ %% @defgroup builtins YAP Built-Ins /* - + @addtogroup YAPControl - @{ + @{ */ :- system_module( '$_init', [!/0, @@ -51,21 +51,21 @@ % These are pseudo declarations % so that the user will get a redefining system predicate -/** @pred fail is iso +/** @pred fail is iso Always fails. - + */ fail :- fail. -/** @pred false is iso +/** @pred false is iso The same as fail. - + */ false :- fail. @@ -127,7 +127,7 @@ otherwise. 'arith.yap', 'flags.yap' ]. - + :- [ 'preds.yap', 'modules.yap' ]. @@ -232,7 +232,7 @@ yap_hacks:cut_by(CP) :- '$$cut_by'(CP). :- module(user). -/** @pred _CurrentModule_:goal_expansion(+ _G_,+ _M_,- _NG_), user:goal_expansion(+ _G_,+ _M_,- _NG_) +/** @pred _CurrentModule_:goal_expansion(+ _G_,+ _M_,- _NG_), user:goal_expansion(+ _G_,+ _M_,- _NG_) YAP now supports goal_expansion/3. This is an user-defined @@ -244,7 +244,7 @@ sub-goal _NG_ will replace _G_ and will be processed in the same way. If goal_expansion/3 fails the system will use the default rules. - + */ :- multifile goal_expansion/3. @@ -263,25 +263,25 @@ rules. :- dynamic goal_expansion/2. -/** @pred _CurrentModule_:term_expansion( _T_,- _X_), user:term_expansion( _T_,- _X_) +/** @pred _CurrentModule_:term_expansion( _T_,- _X_), user:term_expansion( _T_,- _X_) This user-defined predicate is called by `expand_term/3` to preprocess all terms read when consulting a file. If it succeeds: -+ ++ If _X_ is of the form `:- G` or `?- G`, it is processed as a directive. -+ ++ If _X_ is of the form `$source_location`( _File_, _Line_): _Clause_` it is processed as if from `File` and line `Line`. -+ ++ If _X_ is a list, all terms of the list are asserted or processed as directives. + The term _X_ is asserted instead of _T_. - + */ :- multifile term_expansion/2. @@ -294,7 +294,7 @@ as directives. :- multifile swi:swi_predicate_table/4. -/** @pred user:message_hook(+ _Term_, + _Kind_, + _Lines_) +/** @pred user:message_hook(+ _Term_, + _Kind_, + _Lines_) Hook predicate that may be define in the module `user` to intercept @@ -305,7 +305,7 @@ format statements as described with print_message_lines/3. This predicate should be defined dynamic and multifile to allow other modules defining clauses for it too. - + */ :- multifile user:message_hook/3. @@ -315,7 +315,7 @@ modules defining clauses for it too. :- dynamic user:portray_message/2. -/** @pred exception(+ _Exception_, + _Context_, - _Action_) +/** @pred exception(+ _Exception_, + _Context_, - _Action_) Dynamic predicate, normally not defined. Called by the Prolog system on run-time exceptions that can be repaired `just-in-time`. The values for _Exception_ are described below. See also catch/3 and throw/1. @@ -337,7 +337,7 @@ If this hook predicate succeeds it must instantiate the _Action_ argument to th :- dynamic user:exception/3. -:- yap_flag(unknown,error). +:- yap_flag(unknown,error). :- stream_property(user_input, tty(true)) -> set_prolog_flag(readline, true) ; true. diff --git a/pl/modules.yap b/pl/modules.yap index 55108cf3b..1fde7e74c 100644 --- a/pl/modules.yap +++ b/pl/modules.yap @@ -823,7 +823,10 @@ expand_goal(G, G). % be careful here not to generate an undefined exception. '$imported_pred'(G, ImportingMod, G0, ExportingMod) :- '$enter_undefp', - '$undefined'(G, ImportingMod), + ( var(G) -> true ; + var(ImportingMod) -> true ; + '$undefined'(G, ImportingMod) + ), '$get_undefined_pred'(G, ImportingMod, G0, ExportingMod), ExportingMod \= ImportingMod, !, '$exit_undefp'. @@ -833,8 +836,8 @@ expand_goal(G, G). % This predicate should be bidirectional: both % a consumer and a generator. -'$get_undefined_pred'(G, ImportingMod, call(G), ImportingMod) :- - var(G), !. +%'$get_undefined_pred'(G, ImportingMod, call(G), ImportingMod) :- +% var(G), !. '$get_undefined_pred'(G, ImportingMod, G0, ExportingMod) :- recorded('$import','$import'(ExportingModI,ImportingMod,G0I,G,_,_),_), '$continue_imported'(ExportingMod, ExportingModI, G0, G0I). @@ -852,8 +855,8 @@ expand_goal(G, G). '$get_undefined_pred'(G, ImportingMod, G0, ExportingMod) :- yap_flag(autoload, V), V = true, - functor(G, N, K), - functor(G0, N, K), + functor(G, N, K), + functor(G0, N, K), '$autoloader_find_predicate'(G0,ExportingMod), ExportingMod \= ImportingMod, (recordzifnot('$import','$import'(ExportingMod,ImportingMod,G0,G0, N ,K),_) -> true ; true ). @@ -1404,10 +1407,14 @@ export_list(Module, List) :- G0=..[_N0|Args], G1=..[N1|Args], ( '$check_import'(M0,ContextMod,N1,K) -> - ( ContextMod = user -> - ( recordzifnot('$import','$import'(M0,user,G0,G1,N1,K),_) -> true ; true) + ( ContextMod == prolog -> + recordzifnot('$import','$import'(M0,user,G0,G1,N1,K),_), + fail ; - ( recordaifnot('$import','$import'(M0,ContextMod,G0,G1,N1,K),_) -> true ; true ) + recordaifnot('$import','$import'(M0,ContextMod,G0,G1,N1,K),_), + fail + ; + true ) ; true diff --git a/pl/preddecls.yap b/pl/preddecls.yap index 9d43f4ba5..aa98b6f9e 100644 --- a/pl/preddecls.yap +++ b/pl/preddecls.yap @@ -31,7 +31,7 @@ The YAP Compiler allows the programmer to include declarations with important pproprties of predicates, such as where they can be modified -during execution time, whether they are meta-predicates, or whether they can be +during execution time, whether they are meta-predicates, or whether they can be defined across multiple files. We next join some of these declarations. */ @@ -50,7 +50,7 @@ as a dynamic predicate. _P_ must be written as a predicate indicator, that is i :- dynamic god/1. ~~~~~ - + a more convenient form can be used: ~~~~~ @@ -65,10 +65,10 @@ or, equivalently, Note: -a predicate is assumed to be dynamic when +a predicate is assumed to be dynamic when asserted before being defined. - + */ dynamic(X) :- '$access_yap_flags'(8, 0), !, '$current_module'(M), @@ -102,7 +102,7 @@ dynamic(X) :- F /\ 0x00000400 =:= 0x00000400, '$undefined'(T,Mod) -> F1 is F /\ \(0x400), N1F is F1 \/ 0x00002000, NF is N1F /\ \(0x00400000), '$flags'(T,Mod,F,NF), '$mk_d'(T,Mod); '$do_error'(permission_error(modify,static_procedure,A/N),dynamic(Mod:A/N)) ). -'$dynamic2'(X,Mod) :- +'$dynamic2'(X,Mod) :- '$do_pi_error'(type_error(callable,X),dynamic(Mod:X)). '$logical_updatable'(A//N,Mod) :- integer(N), !, @@ -117,7 +117,7 @@ dynamic(X) :- F /\ 0x00000400 =:= 0x00000400 , '$undefined'(T,Mod) -> N1F is F \/ 0x08000000, NF is N1F /\ \(0x00400000), '$flags'(T,Mod,F,NF), '$mk_d'(T,Mod); '$do_error'(permission_error(modify,static_procedure,A/N),dynamic(Mod:A/N)) ). -'$logical_updatable'(X,Mod) :- +'$logical_updatable'(X,Mod) :- '$do_error'(type_error(callable,X),dynamic(Mod:X)). /** @pred public( _P_ ) is iso @@ -144,7 +144,7 @@ defines all new or redefined predicates to be public. '$public'(A/N, Mod) :- integer(N), atom(A), !, functor(T,A,N), '$do_make_public'(T, Mod). -'$public'(X, Mod) :- +'$public'(X, Mod) :- '$do_pi_error'(type_error(callable,X),dynamic(Mod:X)). '$do_make_public'(T, Mod) :- @@ -250,5 +250,4 @@ discontiguous(F) :- write(user_error,' (line '), '$start_line'(LN), write(user_error,LN), write(user_error,')'), - nl(user_error). - + nl(user_error). diff --git a/pl/preds.yap b/pl/preds.yap index 2bcf28fe1..6e34d4456 100644 --- a/pl/preds.yap +++ b/pl/preds.yap @@ -15,14 +15,15 @@ * * *************************************************************************/ -/** @defgroup Database Using the Clausal Data Base -@ingroup builtins -@{ +/** + * @defgroup Database Using the Clausal Data Base + * @ingroup builtins + * @{ Predicates in YAP may be dynamic or static. By default, when consulting or reconsulting, predicates are assumed to be static: execution is faster and the code will probably use less space. -Static predicates impose some restrictions: in general there can be no +Static predicates impose some restrictions: in general there can be no addition or removal of clauses for a procedure if it is being used in the current execution. @@ -30,12 +31,9 @@ Dynamic predicates allow programmers to change the Clausal Data Base with the same flexibility as in C-Prolog. With dynamic predicates it is always possible to add or remove clauses during execution and the semantics will be the same as for C-Prolog. But the programmer should be -aware of the fact that asserting or retracting are still expensive operations, +aware of the fact that asserting or retracting are still expensive operations, and therefore he should try to avoid them whenever possible. - - - */ :- system_module( '$_preds', [abolish/1, @@ -103,13 +101,13 @@ and therefore he should try to avoid them whenever possible. % The next predicates are applicable only % to dynamic code -/** @pred asserta(+ _C_) is iso +/** @pred asserta(+ _C_) is iso Adds clause _C_ to the beginning of the program. If the predicate is undefined, declare it as dynamic. - + */ asserta(Mod:C) :- !, '$assert'(C,Mod,first,_,asserta(Mod:C)). @@ -117,7 +115,7 @@ asserta(C) :- '$current_module'(Mod), '$assert'(C,Mod,first,_,asserta(C)). -/** @pred assertz(+ _C_) is iso +/** @pred assertz(+ _C_) is iso Adds clause _C_ to the end of the program. If the predicate is @@ -129,7 +127,7 @@ asserting clauses for static predicates. The current version of YAP supports this feature, but this feature is deprecated and support may go away in future versions. - + */ assertz(Mod:C) :- !, '$assert'(C,Mod,last,_,assertz(Mod:C)). @@ -137,7 +135,7 @@ assertz(C) :- '$current_module'(Mod), '$assert'(C,Mod,last,_,assertz(C)). -/** @pred assert(+ _C_) +/** @pred assert(+ _C_) Same as assertz/1. Adds clause _C_ to the program. If the predicate is undefined, @@ -150,7 +148,7 @@ in use and the language flag is cprolog. Note that this feature is deprecated, if you want to assert clauses for static procedures you should use assert_static/1. - + */ assert(Mod:C) :- !, '$assert'(C,Mod,last,_,assert(Mod:C)). @@ -186,7 +184,7 @@ assert(C) :- '$is_dynamic'(H, Mod) -> '$assertat_d'(Where, H, true, H, Mod, R) ; - '$undefined'(H,Mod) -> + '$undefined'(H,Mod) -> functor(H, Na, Ar), '$dynamic'(Na/Ar, Mod), '$assert_fact'(H,Mod,Where,R) @@ -211,7 +209,7 @@ assert(C) :- '$is_dynamic'(H, Mod) -> '$assertat_d'(Where, H, B, C0, Mod, R) ; - '$undefined'(H,Mod) -> + '$undefined'(H,Mod) -> functor(H, Na, Ar), '$dynamic'(Na/Ar, Mod), '$assert_clause3'(C0,C,Mod,Where,R,P) @@ -242,7 +240,7 @@ assert(C) :- '$is_dynamic'(H, Mod) -> '$assertat_d'(Where,H,B,C0,Mod,R) ; - '$undefined'(H, Mod) -> + '$undefined'(H, Mod) -> functor(H, Na, Ar), '$dynamic'(Na/Ar, Mod), '$assert_dynamic2'(C0,C,Mod,Where,R,P) @@ -251,14 +249,14 @@ assert(C) :- '$do_error'(permission_error(modify,static_procedure,Na/Ar),P) ). -/** @pred assert_static(: _C_) +/** @pred assert_static(: _C_) Adds clause _C_ to a static procedure. Asserting a static clause for a predicate while choice-points for the predicate are available has undefined results. - + */ assert_static(Mod:C) :- !, '$assert_static'(C,Mod,last,_,assert_static(Mod:C)). @@ -266,12 +264,12 @@ assert_static(C) :- '$current_module'(Mod), '$assert_static'(C,Mod,last,_,assert_static(C)). -/** @pred asserta_static(: _C_) +/** @pred asserta_static(: _C_) -Adds clause _C_ to the beginning of a static procedure. +Adds clause _C_ to the beginning of a static procedure. + - */ asserta_static(Mod:C) :- !, '$assert_static'(C,Mod,first,_,asserta_static(Mod:C)). @@ -281,7 +279,7 @@ asserta_static(C) :- asserta_static(Mod:C) :- !, '$assert_static'(C,Mod,last,_,assertz_static(Mod:C)). -/** @pred assertz_static(: _C_) +/** @pred assertz_static(: _C_) Adds clause _C_ to the end of a static procedure. Asserting a @@ -295,7 +293,7 @@ static predicates, if source mode was on when they were compiled: - + */ assertz_static(C) :- '$current_module'(Mod), @@ -328,13 +326,13 @@ assertz_static(C) :- ( Fl /\ 0x20000000 =\= 0 -> '$check_multifile_pred'(Head,Mod,Fl) ; true ) ; true - ), + ), '$head_and_body'(C0, H0, B0), '$recordap'(Mod:Head,(H0 :- B0),R,CR), ( '$is_multifile'(Head, Mod) -> source_location(F, _), functor(H0, Na, Ar), - recorda('$multifile_dynamic'(_,_,_), '$mf'(Na,Ar,Mod,F,R), _) + recorda('$multifile_dynamic'(_,_,_), '$mf'(Na,Ar,Mod,F,R), _) ; true ). @@ -346,13 +344,13 @@ assertz_static(C) :- ( Fl /\ 0x20000000 =\= 0 -> '$check_multifile_pred'(Head,Mod,Fl) ; true ) ; true - ), + ), '$head_and_body'(C0, H0, B0), '$recordzp'(Mod:Head,(H0 :- B0),R,CR), ( '$is_multifile'(H0, Mod) -> source_location(F, _), functor(H0, Na, Ar), - recordz('$multifile_dynamic'(_,_,_), '$mf'(Na,Ar,Mod,F,R), _) + recordz('$multifile_dynamic'(_,_,_), '$mf'(Na,Ar,Mod,F,R), _) ; true ). @@ -363,8 +361,8 @@ assertz_static(C) :- '$assertz_dynamic'(X, C, C0, Mod) :- (X/\4)=:=0, !, '$head_and_body'(C,H,B), '$assertat_d'(last,H,B,C0,Mod,_). -'$assertz_dynamic'(X,C,C0,Mod) :- - '$head_and_body'(C,H,B), +'$assertz_dynamic'(X,C,C0,Mod) :- + '$head_and_body'(C,H,B), functor(H,N,A), ('$check_if_reconsulted'(N,A) -> true @@ -396,12 +394,12 @@ assertz_static(C) :- /** @pred asserta(+ _C_,- _R_) The same as `asserta(C)` but unifying _R_ with -the database reference that identifies the new clause, in a +the database reference that identifies the new clause, in a one-to-one way. Note that `asserta/2` only works for dynamic predicates. If the predicate is undefined, it will automatically be declared dynamic. - + */ asserta(M:C,R) :- !, '$assert_dynamic'(C,M,first,R,asserta(M:C,R)). @@ -412,12 +410,12 @@ asserta(C,R) :- /** @pred assertz(+ _C_,- _R_) The same as `assertz(C)` but unifying _R_ with -the database reference that identifies the new clause, in a +the database reference that identifies the new clause, in a one-to-one way. Note that `asserta/2` only works for dynamic predicates. If the predicate is undefined, it will automatically be declared dynamic. - + */ assertz(M:C,R) :- !, '$assert_dynamic'(C,M,last,R,assertz(M:C,R)). @@ -433,7 +431,7 @@ clause, in a one-to-one way. Note that `asserta/2` only works for dynamic predicates. If the predicate is undefined, it will automatically be declared dynamic. - + */ assert(M:C,R) :- !, '$assert_dynamic'(C,M,last,R,assert(M:C,R)). @@ -441,7 +439,7 @@ assert(C,R) :- '$current_module'(M), '$assert_dynamic'(C,M,last,R,assert(C,R)). -/** @pred clause(+ _H_, _B_) is iso +/** @pred clause(+ _H_, _B_) is iso A clause whose head matches _H_ is searched for in the @@ -452,7 +450,7 @@ program. Its head and body are respectively unified with _H_ and This predicate is applicable to static procedures compiled with `source` active, and to all dynamic procedures. - + */ clause(M:P,Q) :- !, '$clause'(P,M,Q,_). @@ -467,7 +465,7 @@ reference to the clause in the database. You can use instance/2 to access the reference's value. Note that you may not use erase/1 on the reference on static procedures. - + */ clause(P,Q,R) :- var(P), !, '$current_module'(M), @@ -483,9 +481,9 @@ clause(V,Q,R) :- M0 = M, instance(R,T), ( T = (H :- B) -> P = H, Q = B ; P=T, Q = true). -'$clause'(V,M,Q,R) :- var(V), !, +'$clause'(V,M,Q,R) :- var(V), !, '$do_error'(instantiation_error,clause(M:V,Q,R)). -'$clause'(C,M,Q,R) :- +'$clause'(C,M,Q,R) :- number(C), !, '$do_error'(type_error(callable,C),clause(M:C,Q,R)). '$clause'(C,M,Q,R) :- @@ -515,26 +513,26 @@ clause(V,Q,R) :- '$do_error'(permission_error(access,private_procedure,Name/Arity), clause(M:P,Q,R)). -'$init_preds' :- +'$init_preds' :- once('$handle_throw'(_,_,_)), fail. -'$init_preds' :- +'$init_preds' :- once('$do_static_clause'(_,_,_,_,_)), fail. -'$init_preds' :- +'$init_preds' :- once('$do_log_upd_clause0'(_,_,_,_,_,_)), fail. -'$init_preds' :- +'$init_preds' :- once('$do_log_upd_clause'(_,_,_,_,_,_)), fail. -'$init_preds' :- +'$init_preds' :- once('$do_log_upd_clause_erase'(_,_,_,_,_,_)), fail. '$init_preds'. :- '$init_preds'. -/** @pred nth_clause(+ _H_, _I_,- _R_) +/** @pred nth_clause(+ _H_, _I_,- _R_) Find the _I_th clause in the predicate defining _H_, and give @@ -548,7 +546,7 @@ The following predicates can only be used for dynamic predicates: - + */ nth_clause(V,I,R) :- '$current_module'(M), @@ -563,7 +561,7 @@ nth_clause(V,I,R) :- '$nth_clause'(P,M,I,R) :- '$fetch_nth_clause'(P,M,I,R). -/** @pred retract(+ _C_) is iso +/** @pred retract(+ _C_) is iso Erases the first clause in the program that matches _C_. This @@ -571,20 +569,20 @@ predicate may also be used for the static predicates that have been compiled when the source mode was `on`. For more information on source/0 ( (see Setting the Compiler)). - + */ retract(M:C) :- !, '$retract'(C,M). retract(C) :- '$current_module'(M), '$retract'(C,M). - - + + '$retract'(V,_) :- var(V), !, '$do_error'(instantiation_error,retract(V)). '$retract'(M:C,_) :- !, '$retract'(C,M). -'$retract'(C,M) :- +'$retract'(C,M) :- '$check_head_and_body'(C,H,B,retract(M:C)), !, '$flags'(H, M, F, F), '$retract2'(F, H,M,B,_). @@ -595,24 +593,24 @@ retract(C) :- '$log_update_clause'(H,M,B,R), ( F /\ 0x20000000 =:= 0x20000000, recorded('$mf','$mf_clause'(_,_,_,_,R),MR), erase(MR), fail ; true), erase(R). -'$retract2'(F, H, M, B, R) :- +'$retract2'(F, H, M, B, R) :- % '$is_dynamic'(H,M), !, F /\ 0x00002000 =:= 0x00002000, !, '$recordedp'(M:H,(H:-B),R), ( F /\ 0x20000000 =:= 0x20000000, recorded('$mf','$mf_clause'(_,_,_,_,MRef),MR), erase(MR), erase(MRef), fail ; true), erase(R). -'$retract2'(_, H,M,_,_) :- +'$retract2'(_, H,M,_,_) :- '$undefined'(H,M), !, functor(H,Na,Ar), '$dynamic'(Na/Ar,M), fail. -'$retract2'(_, H,M,B,_) :- +'$retract2'(_, H,M,B,_) :- functor(H,Na,Ar), '$do_error'(permission_error(modify,static_procedure,Na/Ar),retract(M:(H:-B))). /** @pred retract(+ _C_,- _R_) -Erases from the program the clause _C_ whose +Erases from the program the clause _C_ whose database reference is _R_. The predicate must be dynamic. @@ -645,9 +643,9 @@ retract(C,R) :- functor(C, Na, Ar). '$fetch_predicate_indicator_from_clause'(C, Na/Ar) :- functor(C, Na, Ar). - -/** @pred retractall(+ _G_) is iso + +/** @pred retractall(+ _G_) is iso Retract all the clauses whose head matches the goal _G_. Goal @@ -689,7 +687,7 @@ retractall(V) :- functor(T,Na,Ar), '$do_error'(permission_error(modify,static_procedure,Na/Ar),retractall(T)) ). - + '$retractall_lu'(T,M) :- '$free_arguments'(T), !, ( '$purge_clauses'(T,M), fail ; true ). @@ -717,14 +715,14 @@ retractall(V) :- Completely delete the predicate with name _P_ and arity _N_. It will remove both static and dynamic predicates. All state on the predicate, including whether it is dynamic or static, multifile, or -meta-predicate, will be lost. +meta-predicate, will be lost. */ abolish(Mod:N,A) :- !, '$abolish'(N,A,Mod). abolish(N,A) :- '$current_module'(Mod), '$abolish'(N,A,Mod). - + '$abolish'(N,A,M) :- var(N), !, '$do_error'(instantiation_error,abolish(M:N,A)). '$abolish'(N,A,M) :- var(A), !, @@ -736,7 +734,7 @@ abolish(N,A) :- ( '$is_dynamic'(T, M) -> '$abolishd'(T,M) ; /* else */ '$abolishs'(T,M) ). -/** @pred abolish(+ _PredSpec_) is iso +/** @pred abolish(+ _PredSpec_) is iso Deletes the predicate given by _PredSpec_ from the database. If @@ -744,9 +742,9 @@ Deletes the predicate given by _PredSpec_ from the database. If current module. The specification must include the name and arity, and it may include module information. Under iso language mode this built-in will only abolish -dynamic procedures. Under other modes it will abolish any procedures. +dynamic procedures. Under other modes it will abolish any procedures. + - */ abolish(V) :- var(V), !, '$do_error'(instantiation_error,abolish(V)). @@ -754,14 +752,14 @@ abolish(Mod:V) :- var(V), !, '$do_error'(instantiation_error,abolish(Mod:V)). abolish(M:X) :- !, '$abolish'(X,M). -abolish(X) :- +abolish(X) :- '$current_module'(M), '$abolish'(X,M). -'$abolish'(X,M) :- +'$abolish'(X,M) :- '$access_yap_flags'(8, 2), !, '$new_abolish'(X,M). -'$abolish'(X, M) :- +'$abolish'(X, M) :- '$old_abolish'(X,M). '$new_abolish'(V,M) :- var(V), !, @@ -858,7 +856,7 @@ abolish(X) :- '$old_abolish'([H|T], M) :- !, '$old_abolish'(H, M), '$old_abolish'(T, M). '$old_abolish'(T, M) :- '$do_error'(type_error(predicate_indicator,T),abolish(M:T)). - + '$abolish_all_old'(M) :- '$current_predicate'(Na, M, S, _), functor( S, Na, Ar ), @@ -913,14 +911,14 @@ abolish(X) :- '$purge_clauses'(G, M), fail. '$abolishs'(_, _). -/** @pred dynamic_predicate(+ _P_,+ _Semantics_) +/** @pred dynamic_predicate(+ _P_,+ _Semantics_) Declares predicate _P_ or list of predicates [ _P1_,..., _Pn_] as a dynamic predicate following either `logical` or `immediate` semantics. - + */ dynamic_predicate(P,Sem) :- '$bad_if_is_semantics'(Sem, dynamic(P,Sem)). @@ -999,11 +997,11 @@ hide_predicate(P) :- '$hide_predicate2'(PredDesc, M) :- '$do_error'(type_error(predicate_indicator,PredDesc),hide_predicate(M:PredDesc)). -/** @pred predicate_property( _P_, _Prop_) is iso +/** @pred predicate_property( _P_, _Prop_) is iso For the predicates obeying the specification _P_ unify _Prop_ -with a property of _P_. These properties may be: + with a property of _P_. These properties may be: + `built_in ` true for built-in predicates, @@ -1042,30 +1040,29 @@ Number of clauses in the predicate definition. Always one if external or built-in. - -*/ -predicate_property(Pred,Prop) :- var(Pred), !, - '$current_module'(Mod), - '$predicate_property2'(Pred,Prop,Mod). -predicate_property(Mod:Pred,Prop) :- !, - '$predicate_property2'(Pred,Prop,Mod). -predicate_property(Pred,Prop) :- - '$current_module'(Mod), - '$predicate_property2'(Pred,Prop,Mod). -'$predicate_property2'(Pred,Prop,M) :- var(M), !, - '$all_current_modules'(M), - '$predicate_property2'(Pred,Prop,M). -'$predicate_property2'(Pred,Prop,M0) :- var(Pred), !, - (M = M0 ; M = prolog), % prolog mode is automatically incorporate in every other module +*/ +predicate_property(Pred,Prop) :- + strip_module(Pred, Mod, TruePred), + '$predicate_property2'(TruePred,Prop,Mod). + +'$predicate_property2'(Pred, Prop, Mod) :- + var(Mod), !, + '$all_current_modules'(Mod), + '$predicate_property2'(Pred, Prop, Mod). +'$predicate_property2'(Pred,Prop,M0) :- + var(Pred), !, + (M = M0 ; + M = prolog ; + M = user), % prolog and user modules are automatically incorporate in every other module '$generate_all_preds_from_mod'(Pred, SourceMod, M), '$predicate_property'(Pred,SourceMod,M,Prop). '$predicate_property2'(M:Pred,Prop,_) :- !, '$predicate_property2'(Pred,Prop,M). -'$predicate_property2'(Pred,Prop,Mod) :- +'$predicate_property2'(Pred,Prop,Mod) :- '$pred_exists'(Pred,Mod), !, '$predicate_property'(Pred,Mod,Mod,Prop). -'$predicate_property2'(Pred,Prop,Mod) :- +'$predicate_property2'(Pred,Prop,Mod) :- '$imported_pred'(Pred, Mod, NPred, M), ( Prop = imported_from(M) @@ -1080,12 +1077,12 @@ predicate_property(Pred,Prop) :- recorded('$import','$import'(SourceMod, Mod, Orig, Pred,_,_),_), '$pred_exists'(Orig, SourceMod). -'$predicate_property'(P,M,_,built_in) :- +'$predicate_property'(P,M,_,built_in) :- '$system_predicate'(P,M). -'$predicate_property'(P,M,_,source) :- +'$predicate_property'(P,M,_,source) :- '$flags'(P,M,F,F), F /\ 0x00400000 =\= 0. -'$predicate_property'(P,M,_,tabled) :- +'$predicate_property'(P,M,_,tabled) :- '$flags'(P,M,F,F), F /\ 0x00000040 =\= 0. '$predicate_property'(P,M,_,dynamic) :- @@ -1140,7 +1137,7 @@ predicate_statistics(P,NCls,Sz,ISz) :- '$predicate_statistics'(P,M,NCls,Sz,ISz) :- '$static_pred_statistics'(P,M,NCls,Sz,ISz). -/** @pred predicate_erased_statistics( _P_, _NCls_, _Sz_, _IndexSz_) +/** @pred predicate_erased_statistics( _P_, _NCls_, _Sz_, _IndexSz_) Given predicate _P_, _NCls_ is the number of erased clauses for @@ -1153,7 +1150,7 @@ of space required to store indices to those clauses (in bytes). */ predicate_erased_statistics(P,NCls,Sz,ISz) :- - var(P), !, + var(P), !, current_predicate(_,P), predicate_erased_statistics(P,NCls,Sz,ISz). predicate_erased_statistics(M:P,NCls,Sz,ISz) :- !, @@ -1164,26 +1161,26 @@ predicate_erased_statistics(P,NCls,Sz,ISz) :- /** @pred current_predicate( _A_, _P_) -Defines the relation: _P_ is a currently defined predicate whose name is the atom _A_. +Defines the relation: _P_ is a currently defined predicate whose name is the atom _A_. */ current_predicate(A,T) :- - '$ground_module'(T, M, T0), - format('`0 ~w~n', [M:T0]), - ( - '$current_predicate'(A, M, T0, Flags), - %TFlags is Flags /\ 0x00004000, - % format('1 ~w ~16r~n', [M:T0,Flags, TFlags]), - Flags /\ 0x00004000 =:= 0x0 - ; - '$imported_predicate'(A, M, A/_Arity, T0, Flags), - % format('2 ~w ~16r~n', [M:T0,Flags]), - Flags /\ 0x00004000 =:= 0x0 - ). - -/** @pred system_predicate( _A_, _P_) + '$ground_module'(T, M, T0), + ( + '$current_predicate'(A, M, T0, _), + %TFlags is Flags /\ 0x00004000, + % format('1 ~w ~16r~n', [M:T0,Flags, TFlags]), + \+ '$system_predicate'(T0, M) + ; + '$imported_pred'(T0, M, SourceT, SourceMod), + functor(T0, A, _), + % format('2 ~w ~16r~n', [M:T0,Flags]), + \+ '$system_predicate'(SourceT, SourceMod) + ). -Defines the relation: _P_ is a built-in predicate whose name -is the atom _A_. +/** @pred system_predicate( _A_, _P_) + + Defines the relation: _P_ is a built-in predicate whose name +is the atom _A_. */ system_predicate(A,T) :- @@ -1211,15 +1208,17 @@ system_predicate(P) :- _Na_ is the name of the predicate, and _Ar_ its arity. */ current_predicate(F0) :- - '$ground_module'(F0, M, F), + strip_module(F0, M, F), ( - '$current_predicate'(N, M, S, _), - functor( S, N, Ar), - F = N/Ar - ; - '$imported_predicate'(_Name, M, F, S, _) - ), - \+ system_predicate(_, S). + var(F) + -> + current_predicate(M:A, S), + functor( S, A, Ar) + ; + F = A/Ar, + current_predicate(M:A, S), + functor( S, A, Ar) + ). '$imported_predicate'(A, ImportingMod, A/Arity, G, Flags) :- '$get_undefined_pred'(G, ImportingMod, G0, ExportingMod), @@ -1227,7 +1226,7 @@ current_predicate(F0) :- '$pred_exists'(G, ExportingMod), '$flags'(G0, ExportingMod, Flags, Flags). -/** @pred current_key(? _A_,? _K_) +/** @pred current_key(? _A_,? _K_) Defines the relation: _K_ is a currently defined database key whose @@ -1248,7 +1247,7 @@ current_key(A,K) :- ). -/** @pred compile_predicates(: _ListOfNameArity_) +/** @pred compile_predicates(: _ListOfNameArity_) @@ -1319,4 +1318,3 @@ clause_property(ClauseRef, predicate(PredicateIndicator)) :- /** @} */ - diff --git a/pl/setof.yap b/pl/setof.yap index af0e1d902..d7869a826 100644 --- a/pl/setof.yap +++ b/pl/setof.yap @@ -31,7 +31,7 @@ post-process the result of the query in several different ways: - + */ :- system_module( '$_setof', [(^)/2, @@ -61,7 +61,7 @@ _^Goal :- % existential quantifier on every variable. -/** @pred findall( _T_,+ _G_,- _L_) is iso +/** @pred findall( _T_,+ _G_,- _L_) is iso Unifies _L_ with a list that contains all the instantiations of the @@ -88,7 +88,7 @@ L = [2,1,2]; no ~~~~~ - + */ findall(Template, Generator, Answers) :- @@ -105,7 +105,7 @@ findall(Template, Generator, Answers) :- Similar to findall/3, but appends all answers to list _L0_. - + */ findall(Template, Generator, Answers, SoFar) :- '$findall'(Template, Generator, SoFar, Answers). @@ -142,9 +142,9 @@ findall(Template, Generator, Answers, SoFar) :- '$collect_with_common_vars'([Key-_|Answers], VarList) :- '$variables_in_term'(Key, _, VarList), '$collect_with_common_vars'(Answers, VarList). - + % This is the setof predicate -/** @pred setof( _X_,+ _P_,- _B_) is iso +/** @pred setof( _X_,+ _P_,- _B_) is iso Similar to `bagof( _T_, _G_, _L_)` but sorts list @@ -185,7 +185,7 @@ setof(Template, Generator, Set) :- % and we need to find the solutions for each instantiation % of these variables -/** @pred bagof( _T_,+ _G_,- _L_) is iso +/** @pred bagof( _T_,+ _G_,- _L_) is iso For each set of possible instances of the free variables occurring in @@ -206,7 +206,7 @@ L = [2]; no ~~~~~ - + */ bagof(Template, Generator, Bag) :- ( '$is_list_or_partial_list'(Bag) -> @@ -254,8 +254,8 @@ bagof(Template, Generator, Bag) :- % as an alternative to setof you can use the predicate all(Term,Goal,Solutions) % But this version of all does not allow for repeated answers -% if you want them use findall -/** @pred all( _T_,+ _G_,- _L_) +% if you want them use findall +/** @pred all( _T_,+ _G_,- _L_) Similar to `findall( _T_, _G_, _L_)` but eliminate @@ -276,10 +276,10 @@ no Note that all/3 will fail if no answers are found. - + */ all(T, G same X,S) :- !, all(T same X,G,Sx), '$$produce'(Sx,S,X). -all(T,G,S) :- +all(T,G,S) :- '$init_db_queue'(Ref), ( '$catch'(Error,'$clean_findall'(Ref,Error),_), '$execute'(G), @@ -290,7 +290,7 @@ all(T,G,S) :- ). % $$set does its best to preserve space -'$$set'(S,R) :- +'$$set'(S,R) :- '$$build'(S0,_,R), S0 = [_|_], S = S0. @@ -306,7 +306,7 @@ all(T,G,S) :- '$$build'(Ns,Hash,R). '$$new'(V,El) :- var(V), !, V = n(_,El,_). -'$$new'(n(R,El0,L),El) :- +'$$new'(n(R,El0,L),El) :- compare(C,El0,El), '$$new'(C,R,L,El). @@ -327,4 +327,3 @@ all(T,G,S) :- /** @} */ - diff --git a/pl/sort.yap b/pl/sort.yap index df446e9ea..908c21009 100644 --- a/pl/sort.yap +++ b/pl/sort.yap @@ -39,7 +39,7 @@ % length of a list. -/** @pred length(? _L_,? _S_) +/** @pred length(? _L_,? _S_) Unify the well-defined list _L_ with its length. The procedure can @@ -78,13 +78,13 @@ length(L, M) :- ( N =:= O -> NL = []; M is N + 1, NL = [_|L], '$$_length2'(L, O, M) ). -/** @pred sort(+ _L_,- _S_) is iso +/** @pred sort(+ _L_,- _S_) is iso Unifies _S_ with the list obtained by sorting _L_ and merging identical (in the sense of `==`) elements. - + */ sort(L,O) :- '$skip_list'(NL,L,RL), @@ -113,7 +113,7 @@ sort(L,O) :- msort(L,O) :- '$msort'(L,O). -/** @pred keysort(+ _L_, _S_) is iso +/** @pred keysort(+ _L_, _S_) is iso Assuming L is a list of the form ` _Key_- _Value_`, @@ -130,7 +130,7 @@ would return: S = [1-b,1-a,1-b,2-c,3-a] ~~~~~ - + */ keysort(L,O) :- '$skip_list'(NL,L,RL), @@ -159,7 +159,7 @@ keysort(L,O) :- % Delta with one of <, > or =. If built-in predicate compare/3 is % used, the result is the same as sort/2. See also keysort/2. -/** @pred predsort(+ _Pred_, + _List_, - _Sorted_) +/** @pred predsort(+ _Pred_, + _List_, - _Sorted_) Sorts similar to sort/2, but determines the order of two terms by @@ -168,23 +168,23 @@ unify _Delta_ with one of `<`, `>` or `=`. If built-in predicate compare/3 is used, the result is the same as sort/2. - + */ predsort(P, L, R) :- - length(L, N), - predsort(P, N, L, _, R1), !, + length(L, N), + predsort(P, N, L, _, R1), !, R = R1. -predsort(P, 2, [X1, X2|L], L, R) :- !, +predsort(P, 2, [X1, X2|L], L, R) :- !, call(P, Delta, X1, X2), sort2(Delta, X1, X2, R). predsort(_, 1, [X|L], L, [X]) :- !. predsort(_, 0, L, L, []) :- !. predsort(P, N, L1, L3, R) :- - N1 is N // 2, - plus(N1, N2, N), - predsort(P, N1, L1, L2, R1), - predsort(P, N2, L2, L3, R2), + N1 is N // 2, + plus(N1, N2, N), + predsort(P, N1, L1, L2, R1), + predsort(P, N2, L2, L3, R2), predmerge(P, R1, R2, R). sort2(<, X1, X2, [X1, X2]). @@ -205,4 +205,3 @@ predmerge(<, P, H1, H2, T1, T2, [H1|R]) :- predmerge(P, T1, [H2|T2], R). %%! @} - diff --git a/swi/console/edit.c b/swi/console/edit.c index ac815886a..2f189e636 100755 --- a/swi/console/edit.c +++ b/swi/console/edit.c @@ -737,5 +737,3 @@ bind_actions() } } } - -