anaconda
This commit is contained in:
Vitor Santos Costa
parent
4271f3debe
commit
d23f7c149f
34
C/qlyr.c
34
C/qlyr.c
|
|
@ -1,20 +1,20 @@
|
|||
/*************************************************************************
|
||||
* *
|
||||
* YAP Prolog *
|
||||
* *
|
||||
* Yap Prolog was developed at NCCUP - Universidade do Porto *
|
||||
* *
|
||||
* Copyright L.Damas, V. Santos Costa and Universidade do Porto 1985-- *
|
||||
* *
|
||||
**************************************************************************
|
||||
* *
|
||||
* File: qlyr.c *
|
||||
* comments: quick saver/loader *
|
||||
* *
|
||||
* Last rev: $Date: 2011-08-29$,$Author: vsc $ *
|
||||
* $Log: not supported by cvs2svn $ *
|
||||
* *
|
||||
*************************************************************************/
|
||||
* *
|
||||
* YAP Prolog *
|
||||
* *
|
||||
* Yap Prolog was developed at NCCUP - Universidade do Porto *
|
||||
* *
|
||||
* Copyright L.Damas, V. Santos Costa and Universidade do Porto 1985-- *
|
||||
* *
|
||||
**************************************************************************
|
||||
* *
|
||||
* File: qlyr.c *
|
||||
* comments: quick saver/loader *
|
||||
* *
|
||||
* Last rev: $Date: 2011-08-29$,$Author: vsc $ *
|
||||
* $Log: not supported by cvs2svn $ *
|
||||
* *
|
||||
*************************************************************************/
|
||||
/**
|
||||
*
|
||||
* @file qlyr.c
|
||||
|
|
@ -638,7 +638,7 @@ static bool checkChars(FILE *stream, char s[]) {
|
|||
}
|
||||
|
||||
static Atom do_header(FILE *stream) {
|
||||
char s[256], *p = s, ch;
|
||||
char s[2560], *p = s, ch;
|
||||
Atom at;
|
||||
|
||||
if (!checkChars(stream, "#!/bin/sh\nexec_dir=${YAPBINDIR:-"))
|
||||
|
|
|
|||
403
C/qlyw.c
403
C/qlyw.c
|
|
@ -1,20 +1,20 @@
|
|||
/*************************************************************************
|
||||
* *
|
||||
* YAP Prolog *
|
||||
* *
|
||||
* Yap Prolog was developed at NCCUP - Universidade do Porto *
|
||||
* *
|
||||
* Copyright L.Damas, V. Santos Costa and Universidade do Porto 1985-- *
|
||||
* *
|
||||
**************************************************************************
|
||||
* *
|
||||
* File: qlyw.c *
|
||||
* comments: quick saver/loader *
|
||||
* *
|
||||
* Last rev: $Date: 2011-08-29$,$Author: vsc $ *
|
||||
* $Log: not supported by cvs2svn $ *
|
||||
* *
|
||||
*************************************************************************/
|
||||
* *
|
||||
* YAP Prolog *
|
||||
* *
|
||||
* Yap Prolog was developed at NCCUP - Universidade do Porto *
|
||||
* *
|
||||
* Copyright L.Damas, V. Santos Costa and Universidade do Porto 1985-- *
|
||||
* *
|
||||
**************************************************************************
|
||||
* *
|
||||
* File: qlyw.c *
|
||||
* comments: quick saver/loader *
|
||||
* *
|
||||
* Last rev: $Date: 2011-08-29$,$Author: vsc $ *
|
||||
* $Log: not supported by cvs2svn $ *
|
||||
* *
|
||||
*************************************************************************/
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -25,12 +25,12 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "absmi.h"
|
||||
#include "Foreign.h"
|
||||
#include "absmi.h"
|
||||
#include "alloc.h"
|
||||
#include "yapio.h"
|
||||
#include "iopreds.h"
|
||||
#include "attvar.h"
|
||||
#include "iopreds.h"
|
||||
#include "yapio.h"
|
||||
#if HAVE_STRING_H
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
|
@ -38,35 +38,35 @@
|
|||
#include "qly.h"
|
||||
|
||||
static void RestoreEntries(PropEntry *, int USES_REGS);
|
||||
static void CleanCode(PredEntry * USES_REGS);
|
||||
static void CleanCode(PredEntry *USES_REGS);
|
||||
|
||||
static void
|
||||
GrowAtomTable(void) {
|
||||
static void GrowAtomTable(void) {
|
||||
CACHE_REGS
|
||||
UInt size = LOCAL_ExportAtomHashTableSize;
|
||||
export_atom_hash_entry_t *p, *newt, *oldt = LOCAL_ExportAtomHashChain;
|
||||
UInt new_size = size + (size > 1024 ? size : 1024);
|
||||
UInt i;
|
||||
|
||||
newt = (export_atom_hash_entry_t *)calloc(new_size,sizeof(export_atom_hash_entry_t));
|
||||
newt = (export_atom_hash_entry_t *)calloc(new_size,
|
||||
sizeof(export_atom_hash_entry_t));
|
||||
if (!newt) {
|
||||
return;
|
||||
}
|
||||
p = oldt;
|
||||
for (i = 0 ; i < size ; p++,i++) {
|
||||
for (i = 0; i < size; p++, i++) {
|
||||
Atom a = p->val;
|
||||
export_atom_hash_entry_t *newp;
|
||||
CELL hash;
|
||||
const unsigned char *apt;
|
||||
|
||||
|
||||
if (!a) continue;
|
||||
if (!a)
|
||||
continue;
|
||||
apt = RepAtom(a)->UStrOfAE;
|
||||
hash = HashFunction(apt)/(2*sizeof(CELL)) % new_size;
|
||||
newp = newt+hash;
|
||||
hash = HashFunction(apt) / (2 * sizeof(CELL)) % new_size;
|
||||
newp = newt + hash;
|
||||
while (newp->val) {
|
||||
newp++;
|
||||
if (newp == newt+new_size)
|
||||
if (newp == newt + new_size)
|
||||
newp = newt;
|
||||
}
|
||||
newp->val = a;
|
||||
|
|
@ -76,29 +76,24 @@ GrowAtomTable(void) {
|
|||
free(oldt);
|
||||
}
|
||||
|
||||
static void
|
||||
LookupAtom(Atom at)
|
||||
{
|
||||
static void LookupAtom(Atom at) {
|
||||
CACHE_REGS
|
||||
const unsigned char *p = RepAtom(at)->UStrOfAE;
|
||||
CELL hash = HashFunction(p) % LOCAL_ExportAtomHashTableSize;
|
||||
export_atom_hash_entry_t *a;
|
||||
|
||||
a = LOCAL_ExportAtomHashChain+hash;
|
||||
a = LOCAL_ExportAtomHashChain + hash;
|
||||
while (a->val) {
|
||||
if (a->val == at) {
|
||||
return;
|
||||
}
|
||||
a++;
|
||||
if (a == LOCAL_ExportAtomHashChain+LOCAL_ExportAtomHashTableSize)
|
||||
if (a == LOCAL_ExportAtomHashChain + LOCAL_ExportAtomHashTableSize)
|
||||
a = LOCAL_ExportAtomHashChain;
|
||||
|
||||
}
|
||||
a->val = at;
|
||||
LOCAL_ExportAtomHashTableNum++;
|
||||
if (LOCAL_ExportAtomHashTableNum >
|
||||
LOCAL_ExportAtomHashTableSize/2
|
||||
) {
|
||||
if (LOCAL_ExportAtomHashTableNum > LOCAL_ExportAtomHashTableSize / 2) {
|
||||
GrowAtomTable();
|
||||
if (!LOCAL_ExportAtomHashChain) {
|
||||
return;
|
||||
|
|
@ -106,30 +101,31 @@ LookupAtom(Atom at)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
GrowFunctorTable(void) {
|
||||
static void GrowFunctorTable(void) {
|
||||
CACHE_REGS
|
||||
UInt size = LOCAL_ExportFunctorHashTableSize;
|
||||
export_functor_hash_entry_t *p, *newt, *oldt = LOCAL_ExportFunctorHashChain;
|
||||
UInt new_size = size + (size > 1024 ? size : 1024);
|
||||
UInt i;
|
||||
|
||||
newt = (export_functor_hash_entry_t *)calloc(new_size,sizeof(export_functor_hash_entry_t));
|
||||
newt = (export_functor_hash_entry_t *)calloc(
|
||||
new_size, sizeof(export_functor_hash_entry_t));
|
||||
if (!newt) {
|
||||
return;
|
||||
}
|
||||
p = oldt;
|
||||
for (i = 0 ; i < size ; p++,i++) {
|
||||
for (i = 0; i < size; p++, i++) {
|
||||
Functor f = p->val;
|
||||
export_functor_hash_entry_t *newp;
|
||||
CELL hash;
|
||||
|
||||
if (!f) continue;
|
||||
hash = ((CELL)(f))/(2*sizeof(CELL)) % new_size;
|
||||
newp = newt+hash;
|
||||
if (!f)
|
||||
continue;
|
||||
hash = ((CELL)(f)) / (2 * sizeof(CELL)) % new_size;
|
||||
newp = newt + hash;
|
||||
while (newp->val) {
|
||||
newp++;
|
||||
if (newp == newt+new_size)
|
||||
if (newp == newt + new_size)
|
||||
newp = newt;
|
||||
}
|
||||
newp->val = p->val;
|
||||
|
|
@ -141,22 +137,21 @@ GrowFunctorTable(void) {
|
|||
free(oldt);
|
||||
}
|
||||
|
||||
static void
|
||||
LookupFunctor(Functor fun)
|
||||
{
|
||||
static void LookupFunctor(Functor fun) {
|
||||
CACHE_REGS
|
||||
CELL hash = ((CELL)(fun))/(2*sizeof(CELL)) % LOCAL_ExportFunctorHashTableSize;
|
||||
CELL hash =
|
||||
((CELL)(fun)) / (2 * sizeof(CELL)) % LOCAL_ExportFunctorHashTableSize;
|
||||
export_functor_hash_entry_t *f;
|
||||
Atom name = NameOfFunctor(fun);
|
||||
UInt arity = ArityOfFunctor(fun);
|
||||
|
||||
f = LOCAL_ExportFunctorHashChain+hash;
|
||||
f = LOCAL_ExportFunctorHashChain + hash;
|
||||
while (f->val) {
|
||||
if (f->val == fun) {
|
||||
return;
|
||||
}
|
||||
f++;
|
||||
if (f == LOCAL_ExportFunctorHashChain+LOCAL_ExportFunctorHashTableSize)
|
||||
if (f == LOCAL_ExportFunctorHashChain + LOCAL_ExportFunctorHashTableSize)
|
||||
f = LOCAL_ExportFunctorHashChain;
|
||||
}
|
||||
LookupAtom(name);
|
||||
|
|
@ -164,9 +159,7 @@ LookupFunctor(Functor fun)
|
|||
f->name = name;
|
||||
f->arity = arity;
|
||||
LOCAL_ExportFunctorHashTableNum++;
|
||||
if (LOCAL_ExportFunctorHashTableNum >
|
||||
LOCAL_ExportFunctorHashTableSize/2
|
||||
) {
|
||||
if (LOCAL_ExportFunctorHashTableNum > LOCAL_ExportFunctorHashTableSize / 2) {
|
||||
GrowFunctorTable();
|
||||
if (!LOCAL_ExportFunctorHashChain) {
|
||||
return;
|
||||
|
|
@ -174,30 +167,32 @@ LookupFunctor(Functor fun)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
GrowPredTable(void) {
|
||||
static void GrowPredTable(void) {
|
||||
CACHE_REGS
|
||||
UInt size = LOCAL_ExportPredEntryHashTableSize;
|
||||
export_pred_entry_hash_entry_t *p, *newt, *oldt = LOCAL_ExportPredEntryHashChain;
|
||||
export_pred_entry_hash_entry_t *p, *newt,
|
||||
*oldt = LOCAL_ExportPredEntryHashChain;
|
||||
UInt new_size = size + (size > 1024 ? size : 1024);
|
||||
UInt i;
|
||||
|
||||
newt = (export_pred_entry_hash_entry_t *)calloc(new_size,sizeof(export_pred_entry_hash_entry_t));
|
||||
newt = (export_pred_entry_hash_entry_t *)calloc(
|
||||
new_size, sizeof(export_pred_entry_hash_entry_t));
|
||||
if (!newt) {
|
||||
return;
|
||||
}
|
||||
p = oldt;
|
||||
for (i = 0 ; i < size ; p++,i++) {
|
||||
for (i = 0; i < size; p++, i++) {
|
||||
PredEntry *pe = p->val;
|
||||
export_pred_entry_hash_entry_t *newp;
|
||||
CELL hash;
|
||||
|
||||
if (!pe) continue;
|
||||
hash = ((CELL)(pe))/(2*sizeof(CELL)) % new_size;
|
||||
newp = newt+hash;
|
||||
if (!pe)
|
||||
continue;
|
||||
hash = ((CELL)(pe)) / (2 * sizeof(CELL)) % new_size;
|
||||
newp = newt + hash;
|
||||
while (newp->val) {
|
||||
newp++;
|
||||
if (newp == newt+new_size)
|
||||
if (newp == newt + new_size)
|
||||
newp = newt;
|
||||
}
|
||||
newp->val = p->val;
|
||||
|
|
@ -210,21 +205,21 @@ GrowPredTable(void) {
|
|||
free(oldt);
|
||||
}
|
||||
|
||||
static void
|
||||
LookupPredEntry(PredEntry *pe)
|
||||
{
|
||||
static void LookupPredEntry(PredEntry *pe) {
|
||||
CACHE_REGS
|
||||
CELL hash = (((CELL)(pe))/(2*sizeof(CELL))) % LOCAL_ExportPredEntryHashTableSize;
|
||||
CELL hash =
|
||||
(((CELL)(pe)) / (2 * sizeof(CELL))) % LOCAL_ExportPredEntryHashTableSize;
|
||||
export_pred_entry_hash_entry_t *p;
|
||||
UInt arity = pe->ArityOfPE;
|
||||
|
||||
p = LOCAL_ExportPredEntryHashChain+hash;
|
||||
p = LOCAL_ExportPredEntryHashChain + hash;
|
||||
while (p->val) {
|
||||
if (p->val == pe) {
|
||||
return;
|
||||
}
|
||||
p++;
|
||||
if (p == LOCAL_ExportPredEntryHashChain+LOCAL_ExportPredEntryHashTableSize)
|
||||
if (p ==
|
||||
LOCAL_ExportPredEntryHashChain + LOCAL_ExportPredEntryHashTableSize)
|
||||
p = LOCAL_ExportPredEntryHashChain;
|
||||
}
|
||||
p->arity = arity;
|
||||
|
|
@ -258,8 +253,7 @@ LookupPredEntry(PredEntry *pe)
|
|||
LookupAtom(p->module);
|
||||
LOCAL_ExportPredEntryHashTableNum++;
|
||||
if (LOCAL_ExportPredEntryHashTableNum >
|
||||
LOCAL_ExportPredEntryHashTableSize/2
|
||||
) {
|
||||
LOCAL_ExportPredEntryHashTableSize / 2) {
|
||||
GrowPredTable();
|
||||
if (!LOCAL_ExportPredEntryHashChain) {
|
||||
return;
|
||||
|
|
@ -267,31 +261,31 @@ LookupPredEntry(PredEntry *pe)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
GrowDBRefTable(void) {
|
||||
static void GrowDBRefTable(void) {
|
||||
CACHE_REGS
|
||||
UInt size = LOCAL_ExportDBRefHashTableSize;
|
||||
export_dbref_hash_entry_t *p, *newt, *oldt = LOCAL_ExportDBRefHashChain;
|
||||
UInt new_size = size + (size > 1024 ? size : 1024);
|
||||
UInt i;
|
||||
|
||||
newt = (export_dbref_hash_entry_t *)calloc(new_size,sizeof(export_dbref_hash_entry_t));
|
||||
newt = (export_dbref_hash_entry_t *)calloc(new_size,
|
||||
sizeof(export_dbref_hash_entry_t));
|
||||
if (!newt) {
|
||||
return;
|
||||
}
|
||||
p = oldt;
|
||||
for (i = 0 ; i < size ; p++,i++) {
|
||||
for (i = 0; i < size; p++, i++) {
|
||||
DBRef dbr = p->val;
|
||||
export_dbref_hash_entry_t *newp;
|
||||
CELL hash;
|
||||
|
||||
if (!dbr) continue;
|
||||
hash = ((CELL)(dbr))/(2*sizeof(CELL)) % new_size;
|
||||
newp = newt+hash;
|
||||
if (!dbr)
|
||||
continue;
|
||||
hash = ((CELL)(dbr)) / (2 * sizeof(CELL)) % new_size;
|
||||
newp = newt + hash;
|
||||
while (newp->val) {
|
||||
newp++;
|
||||
if (newp == newt+new_size)
|
||||
if (newp == newt + new_size)
|
||||
newp = newt;
|
||||
}
|
||||
newp->val = p->val;
|
||||
|
|
@ -303,30 +297,27 @@ GrowDBRefTable(void) {
|
|||
free(oldt);
|
||||
}
|
||||
|
||||
static void
|
||||
LookupDBRef(DBRef ref)
|
||||
{
|
||||
static void LookupDBRef(DBRef ref) {
|
||||
CACHE_REGS
|
||||
CELL hash = ((CELL)(ref))/(2*sizeof(CELL)) % LOCAL_ExportDBRefHashTableSize;
|
||||
CELL hash =
|
||||
((CELL)(ref)) / (2 * sizeof(CELL)) % LOCAL_ExportDBRefHashTableSize;
|
||||
export_dbref_hash_entry_t *a;
|
||||
|
||||
a = LOCAL_ExportDBRefHashChain+hash;
|
||||
a = LOCAL_ExportDBRefHashChain + hash;
|
||||
while (a->val) {
|
||||
if (a->val == ref) {
|
||||
a->refs++;
|
||||
return;
|
||||
}
|
||||
a++;
|
||||
if (a == LOCAL_ExportDBRefHashChain+LOCAL_ExportDBRefHashTableSize)
|
||||
if (a == LOCAL_ExportDBRefHashChain + LOCAL_ExportDBRefHashTableSize)
|
||||
a = LOCAL_ExportDBRefHashChain;
|
||||
}
|
||||
a->val = ref;
|
||||
a->sz = ((LogUpdClause *)ref)->ClSize;
|
||||
a->refs = 1;
|
||||
LOCAL_ExportDBRefHashTableNum++;
|
||||
if (LOCAL_ExportDBRefHashTableNum >
|
||||
LOCAL_ExportDBRefHashTableSize/2
|
||||
) {
|
||||
if (LOCAL_ExportDBRefHashTableNum > LOCAL_ExportDBRefHashTableSize / 2) {
|
||||
GrowDBRefTable();
|
||||
if (!LOCAL_ExportDBRefHashChain) {
|
||||
return;
|
||||
|
|
@ -334,27 +325,28 @@ LookupDBRef(DBRef ref)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
InitHash(void)
|
||||
{
|
||||
static void InitHash(void) {
|
||||
CACHE_REGS
|
||||
LOCAL_ExportFunctorHashTableNum = 0;
|
||||
LOCAL_ExportFunctorHashTableSize = EXPORT_FUNCTOR_TABLE_SIZE;
|
||||
LOCAL_ExportFunctorHashChain = (export_functor_hash_entry_t *)calloc(LOCAL_ExportFunctorHashTableSize, sizeof(export_functor_hash_entry_t ));
|
||||
LOCAL_ExportFunctorHashChain = (export_functor_hash_entry_t *)calloc(
|
||||
LOCAL_ExportFunctorHashTableSize, sizeof(export_functor_hash_entry_t));
|
||||
LOCAL_ExportAtomHashTableNum = 0;
|
||||
LOCAL_ExportAtomHashTableSize = EXPORT_ATOM_TABLE_SIZE;
|
||||
LOCAL_ExportAtomHashChain = (export_atom_hash_entry_t *)calloc( LOCAL_ExportAtomHashTableSize, sizeof(export_atom_hash_entry_t));
|
||||
LOCAL_ExportAtomHashChain = (export_atom_hash_entry_t *)calloc(
|
||||
LOCAL_ExportAtomHashTableSize, sizeof(export_atom_hash_entry_t));
|
||||
LOCAL_ExportPredEntryHashTableNum = 0;
|
||||
LOCAL_ExportPredEntryHashTableSize = EXPORT_PRED_ENTRY_TABLE_SIZE;
|
||||
LOCAL_ExportPredEntryHashChain = (export_pred_entry_hash_entry_t *)calloc(LOCAL_ExportPredEntryHashTableSize, sizeof(export_pred_entry_hash_entry_t));
|
||||
LOCAL_ExportPredEntryHashChain = (export_pred_entry_hash_entry_t *)calloc(
|
||||
LOCAL_ExportPredEntryHashTableSize,
|
||||
sizeof(export_pred_entry_hash_entry_t));
|
||||
LOCAL_ExportDBRefHashTableNum = 0;
|
||||
LOCAL_ExportDBRefHashTableSize = EXPORT_DBREF_TABLE_SIZE;
|
||||
LOCAL_ExportDBRefHashChain = (export_dbref_hash_entry_t *)calloc(EXPORT_DBREF_TABLE_SIZE, sizeof(export_dbref_hash_entry_t));
|
||||
LOCAL_ExportDBRefHashChain = (export_dbref_hash_entry_t *)calloc(
|
||||
EXPORT_DBREF_TABLE_SIZE, sizeof(export_dbref_hash_entry_t));
|
||||
}
|
||||
|
||||
static void
|
||||
CloseHash(void)
|
||||
{
|
||||
static void CloseHash(void) {
|
||||
CACHE_REGS
|
||||
LOCAL_ExportFunctorHashTableNum = 0;
|
||||
LOCAL_ExportFunctorHashTableSize = 0L;
|
||||
|
|
@ -370,37 +362,27 @@ CloseHash(void)
|
|||
free(LOCAL_ExportDBRefHashChain);
|
||||
}
|
||||
|
||||
static inline Atom
|
||||
AtomAdjust(Atom a)
|
||||
{
|
||||
static inline Atom AtomAdjust(Atom a) {
|
||||
LookupAtom(a);
|
||||
return a;
|
||||
}
|
||||
|
||||
static inline Functor
|
||||
FuncAdjust(Functor f)
|
||||
{
|
||||
static inline Functor FuncAdjust(Functor f) {
|
||||
LookupFunctor(f);
|
||||
return f;
|
||||
}
|
||||
|
||||
|
||||
static inline Term
|
||||
AtomTermAdjust(Term t)
|
||||
{
|
||||
static inline Term AtomTermAdjust(Term t) {
|
||||
LookupAtom(AtomOfTerm(t));
|
||||
return t;
|
||||
}
|
||||
|
||||
static inline Term
|
||||
TermToGlobalOrAtomAdjust(Term t)
|
||||
{
|
||||
static inline Term TermToGlobalOrAtomAdjust(Term t) {
|
||||
if (t && IsAtomTerm(t))
|
||||
return AtomTermAdjust(t);
|
||||
return t;
|
||||
}
|
||||
|
||||
|
||||
#define IsOldCode(P) FALSE
|
||||
#define IsOldCodeCellPtr(P) FALSE
|
||||
#define IsOldDelay(P) FALSE
|
||||
|
|
@ -430,28 +412,22 @@ TermToGlobalOrAtomAdjust(Term t)
|
|||
#define IntegerInCodeAdjust(P)
|
||||
#define OpcodeAdjust(P) (P)
|
||||
|
||||
static inline Term
|
||||
ModuleAdjust(Term t)
|
||||
{
|
||||
if (!t) return t;
|
||||
static inline Term ModuleAdjust(Term t) {
|
||||
if (!t)
|
||||
return t;
|
||||
return AtomTermAdjust(t);
|
||||
}
|
||||
|
||||
static inline PredEntry *
|
||||
PredEntryAdjust(PredEntry *pe)
|
||||
{
|
||||
static inline PredEntry *PredEntryAdjust(PredEntry *pe) {
|
||||
LookupPredEntry(pe);
|
||||
return pe;
|
||||
}
|
||||
|
||||
static inline PredEntry *
|
||||
PtoPredAdjust(PredEntry *pe)
|
||||
{
|
||||
static inline PredEntry *PtoPredAdjust(PredEntry *pe) {
|
||||
LookupPredEntry(pe);
|
||||
return pe;
|
||||
}
|
||||
|
||||
|
||||
#define ExternalFunctionAdjust(P) (P)
|
||||
#define DBRecordAdjust(P) (P)
|
||||
#define ModEntryPtrAdjust(P) (P)
|
||||
|
|
@ -468,10 +444,8 @@ PtoPredAdjust(PredEntry *pe)
|
|||
#define DelayAdjust(P) (P)
|
||||
#define GlobalAdjust(P) (P)
|
||||
|
||||
#define DBRefAdjust(P,DoRef) DBRefAdjust__(P PASS_REGS)
|
||||
static inline DBRef
|
||||
DBRefAdjust__ (DBRef dbt USES_REGS)
|
||||
{
|
||||
#define DBRefAdjust(P, DoRef) DBRefAdjust__(P PASS_REGS)
|
||||
static inline DBRef DBRefAdjust__(DBRef dbt USES_REGS) {
|
||||
LookupDBRef(dbt);
|
||||
return dbt;
|
||||
}
|
||||
|
|
@ -514,67 +488,48 @@ DBRefAdjust__ (DBRef dbt USES_REGS)
|
|||
|
||||
#define rehash(oldcode, NOfE, KindOfEntries)
|
||||
|
||||
|
||||
static void RestoreFlags( UInt NFlags )
|
||||
{
|
||||
}
|
||||
static void RestoreFlags(UInt NFlags) {}
|
||||
|
||||
#include "rheap.h"
|
||||
|
||||
static void
|
||||
RestoreHashPreds( USES_REGS1 )
|
||||
{
|
||||
}
|
||||
static void RestoreHashPreds(USES_REGS1) {}
|
||||
|
||||
static void RestoreAtomList(Atom atm USES_REGS) {}
|
||||
|
||||
static void
|
||||
RestoreAtomList(Atom atm USES_REGS)
|
||||
{
|
||||
}
|
||||
|
||||
static size_t save_bytes(FILE *stream, void *ptr, size_t sz)
|
||||
{
|
||||
static size_t save_bytes(FILE *stream, void *ptr, size_t sz) {
|
||||
return fwrite(ptr, sz, 1, stream);
|
||||
}
|
||||
|
||||
static size_t save_byte(FILE *stream, int byte)
|
||||
{
|
||||
static size_t save_byte(FILE *stream, int byte) {
|
||||
fputc(byte, stream);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static size_t save_bits16(FILE *stream, BITS16 val)
|
||||
{
|
||||
static size_t save_bits16(FILE *stream, BITS16 val) {
|
||||
BITS16 v = val;
|
||||
return save_bytes(stream, &v, sizeof(BITS16));
|
||||
}
|
||||
|
||||
static size_t save_UInt(FILE *stream, UInt val)
|
||||
{
|
||||
static size_t save_UInt(FILE *stream, UInt val) {
|
||||
UInt v = val;
|
||||
return save_bytes(stream, &v, sizeof(UInt));
|
||||
}
|
||||
|
||||
static size_t save_Int(FILE *stream, Int val)
|
||||
{
|
||||
static size_t save_Int(FILE *stream, Int val) {
|
||||
Int v = val;
|
||||
return save_bytes(stream, &v, sizeof(Int));
|
||||
}
|
||||
|
||||
static size_t save_tag(FILE *stream, qlf_tag_t tag)
|
||||
{
|
||||
static size_t save_tag(FILE *stream, qlf_tag_t tag) {
|
||||
return save_byte(stream, tag);
|
||||
}
|
||||
|
||||
static size_t save_predFlags(FILE *stream, pred_flags_t predFlags)
|
||||
{
|
||||
static size_t save_predFlags(FILE *stream, pred_flags_t predFlags) {
|
||||
pred_flags_t v = predFlags;
|
||||
return save_bytes(stream, &v, sizeof(pred_flags_t));
|
||||
}
|
||||
|
||||
static int
|
||||
SaveHash(FILE *stream)
|
||||
{
|
||||
static int SaveHash(FILE *stream) {
|
||||
CACHE_REGS
|
||||
UInt i;
|
||||
/* first, current opcodes */
|
||||
|
|
@ -582,25 +537,26 @@ SaveHash(FILE *stream)
|
|||
save_UInt(stream, (UInt)&ARG1);
|
||||
CHECK(save_tag(stream, QLY_START_OPCODES));
|
||||
save_Int(stream, _std_top);
|
||||
for (i= 0; i <= _std_top; i++) {
|
||||
for (i = 0; i <= _std_top; i++) {
|
||||
save_UInt(stream, (UInt)Yap_opcode(i));
|
||||
}
|
||||
CHECK(save_tag(stream, QLY_START_ATOMS));
|
||||
CHECK(save_UInt(stream, LOCAL_ExportAtomHashTableNum));
|
||||
for (i = 0; i < LOCAL_ExportAtomHashTableSize; i++) {
|
||||
export_atom_hash_entry_t *a = LOCAL_ExportAtomHashChain+i;
|
||||
export_atom_hash_entry_t *a = LOCAL_ExportAtomHashChain + i;
|
||||
if (a->val) {
|
||||
Atom at = a->val;
|
||||
CHECK(save_UInt(stream, (UInt)at));
|
||||
CHECK(save_tag(stream, QLY_ATOM));
|
||||
CHECK(save_UInt(stream, strlen((char *)RepAtom(at)->StrOfAE)));
|
||||
CHECK(save_bytes(stream, (char *)at->StrOfAE, (strlen((char *)at->StrOfAE)+1)*sizeof(char)));
|
||||
CHECK(save_bytes(stream, (char *)at->StrOfAE,
|
||||
(strlen((char *)at->StrOfAE) + 1) * sizeof(char)));
|
||||
}
|
||||
}
|
||||
save_tag(stream, QLY_START_FUNCTORS);
|
||||
save_UInt(stream, LOCAL_ExportFunctorHashTableNum);
|
||||
for (i = 0; i < LOCAL_ExportFunctorHashTableSize; i++) {
|
||||
export_functor_hash_entry_t *f = LOCAL_ExportFunctorHashChain+i;
|
||||
export_functor_hash_entry_t *f = LOCAL_ExportFunctorHashChain + i;
|
||||
if (!(f->val))
|
||||
continue;
|
||||
CHECK(save_UInt(stream, (UInt)(f->val)));
|
||||
|
|
@ -610,7 +566,7 @@ SaveHash(FILE *stream)
|
|||
save_tag(stream, QLY_START_PRED_ENTRIES);
|
||||
save_UInt(stream, LOCAL_ExportPredEntryHashTableNum);
|
||||
for (i = 0; i < LOCAL_ExportPredEntryHashTableSize; i++) {
|
||||
export_pred_entry_hash_entry_t *p = LOCAL_ExportPredEntryHashChain+i;
|
||||
export_pred_entry_hash_entry_t *p = LOCAL_ExportPredEntryHashChain + i;
|
||||
if (!(p->val))
|
||||
continue;
|
||||
CHECK(save_UInt(stream, (UInt)(p->val)));
|
||||
|
|
@ -621,7 +577,7 @@ SaveHash(FILE *stream)
|
|||
save_tag(stream, QLY_START_DBREFS);
|
||||
save_UInt(stream, LOCAL_ExportDBRefHashTableNum);
|
||||
for (i = 0; i < LOCAL_ExportDBRefHashTableSize; i++) {
|
||||
export_dbref_hash_entry_t *p = LOCAL_ExportDBRefHashChain+i;
|
||||
export_dbref_hash_entry_t *p = LOCAL_ExportDBRefHashChain + i;
|
||||
if (p->val) {
|
||||
CHECK(save_UInt(stream, (UInt)(p->val)));
|
||||
CHECK(save_UInt(stream, p->sz));
|
||||
|
|
@ -633,8 +589,7 @@ SaveHash(FILE *stream)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static size_t
|
||||
save_clauses(FILE *stream, PredEntry *pp) {
|
||||
static size_t save_clauses(FILE *stream, PredEntry *pp) {
|
||||
yamop *FirstC, *LastC;
|
||||
|
||||
FirstC = pp->cs.p_code.FirstClause;
|
||||
|
|
@ -674,7 +629,8 @@ save_clauses(FILE *stream, PredEntry *pp) {
|
|||
CHECK(save_UInt(stream, (UInt)cl));
|
||||
CHECK(save_UInt(stream, size));
|
||||
CHECK(save_bytes(stream, dcl, size));
|
||||
if (cl == LastC) return 1;
|
||||
if (cl == LastC)
|
||||
return 1;
|
||||
cl = NextDynamicClause(cl);
|
||||
} while (TRUE);
|
||||
} else {
|
||||
|
|
@ -689,15 +645,15 @@ save_clauses(FILE *stream, PredEntry *pp) {
|
|||
CHECK(save_UInt(stream, (UInt)cl));
|
||||
CHECK(save_UInt(stream, size));
|
||||
CHECK(save_bytes(stream, cl, size));
|
||||
if (cl->ClCode == LastC) return 1;
|
||||
if (cl->ClCode == LastC)
|
||||
return 1;
|
||||
cl = cl->ClNext;
|
||||
} while (TRUE);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
static size_t
|
||||
save_pred(FILE *stream, PredEntry *ap) {
|
||||
static size_t save_pred(FILE *stream, PredEntry *ap) {
|
||||
CHECK(save_UInt(stream, (UInt)ap));
|
||||
CHECK(save_predFlags(stream, ap->PredFlags));
|
||||
if (ap->PredFlags & ForeignPredFlags)
|
||||
|
|
@ -708,19 +664,17 @@ save_pred(FILE *stream, PredEntry *ap) {
|
|||
return save_clauses(stream, ap);
|
||||
}
|
||||
|
||||
static int
|
||||
clean_pred(PredEntry *pp USES_REGS) {
|
||||
static int clean_pred(PredEntry *pp USES_REGS) {
|
||||
if (pp->PredFlags & ForeignPredFlags) {
|
||||
return true;
|
||||
} else {
|
||||
CleanClauses(pp->cs.p_code.FirstClause, pp->cs.p_code.LastClause, pp PASS_REGS);
|
||||
CleanClauses(pp->cs.p_code.FirstClause, pp->cs.p_code.LastClause,
|
||||
pp PASS_REGS);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
static size_t
|
||||
mark_pred(PredEntry *ap)
|
||||
{
|
||||
static size_t mark_pred(PredEntry *ap) {
|
||||
CACHE_REGS
|
||||
if (ap->ModuleOfPred != IDB_MODULE) {
|
||||
if (ap->ArityOfPE) {
|
||||
|
|
@ -735,7 +689,7 @@ mark_pred(PredEntry *ap)
|
|||
FuncAdjust(ap->FunctorOfPred);
|
||||
}
|
||||
}
|
||||
if (!(ap->PredFlags & (MultiFileFlag|NumberDBPredFlag)) &&
|
||||
if (!(ap->PredFlags & (MultiFileFlag | NumberDBPredFlag)) &&
|
||||
ap->src.OwnerFile) {
|
||||
AtomAdjust(ap->src.OwnerFile);
|
||||
}
|
||||
|
|
@ -743,8 +697,7 @@ mark_pred(PredEntry *ap)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static size_t
|
||||
mark_ops(FILE *stream, Term mod) {
|
||||
static size_t mark_ops(FILE *stream, Term mod) {
|
||||
OpEntry *op = OpList;
|
||||
while (op) {
|
||||
if (!mod || op->OpModule == mod) {
|
||||
|
|
@ -757,8 +710,7 @@ mark_ops(FILE *stream, Term mod) {
|
|||
return 1;
|
||||
}
|
||||
|
||||
static size_t
|
||||
save_ops(FILE *stream, Term mod) {
|
||||
static size_t save_ops(FILE *stream, Term mod) {
|
||||
OpEntry *op = OpList;
|
||||
while (op) {
|
||||
if (!mod || op->OpModule == mod) {
|
||||
|
|
@ -775,19 +727,19 @@ save_ops(FILE *stream, Term mod) {
|
|||
return 1;
|
||||
}
|
||||
|
||||
static int
|
||||
save_header(FILE *stream, char type[])
|
||||
{
|
||||
char msg[256];
|
||||
static int save_header(FILE *stream, char type[]) {
|
||||
char msg[256 * 16];
|
||||
|
||||
sprintf(msg, "#!/bin/sh\nexec_dir=${YAPBINDIR:-%s}\nexec $exec_dir/yap $0 \"$@\"\n%s %s\n", YAP_BINDIR, type, YAP_FULL_VERSION);
|
||||
return save_bytes(stream, msg, strlen(msg)+1);
|
||||
sprintf(msg,
|
||||
"#!/bin/sh\nexec_dir=${YAPBINDIR:-%s}\nexec $exec_dir/yap $0 "
|
||||
"\"$@\"\n%s %s\n",
|
||||
YAP_BINDIR, type, YAP_FULL_VERSION);
|
||||
return save_bytes(stream, msg, strlen(msg) + 1);
|
||||
}
|
||||
|
||||
static size_t
|
||||
save_module(FILE *stream, Term mod) {
|
||||
static size_t save_module(FILE *stream, Term mod) {
|
||||
PredEntry *ap = Yap_ModulePred(mod);
|
||||
save_header( stream, "saved module," );
|
||||
save_header(stream, "saved module,");
|
||||
InitHash();
|
||||
ModuleAdjust(mod);
|
||||
while (ap) {
|
||||
|
|
@ -813,12 +765,11 @@ save_module(FILE *stream, Term mod) {
|
|||
return 1;
|
||||
}
|
||||
|
||||
static size_t
|
||||
save_program(FILE *stream) {
|
||||
static size_t save_program(FILE *stream) {
|
||||
ModEntry *me = CurrentModules;
|
||||
|
||||
InitHash();
|
||||
save_header( stream, "saved state," );
|
||||
save_header(stream, "saved state,");
|
||||
/* should we allow the user to see hidden predicates? */
|
||||
while (me) {
|
||||
PredEntry *pp;
|
||||
|
|
@ -826,7 +777,7 @@ save_program(FILE *stream) {
|
|||
AtomAdjust(me->AtomOfME);
|
||||
while (pp != NULL) {
|
||||
#if DEBUG
|
||||
// Yap_PrintPredName( pp );
|
||||
// Yap_PrintPredName( pp );
|
||||
#endif
|
||||
pp = PredEntryAdjust(pp);
|
||||
CHECK(mark_pred(pp));
|
||||
|
|
@ -858,12 +809,11 @@ save_program(FILE *stream) {
|
|||
return 1;
|
||||
}
|
||||
|
||||
static size_t
|
||||
save_file(FILE *stream, Atom FileName) {
|
||||
static size_t save_file(FILE *stream, Atom FileName) {
|
||||
ModEntry *me = CurrentModules;
|
||||
|
||||
InitHash();
|
||||
save_header( stream, "saved file," );
|
||||
save_header(stream, "saved file,");
|
||||
/* should we allow the user to see hidden predicates? */
|
||||
while (me) {
|
||||
PredEntry *pp;
|
||||
|
|
@ -872,9 +822,9 @@ save_file(FILE *stream, Atom FileName) {
|
|||
while (pp != NULL) {
|
||||
pp = PredEntryAdjust(pp);
|
||||
if (pp &&
|
||||
!(pp->PredFlags & (MultiFileFlag|NumberDBPredFlag|AtomDBPredFlag|CPredFlag|AsmPredFlag|UserCPredFlag)) &&
|
||||
pp->ModuleOfPred != IDB_MODULE &&
|
||||
pp->src.OwnerFile == FileName) {
|
||||
!(pp->PredFlags & (MultiFileFlag | NumberDBPredFlag | AtomDBPredFlag |
|
||||
CPredFlag | AsmPredFlag | UserCPredFlag)) &&
|
||||
pp->ModuleOfPred != IDB_MODULE && pp->src.OwnerFile == FileName) {
|
||||
CHECK(mark_pred(pp));
|
||||
}
|
||||
pp = pp->NextPredOfModule;
|
||||
|
|
@ -893,7 +843,8 @@ save_file(FILE *stream, Atom FileName) {
|
|||
CHECK(save_UInt(stream, (UInt)MkAtomTerm(me->AtomOfME)));
|
||||
while (pp != NULL) {
|
||||
if (pp &&
|
||||
!(pp->PredFlags & (MultiFileFlag|NumberDBPredFlag|AtomDBPredFlag|CPredFlag|AsmPredFlag|UserCPredFlag)) &&
|
||||
!(pp->PredFlags & (MultiFileFlag | NumberDBPredFlag | AtomDBPredFlag |
|
||||
CPredFlag | AsmPredFlag | UserCPredFlag)) &&
|
||||
pp->src.OwnerFile == FileName) {
|
||||
CHECK(save_tag(stream, QLY_START_PREDICATE));
|
||||
CHECK(save_pred(stream, pp));
|
||||
|
|
@ -909,78 +860,72 @@ save_file(FILE *stream, Atom FileName) {
|
|||
return 1;
|
||||
}
|
||||
|
||||
static Int
|
||||
qsave_module_preds( USES_REGS1 )
|
||||
{
|
||||
static Int qsave_module_preds(USES_REGS1) {
|
||||
FILE *stream;
|
||||
Term tmod = Deref(ARG2);
|
||||
Term t1 = Deref(ARG1);
|
||||
|
||||
if (IsVarTerm(t1)) {
|
||||
Yap_Error(INSTANTIATION_ERROR,t1,"save_module/3");
|
||||
Yap_Error(INSTANTIATION_ERROR, t1, "save_module/3");
|
||||
return FALSE;
|
||||
}
|
||||
if (!IsAtomTerm(t1)) {
|
||||
Yap_Error(TYPE_ERROR_ATOM,t1,"save_module/3");
|
||||
return(FALSE);
|
||||
Yap_Error(TYPE_ERROR_ATOM, t1, "save_module/3");
|
||||
return (FALSE);
|
||||
}
|
||||
if (!(stream = Yap_GetOutputStream(t1, "save_module") )){
|
||||
if (!(stream = Yap_GetOutputStream(t1, "save_module"))) {
|
||||
return FALSE;
|
||||
}
|
||||
if (IsVarTerm(tmod)) {
|
||||
Yap_Error(INSTANTIATION_ERROR,tmod,"save_module/2");
|
||||
Yap_Error(INSTANTIATION_ERROR, tmod, "save_module/2");
|
||||
return FALSE;
|
||||
}
|
||||
if (!IsAtomTerm(tmod)) {
|
||||
Yap_Error(TYPE_ERROR_ATOM,tmod,"save_module/2");
|
||||
Yap_Error(TYPE_ERROR_ATOM, tmod, "save_module/2");
|
||||
return FALSE;
|
||||
}
|
||||
return save_module(stream, tmod) != 0;
|
||||
}
|
||||
|
||||
static Int
|
||||
qsave_program( USES_REGS1 )
|
||||
{
|
||||
static Int qsave_program(USES_REGS1) {
|
||||
FILE *stream;
|
||||
Term t1 = Deref(ARG1);
|
||||
|
||||
if (!(stream = Yap_GetOutputStream(t1,"save_program")) ) {
|
||||
if (!(stream = Yap_GetOutputStream(t1, "save_program"))) {
|
||||
return FALSE;
|
||||
}
|
||||
return save_program(stream) != 0;
|
||||
}
|
||||
|
||||
static Int
|
||||
qsave_file( USES_REGS1 )
|
||||
{
|
||||
static Int qsave_file(USES_REGS1) {
|
||||
FILE *stream;
|
||||
Term t1 = Deref(ARG1);
|
||||
Term tfile = Deref(ARG2);
|
||||
|
||||
if (!(stream = Yap_GetOutputStream(t1, "save_file/2") ) ) {
|
||||
if (!(stream = Yap_GetOutputStream(t1, "save_file/2"))) {
|
||||
return FALSE;
|
||||
}
|
||||
if (IsVarTerm(tfile)) {
|
||||
Yap_Error(INSTANTIATION_ERROR,tfile,"save_file/2");
|
||||
Yap_Error(INSTANTIATION_ERROR, tfile, "save_file/2");
|
||||
return FALSE;
|
||||
}
|
||||
if (!IsAtomTerm(tfile)) {
|
||||
Yap_Error(TYPE_ERROR_ATOM,tfile,"save_file/2");
|
||||
Yap_Error(TYPE_ERROR_ATOM, tfile, "save_file/2");
|
||||
return FALSE;
|
||||
}
|
||||
return save_file(stream, AtomOfTerm(tfile) ) != 0;
|
||||
return save_file(stream, AtomOfTerm(tfile)) != 0;
|
||||
}
|
||||
|
||||
void Yap_InitQLY(void)
|
||||
{
|
||||
Yap_InitCPred("$qsave_module_preds", 2, qsave_module_preds, SyncPredFlag|UserCPredFlag);
|
||||
Yap_InitCPred("$qsave_program", 1, qsave_program, SyncPredFlag|UserCPredFlag);
|
||||
Yap_InitCPred("$qsave_file_preds", 2, qsave_file, SyncPredFlag|UserCPredFlag);
|
||||
void Yap_InitQLY(void) {
|
||||
Yap_InitCPred("$qsave_module_preds", 2, qsave_module_preds,
|
||||
SyncPredFlag | UserCPredFlag);
|
||||
Yap_InitCPred("$qsave_program", 1, qsave_program,
|
||||
SyncPredFlag | UserCPredFlag);
|
||||
Yap_InitCPred("$qsave_file_preds", 2, qsave_file,
|
||||
SyncPredFlag | UserCPredFlag);
|
||||
if (FALSE) {
|
||||
restore_codes();
|
||||
}
|
||||
}
|
||||
|
||||
/// @}
|
||||
|
||||
|
||||
|
|
|
|||
28
H/Foreign.h
28
H/Foreign.h
|
|
@ -1,16 +1,16 @@
|
|||
/*************************************************************************
|
||||
* *
|
||||
* YAP Prolog *
|
||||
* *
|
||||
* Yap Prolog was developed at NCCUP - Universidade do Porto *
|
||||
* *
|
||||
* Copyright L.Damas, V.S.Costa and Universidade do Porto 1985-97 *
|
||||
* *
|
||||
**************************************************************************
|
||||
* *
|
||||
* File: Foreign.h *
|
||||
* comments: header file for dynamic loading routines *
|
||||
*************************************************************************/
|
||||
* *
|
||||
* YAP Prolog *
|
||||
* *
|
||||
* Yap Prolog was developed at NCCUP - Universidade do Porto *
|
||||
* *
|
||||
* Copyright L.Damas, V.S.Costa and Universidade do Porto 1985-97 *
|
||||
* *
|
||||
**************************************************************************
|
||||
* *
|
||||
* File: Foreign.h *
|
||||
* comments: header file for dynamic loading routines *
|
||||
*************************************************************************/
|
||||
|
||||
#define NO_DYN 1
|
||||
|
||||
|
|
@ -46,6 +46,9 @@
|
|||
|
||||
*/
|
||||
|
||||
#include "Yap.h"
|
||||
#include "YapHeap.h"
|
||||
|
||||
#ifdef _AIX
|
||||
#undef NO_DYN
|
||||
#endif /* __AIX */
|
||||
|
|
@ -115,7 +118,6 @@ typedef struct ForeignLoadItem {
|
|||
|
||||
typedef void (*YapInitProc)(void);
|
||||
|
||||
|
||||
void *Yap_LoadForeignFile(char *, int);
|
||||
int Yap_CallForeignFile(void *, char *);
|
||||
int Yap_CloseForeignFile(void *);
|
||||
|
|
|
|||
4
H/Yap.h
4
H/Yap.h
|
|
@ -822,6 +822,8 @@ inline static void LOG0(const char *f, int l, const char *fmt, ...) {
|
|||
|
||||
extern bool Yap_embedded, Yap_Server;
|
||||
|
||||
#include "YapText.h"
|
||||
|
||||
#endif /* YAP_H */
|
||||
|
||||
#include "YapText.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,9 @@
|
|||
#ifndef HEAP_H
|
||||
#define HEAP_H 1
|
||||
|
||||
#include "Atoms.h"
|
||||
#include "Yap.h"
|
||||
|
||||
#if LOW_PROF
|
||||
#include <stdio.h>
|
||||
#endif
|
||||
|
|
|
|||
480
H/rheap.h
480
H/rheap.h
|
|
@ -1,243 +1,251 @@
|
|||
/*************************************************************************
|
||||
* *
|
||||
* YAP Prolog *
|
||||
* *
|
||||
* Yap Prolog was developed at NCCUP - Universidade do Porto *
|
||||
* *
|
||||
* Copyright L.Damas, V.S.Costa and Universidade do Porto 1985-1997 *
|
||||
* *
|
||||
**************************************************************************
|
||||
* *
|
||||
* File: rheap.h *
|
||||
* comments: walk through heap code *
|
||||
* *
|
||||
* Last rev: $Date: 2008-08-07 20:51:23 $,$Author: vsc $
|
||||
**
|
||||
* $Log: not supported by cvs2svn $
|
||||
* Revision 1.99 2008/07/22 23:34:49 vsc
|
||||
* SWI and module fixes
|
||||
*
|
||||
* Revision 1.98 2008/05/12 22:31:37 vsc
|
||||
* fix previous fixes
|
||||
*
|
||||
* Revision 1.97 2008/05/12 14:04:23 vsc
|
||||
* updates to restore
|
||||
*
|
||||
* Revision 1.96 2008/04/11 16:58:17 ricroc
|
||||
* yapor: seq_def initialization
|
||||
*
|
||||
* Revision 1.95 2008/04/06 12:06:48 vsc
|
||||
* more small fixes
|
||||
*
|
||||
* Revision 1.94 2008/04/06 11:53:02 vsc
|
||||
* fix some restore bugs
|
||||
*
|
||||
* Revision 1.93 2008/04/04 09:10:02 vsc
|
||||
* restore was restoring twice
|
||||
*
|
||||
* Revision 1.92 2008/04/03 11:34:47 vsc
|
||||
* fix restorebb in cases entry key is not an atom (obs from Nicos
|
||||
* Angelopoulos)
|
||||
*
|
||||
* Revision 1.91 2008/04/01 15:31:43 vsc
|
||||
* more saved state fixes
|
||||
*
|
||||
* Revision 1.90 2008/04/01 14:09:43 vsc
|
||||
* improve restore
|
||||
*
|
||||
* Revision 1.89 2008/04/01 09:41:05 vsc
|
||||
* more fixes to restore
|
||||
*
|
||||
* Revision 1.88 2008/04/01 08:42:46 vsc
|
||||
* fix restore and small VISTA thingies
|
||||
*
|
||||
* Revision 1.87 2008/03/25 22:03:14 vsc
|
||||
* fix some icc warnings
|
||||
*
|
||||
* Revision 1.86 2008/03/25 16:45:53 vsc
|
||||
* make or-parallelism compile again
|
||||
*
|
||||
* Revision 1.85 2008/02/12 17:03:52 vsc
|
||||
* SWI-portability changes
|
||||
*
|
||||
* Revision 1.84 2008/02/07 21:39:51 vsc
|
||||
* fix case where predicate is for an integer (DBEntry).
|
||||
*
|
||||
* Revision 1.83 2008/01/23 17:57:55 vsc
|
||||
* valgrind it!
|
||||
* enable atom garbage collection.
|
||||
*
|
||||
* Revision 1.82 2007/12/05 12:17:23 vsc
|
||||
* improve JT
|
||||
* fix graph compatibility with SICStus
|
||||
* re-export declaration.
|
||||
*
|
||||
* Revision 1.81 2007/11/26 23:43:09 vsc
|
||||
* fixes to support threads and assert correctly, even if inefficiently.
|
||||
*
|
||||
* Revision 1.80 2007/11/07 09:35:53 vsc
|
||||
* small fix
|
||||
*
|
||||
* Revision 1.79 2007/11/07 09:25:27 vsc
|
||||
* speedup meta-calls
|
||||
*
|
||||
* Revision 1.78 2007/11/06 17:02:12 vsc
|
||||
* compile ground terms away.
|
||||
*
|
||||
* Revision 1.77 2007/10/10 09:44:24 vsc
|
||||
* some more fixes to make YAP swi compatible
|
||||
* fix absolute_file_name (again)
|
||||
* fix setarg
|
||||
*
|
||||
* Revision 1.76 2007/09/28 23:18:17 vsc
|
||||
* handle learning from interpretations.
|
||||
*
|
||||
* Revision 1.75 2007/04/10 22:13:21 vsc
|
||||
* fix max modules limitation
|
||||
*
|
||||
* Revision 1.74 2007/03/22 11:12:21 vsc
|
||||
* make sure that YAP_Restart does not restart a failed goal.
|
||||
*
|
||||
* Revision 1.73 2007/02/18 00:26:36 vsc
|
||||
* fix atom garbage collector (although it is still off by default)
|
||||
* make valgrind feel better
|
||||
*
|
||||
* Revision 1.72 2007/01/08 08:27:19 vsc
|
||||
* fix restore (Trevor)
|
||||
* make indexing a bit faster on IDB
|
||||
*
|
||||
* Revision 1.71 2006/11/27 17:42:03 vsc
|
||||
* support for UNICODE, and other bug fixes.
|
||||
*
|
||||
* Revision 1.70 2006/08/25 19:50:35 vsc
|
||||
* global data structures
|
||||
*
|
||||
* Revision 1.69 2006/08/22 16:12:46 vsc
|
||||
* global variables
|
||||
*
|
||||
* Revision 1.68 2006/08/02 18:18:30 vsc
|
||||
* preliminary support for readutil library (SWI compatible).
|
||||
*
|
||||
* Revision 1.67 2006/05/17 18:38:11 vsc
|
||||
* make system library use true file name
|
||||
*
|
||||
* Revision 1.66 2006/04/28 15:48:33 vsc
|
||||
* do locking on streams
|
||||
*
|
||||
* Revision 1.65 2006/04/28 13:23:23 vsc
|
||||
* fix number of overflow bugs affecting threaded version
|
||||
* make current_op faster.
|
||||
*
|
||||
* Revision 1.64 2006/03/22 20:07:28 vsc
|
||||
* take better care of zombies
|
||||
*
|
||||
* Revision 1.63 2006/03/06 14:04:56 vsc
|
||||
* fixes to garbage collector
|
||||
* fixes to debugger
|
||||
*
|
||||
* Revision 1.62 2006/02/24 14:03:42 vsc
|
||||
* fix refs to old LogUpd implementation (pre 5).
|
||||
*
|
||||
* Revision 1.61 2006/01/02 02:16:18 vsc
|
||||
* support new interface between YAP and GMP, so that we don't rely on our own
|
||||
* allocation routines.
|
||||
* Several big fixes.
|
||||
*
|
||||
* Revision 1.60 2005/12/17 03:25:39 vsc
|
||||
* major changes to support online event-based profiling
|
||||
* improve error discovery and restart on scanner.
|
||||
*
|
||||
* Revision 1.59 2005/12/05 17:16:11 vsc
|
||||
* write_depth/3
|
||||
* overflow handlings and garbage collection
|
||||
* Several ipdates to CLPBN
|
||||
* dif/2 could be broken in the presence of attributed variables.
|
||||
*
|
||||
* Revision 1.58 2005/11/23 03:01:33 vsc
|
||||
* fix several bugs in save/restore.b
|
||||
*
|
||||
* Revision 1.57 2005/10/28 17:38:50 vsc
|
||||
* sveral updates
|
||||
*
|
||||
* Revision 1.56 2005/10/21 16:09:03 vsc
|
||||
* SWI compatible module only operators
|
||||
*
|
||||
* Revision 1.55 2005/10/19 19:00:48 vsc
|
||||
* extend arrays with nb_terms so that we can implement nb_ builtins
|
||||
* correctly.
|
||||
*
|
||||
* Revision 1.54 2005/09/09 17:24:39 vsc
|
||||
* a new and hopefully much better implementation of atts.
|
||||
*
|
||||
* Revision 1.53 2005/08/01 15:40:38 ricroc
|
||||
* TABLING NEW: better support for incomplete tabling
|
||||
*
|
||||
* Revision 1.52 2005/07/06 19:34:11 ricroc
|
||||
* TABLING: answers for completed calls can now be obtained by loading (new
|
||||
*option) or executing (default) them from the trie data structure.
|
||||
*
|
||||
* Revision 1.51 2005/07/06 15:10:15 vsc
|
||||
* improvements to compiler: merged instructions and fixes for ->
|
||||
*
|
||||
* Revision 1.50 2005/06/01 13:53:46 vsc
|
||||
* improve bb routines to use the DB efficiently
|
||||
* change interface between DB and BB.
|
||||
*
|
||||
* Revision 1.49 2005/05/30 03:26:37 vsc
|
||||
* add some atom gc fixes
|
||||
*
|
||||
* Revision 1.48 2005/01/04 02:50:21 vsc
|
||||
* - allow MegaClauses with blobs
|
||||
* - change Diffs to be thread specific
|
||||
* - include Christian's updates
|
||||
*
|
||||
* Revision 1.47 2004/12/02 06:06:47 vsc
|
||||
* fix threads so that they at least start
|
||||
* allow error handling to work with threads
|
||||
* replace heap_base by Yap_heap_base, according to Yap's convention for globals.
|
||||
*
|
||||
* Revision 1.46 2004/11/23 21:16:21 vsc
|
||||
* A few extra fixes for saved states.
|
||||
*
|
||||
* Revision 1.45 2004/10/26 20:16:18 vsc
|
||||
* More bug fixes for overflow handling
|
||||
*
|
||||
* Revision 1.44 2004/10/06 16:55:47 vsc
|
||||
* change configure to support big mem configs
|
||||
* get rid of extra globals
|
||||
* fix trouble with multifile preds
|
||||
*
|
||||
* Revision 1.43 2004/09/27 20:45:04 vsc
|
||||
* Mega clauses
|
||||
* Fixes to sizeof(expand_clauses) which was being overestimated
|
||||
* Fixes to profiling+indexing
|
||||
* Fixes to reallocation of memory after restoring
|
||||
* Make sure all clauses, even for C, end in _Ystop
|
||||
* Don't reuse space for Streams
|
||||
* Fix Stream_F on StreaNo+1
|
||||
*
|
||||
* Revision 1.42 2004/06/05 03:37:00 vsc
|
||||
* coroutining is now a part of attvars.
|
||||
* some more fixes.
|
||||
*
|
||||
* Revision 1.41 2004/04/29 03:45:50 vsc
|
||||
* fix garbage collection in execute_tail
|
||||
*
|
||||
* Revision 1.40 2004/03/31 01:03:10 vsc
|
||||
* support expand group of clauses
|
||||
*
|
||||
* Revision 1.39 2004/03/19 11:35:42 vsc
|
||||
* trim_trail for default machine
|
||||
* be more aggressive about try-retry-trust chains.
|
||||
* - handle cases where block starts with a wait
|
||||
* - don't use _killed instructions, just let the thing rot by itself.
|
||||
* *
|
||||
* *
|
||||
*************************************************************************/
|
||||
* *
|
||||
* YAP Prolog *
|
||||
* *
|
||||
* Yap Prolog was developed at NCCUP - Universidade do Porto *
|
||||
* *
|
||||
* Copyright L.Damas, V.S.Costa and Universidade do Porto 1985-1997 *
|
||||
* *
|
||||
**************************************************************************
|
||||
* *
|
||||
* File: rheap.h *
|
||||
* comments: walk through heap code *
|
||||
* *
|
||||
* Last rev: $Date: 2008-08-07 20:51:23 $,$Author: vsc $
|
||||
**
|
||||
* $Log: not supported by cvs2svn $
|
||||
* Revision 1.99 2008/07/22 23:34:49 vsc
|
||||
* SWI and module fixes
|
||||
*
|
||||
* Revision 1.98 2008/05/12 22:31:37 vsc
|
||||
* fix previous fixes
|
||||
*
|
||||
* Revision 1.97 2008/05/12 14:04:23 vsc
|
||||
* updates to restore
|
||||
*
|
||||
* Revision 1.96 2008/04/11 16:58:17 ricroc
|
||||
* yapor: seq_def initialization
|
||||
*
|
||||
* Revision 1.95 2008/04/06 12:06:48 vsc
|
||||
* more small fixes
|
||||
*
|
||||
* Revision 1.94 2008/04/06 11:53:02 vsc
|
||||
* fix some restore bugs
|
||||
*
|
||||
* Revision 1.93 2008/04/04 09:10:02 vsc
|
||||
* restore was restoring twice
|
||||
*
|
||||
* Revision 1.92 2008/04/03 11:34:47 vsc
|
||||
* fix restorebb in cases entry key is not an atom (obs from Nicos
|
||||
* Angelopoulos)
|
||||
*
|
||||
* Revision 1.91 2008/04/01 15:31:43 vsc
|
||||
* more saved state fixes
|
||||
*
|
||||
* Revision 1.90 2008/04/01 14:09:43 vsc
|
||||
* improve restore
|
||||
*
|
||||
* Revision 1.89 2008/04/01 09:41:05 vsc
|
||||
* more fixes to restore
|
||||
*
|
||||
* Revision 1.88 2008/04/01 08:42:46 vsc
|
||||
* fix restore and small VISTA thingies
|
||||
*
|
||||
* Revision 1.87 2008/03/25 22:03:14 vsc
|
||||
* fix some icc warnings
|
||||
*
|
||||
* Revision 1.86 2008/03/25 16:45:53 vsc
|
||||
* make or-parallelism compile again
|
||||
*
|
||||
* Revision 1.85 2008/02/12 17:03:52 vsc
|
||||
* SWI-portability changes
|
||||
*
|
||||
* Revision 1.84 2008/02/07 21:39:51 vsc
|
||||
* fix case where predicate is for an integer (DBEntry).
|
||||
*
|
||||
* Revision 1.83 2008/01/23 17:57:55 vsc
|
||||
* valgrind it!
|
||||
* enable atom garbage collection.
|
||||
*
|
||||
* Revision 1.82 2007/12/05 12:17:23 vsc
|
||||
* improve JT
|
||||
* fix graph compatibility with SICStus
|
||||
* re-export declaration.
|
||||
*
|
||||
* Revision 1.81 2007/11/26 23:43:09 vsc
|
||||
* fixes to support threads and assert correctly, even if inefficiently.
|
||||
*
|
||||
* Revision 1.80 2007/11/07 09:35:53 vsc
|
||||
* small fix
|
||||
*
|
||||
* Revision 1.79 2007/11/07 09:25:27 vsc
|
||||
* speedup meta-calls
|
||||
*
|
||||
* Revision 1.78 2007/11/06 17:02:12 vsc
|
||||
* compile ground terms away.
|
||||
*
|
||||
* Revision 1.77 2007/10/10 09:44:24 vsc
|
||||
* some more fixes to make YAP swi compatible
|
||||
* fix absolute_file_name (again)
|
||||
* fix setarg
|
||||
*
|
||||
* Revision 1.76 2007/09/28 23:18:17 vsc
|
||||
* handle learning from interpretations.
|
||||
*
|
||||
* Revision 1.75 2007/04/10 22:13:21 vsc
|
||||
* fix max modules limitation
|
||||
*
|
||||
* Revision 1.74 2007/03/22 11:12:21 vsc
|
||||
* make sure that YAP_Restart does not restart a failed goal.
|
||||
*
|
||||
* Revision 1.73 2007/02/18 00:26:36 vsc
|
||||
* fix atom garbage collector (although it is still off by default)
|
||||
* make valgrind feel better
|
||||
*
|
||||
* Revision 1.72 2007/01/08 08:27:19 vsc
|
||||
* fix restore (Trevor)
|
||||
* make indexing a bit faster on IDB
|
||||
*
|
||||
* Revision 1.71 2006/11/27 17:42:03 vsc
|
||||
* support for UNICODE, and other bug fixes.
|
||||
*
|
||||
* Revision 1.70 2006/08/25 19:50:35 vsc
|
||||
* global data structures
|
||||
*
|
||||
* Revision 1.69 2006/08/22 16:12:46 vsc
|
||||
* global variables
|
||||
*
|
||||
* Revision 1.68 2006/08/02 18:18:30 vsc
|
||||
* preliminary support for readutil library (SWI compatible).
|
||||
*
|
||||
* Revision 1.67 2006/05/17 18:38:11 vsc
|
||||
* make system library use true file name
|
||||
*
|
||||
* Revision 1.66 2006/04/28 15:48:33 vsc
|
||||
* do locking on streams
|
||||
*
|
||||
* Revision 1.65 2006/04/28 13:23:23 vsc
|
||||
* fix number of overflow bugs affecting threaded version
|
||||
* make current_op faster.
|
||||
*
|
||||
* Revision 1.64 2006/03/22 20:07:28 vsc
|
||||
* take better care of zombies
|
||||
*
|
||||
* Revision 1.63 2006/03/06 14:04:56 vsc
|
||||
* fixes to garbage collector
|
||||
* fixes to debugger
|
||||
*
|
||||
* Revision 1.62 2006/02/24 14:03:42 vsc
|
||||
* fix refs to old LogUpd implementation (pre 5).
|
||||
*
|
||||
* Revision 1.61 2006/01/02 02:16:18 vsc
|
||||
* support new interface between YAP and GMP, so that we don't rely on our own
|
||||
* allocation routines.
|
||||
* Several big fixes.
|
||||
*
|
||||
* Revision 1.60 2005/12/17 03:25:39 vsc
|
||||
* major changes to support online event-based profiling
|
||||
* improve error discovery and restart on scanner.
|
||||
*
|
||||
* Revision 1.59 2005/12/05 17:16:11 vsc
|
||||
* write_depth/3
|
||||
* overflow handlings and garbage collection
|
||||
* Several ipdates to CLPBN
|
||||
* dif/2 could be broken in the presence of attributed variables.
|
||||
*
|
||||
* Revision 1.58 2005/11/23 03:01:33 vsc
|
||||
* fix several bugs in save/restore.b
|
||||
*
|
||||
* Revision 1.57 2005/10/28 17:38:50 vsc
|
||||
* sveral updates
|
||||
*
|
||||
* Revision 1.56 2005/10/21 16:09:03 vsc
|
||||
* SWI compatible module only operators
|
||||
*
|
||||
* Revision 1.55 2005/10/19 19:00:48 vsc
|
||||
* extend arrays with nb_terms so that we can implement nb_ builtins
|
||||
* correctly.
|
||||
*
|
||||
* Revision 1.54 2005/09/09 17:24:39 vsc
|
||||
* a new and hopefully much better implementation of atts.
|
||||
*
|
||||
* Revision 1.53 2005/08/01 15:40:38 ricroc
|
||||
* TABLING NEW: better support for incomplete tabling
|
||||
*
|
||||
* Revision 1.52 2005/07/06 19:34:11 ricroc
|
||||
* TABLING: answers for completed calls can now be obtained by loading (new
|
||||
*option) or executing (default) them from the trie data structure.
|
||||
*
|
||||
* Revision 1.51 2005/07/06 15:10:15 vsc
|
||||
* improvements to compiler: merged instructions and fixes for ->
|
||||
*
|
||||
* Revision 1.50 2005/06/01 13:53:46 vsc
|
||||
* improve bb routines to use the DB efficiently
|
||||
* change interface between DB and BB.
|
||||
*
|
||||
* Revision 1.49 2005/05/30 03:26:37 vsc
|
||||
* add some atom gc fixes
|
||||
*
|
||||
* Revision 1.48 2005/01/04 02:50:21 vsc
|
||||
* - allow MegaClauses with blobs
|
||||
* - change Diffs to be thread specific
|
||||
* - include Christian's updates
|
||||
*
|
||||
* Revision 1.47 2004/12/02 06:06:47 vsc
|
||||
* fix threads so that they at least start
|
||||
* allow error handling to work with threads
|
||||
* replace heap_base by Yap_heap_base, according to Yap's convention for
|
||||
*globals.
|
||||
*
|
||||
* Revision 1.46 2004/11/23 21:16:21 vsc
|
||||
* A few extra fixes for saved states.
|
||||
*
|
||||
* Revision 1.45 2004/10/26 20:16:18 vsc
|
||||
* More bug fixes for overflow handling
|
||||
*
|
||||
* Revision 1.44 2004/10/06 16:55:47 vsc
|
||||
* change configure to support big mem configs
|
||||
* get rid of extra globals
|
||||
* fix trouble with multifile preds
|
||||
*
|
||||
* Revision 1.43 2004/09/27 20:45:04 vsc
|
||||
* Mega clauses
|
||||
* Fixes to sizeof(expand_clauses) which was being overestimated
|
||||
* Fixes to profiling+indexing
|
||||
* Fixes to reallocation of memory after restoring
|
||||
* Make sure all clauses, even for C, end in _Ystop
|
||||
* Don't reuse space for Streams
|
||||
* Fix Stream_F on StreaNo+1
|
||||
*
|
||||
* Revision 1.42 2004/06/05 03:37:00 vsc
|
||||
* coroutining is now a part of attvars.
|
||||
* some more fixes.
|
||||
*
|
||||
* Revision 1.41 2004/04/29 03:45:50 vsc
|
||||
* fix garbage collection in execute_tail
|
||||
*
|
||||
* Revision 1.40 2004/03/31 01:03:10 vsc
|
||||
* support expand group of clauses
|
||||
*
|
||||
* Revision 1.39 2004/03/19 11:35:42 vsc
|
||||
* trim_trail for default machine
|
||||
* be more aggressive about try-retry-trust chains.
|
||||
* - handle cases where block starts with a wait
|
||||
* - don't use _killed instructions, just let the thing rot by itself.
|
||||
* *
|
||||
* *
|
||||
*************************************************************************/
|
||||
#ifdef SCCS
|
||||
static char SccsId[] = "@(#)rheap.c 1.3 3/15/90";
|
||||
#endif
|
||||
|
||||
#ifndef RHEAP_H
|
||||
#define RHEAP_H 1
|
||||
|
||||
#include "YapHeap.h"
|
||||
#include "absmi.h"
|
||||
#include "clause.h"
|
||||
|
||||
#define Atomics 0
|
||||
#define Funcs 1
|
||||
|
||||
|
|
@ -1495,3 +1503,5 @@ static void RestoreAtom(AtomEntry *at USES_REGS) {
|
|||
if (nat)
|
||||
at->NextOfAE = AbsAtom(AtomEntryAdjust(nat));
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@ export MACOSX_DEPLOYMENT_TARGET=10.9
|
|||
export R_COMMAND=$R
|
||||
export CMAKE_BUILD_TYPE=Debug
|
||||
export CMAKE=$PREFIX/bin/cmake
|
||||
export CMAKE_INCLUDE_PATH=$SYS_PREFIX/include
|
||||
export CMAKE_LIBRARY_PATH=$SYS_PREFIX/lib
|
||||
export CMAKE_INCLUDE_PATH=$PREFIX/include
|
||||
export CMAKE_LIBRARY_PATH=$PREFIX/lib
|
||||
export CMAKE_INSTALL_PREFIX=$PREFIX
|
||||
export GENERATOR="-GNinja"
|
||||
export PYTHON_EXECUTABLE="$PYTHON"
|
||||
export PYTHON_LIBRARY="$STDLIB_DIR/../libPython${PY_VER}m$SHLIB_EXT"
|
||||
export PYTHON_INCLUDE_DIR="$STDLIB_DIR/../../include/python$PY_VER"m
|
||||
export PYTHON_LIBRARY="$CMAKE_LIBRARY_PATH/libpython${PY_VER}m$SHLIB_EXT"
|
||||
export PYTHON_INCLUDE_DIR="$CMAKE_INCLUDE_PATH/python$PY_VER"m
|
||||
|
||||
mkdir $PREFIX/conda
|
||||
cd $PREFIX/conda
|
||||
|
|
@ -27,7 +27,7 @@ cd $PREFIX/conda
|
|||
-DPYTHON_INCLUDE_DIR:PATH="$PYTHON_INCLUDE_DIR" \
|
||||
$RECIPE_DIR/..
|
||||
|
||||
make -j install CMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX"
|
||||
make install CMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX"
|
||||
|
||||
# Remove the created lib64 directory
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@ requirements:
|
|||
- r
|
||||
- notebook
|
||||
run:
|
||||
- python
|
||||
- pythonlab
|
||||
- readline
|
||||
- gmp
|
||||
- r
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ static YAP_Bool compute_prob(void)
|
|||
expr expression;
|
||||
DdNode * function;
|
||||
DdManager * mgr;
|
||||
int nBVar,i,intBits,create_dot;
|
||||
int nBVar,i,create_dot;
|
||||
FILE * file;
|
||||
DdNode * array[1];
|
||||
double prob;
|
||||
|
|
@ -184,11 +184,10 @@ static YAP_Bool compute_prob(void)
|
|||
array[0]=function;
|
||||
onames[0]="Out";
|
||||
file = open_file("cpl.dot", "w");
|
||||
Cudd_DumpDot(mgr,1,array,names,onames,file);
|
||||
Cudd_DumpDot(mgr,1,array,names,( char * const*)onames,file);
|
||||
fclose(file);
|
||||
}
|
||||
nodes=init_table(vars.nBVar);
|
||||
intBits=sizeof(unsigned int)*8;
|
||||
prob=Prob(function,vars,nodes);
|
||||
out=YAP_MkFloatTerm(prob);
|
||||
destroy_table(nodes,vars.nBVar);
|
||||
|
|
|
|||
|
|
@ -24,9 +24,8 @@ PROPERTIES VERSION ${YAP_FULL_VERSION}
|
|||
SOVERSION ${YAP_MAJOR_VERSION}.${YAP_MINOR_VERSION}
|
||||
)
|
||||
|
||||
target_link_libraries(Py4YAP libYap ${PYTHON_LIBRARIES})
|
||||
|
||||
# arithmetic hassle.
|
||||
target_link_libraries(Py4YAP YAPPython libYap ${PYTHON_LIBRARIES})
|
||||
|
||||
|
||||
install(TARGETS Py4YAP
|
||||
|
|
@ -36,16 +35,9 @@ install(TARGETS Py4YAP
|
|||
)
|
||||
|
||||
|
||||
|
||||
install(TARGETS YAPPython
|
||||
LIBRARY DESTINATION ${dlls}
|
||||
RUNTIME DESTINATION ${dlls}
|
||||
ARCHIVE DESTINATION ${dlls} )
|
||||
|
||||
target_link_libraries( YAPPython Py4YAP )
|
||||
endif()
|
||||
|
||||
target_link_libraries(YAPPython libYap ${PYTHON_LIBRARIES})
|
||||
target_link_libraries(YAPPython libYap)
|
||||
|
||||
# arithmetic hassle.
|
||||
set_property(TARGET YAPPython PROPERTY CXX_STANDARD_REQUIRED ON)
|
||||
|
|
|
|||
|
|
@ -271,21 +271,18 @@ bool python_assign(term_t t, PyObject *exp, PyObject *context) {
|
|||
if (PL_skip_list(t, tail, &len) &&
|
||||
PL_get_nil(tail)) { // true list
|
||||
|
||||
bool o = true;
|
||||
if (PySequence_Check(exp) && PySequence_Length(exp) == len)
|
||||
|
||||
for (i = 0; i < len; i++) {
|
||||
PyObject *p;
|
||||
if (!PL_get_list(t, arg, t)) {
|
||||
PL_reset_term_refs(tail);
|
||||
o = false;
|
||||
p = Py_None;
|
||||
}
|
||||
if ((p = PySequence_GetItem(exp, i)) == NULL)
|
||||
p = Py_None;
|
||||
if (!python_assign(arg, p, context)) {
|
||||
PL_reset_term_refs(tail);
|
||||
o = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ configure_file("MANIFEST.in" ${CMAKE_CURRENT_BINARY_DIR}/MANIFEST.in)
|
|||
configure_file("YAP4PY.md" README.md)
|
||||
|
||||
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR}/yap4py/include
|
||||
DEPENDS ${SWIG_SOURCES} YAP++
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -43,7 +42,9 @@ INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR}/yap4py/i
|
|||
# LIBRARY DESTINATION ${PYTHON_MODULE_PATH}
|
||||
# )
|
||||
|
||||
|
||||
if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/yap4py)
|
||||
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/yap4py)
|
||||
endif()
|
||||
|
||||
if (CONDA)
|
||||
set(bdist bdist_conda)
|
||||
|
|
|
|||
Reference in New Issue