diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ../yap-6.2

Browse Source
This commit is contained in:
Vítor Santos Costa 2010-12-12 16:47:42 +00:00
commit efc341597f
4 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
C/agc.c
View File

@ -74,6 +74,7 @@ CleanAtomMarkedBit(Atom a)
return (Atom)c; return (Atom)c;
} }
static inline Functor static inline Functor
FuncAdjust(Functor f) FuncAdjust(Functor f)
{ {
@ -111,6 +112,22 @@ AtomAdjust(Atom a)
return(a); return(a);
} }
static Term AdjustDBTerm(Term, Term *);
static Term
CodeComposedTermAdjust(Term t)
{
Term *base;
if (IsApplTerm(t)) {
base = RepAppl(t);
} else {
base = RepPair(t);
}
return AdjustDBTerm(t, base);
}
#define IsOldCode(P) FALSE #define IsOldCode(P) FALSE
#define IsOldCodeCellPtr(P) FALSE #define IsOldCodeCellPtr(P) FALSE
#define IsOldDelay(P) FALSE #define IsOldDelay(P) FALSE
@ -145,7 +162,6 @@ AtomAdjust(Atom a)
#define AtomEntryAdjust(P) (P) #define AtomEntryAdjust(P) (P)
#define GlobalEntryAdjust(P) (P) #define GlobalEntryAdjust(P) (P)
#define BlobTermAdjust(P) (P) #define BlobTermAdjust(P) (P)
#define CodeComposedTermAdjust(P) (P)
#define CellPtoHeapAdjust(P) (P) #define CellPtoHeapAdjust(P) (P)
#define PtoAtomHashEntryAdjust(P) (P) #define PtoAtomHashEntryAdjust(P) (P)
#define CellPtoHeapCellAdjust(P) (P) #define CellPtoHeapCellAdjust(P) (P)

8
C/cdmgr.c
View File

@ -792,11 +792,13 @@ ConstantTermAdjust (Term t)
return AtomTermAdjust(t); return AtomTermAdjust(t);
else if (IsIntTerm(t)) else if (IsIntTerm(t))
return t; return t;
else if (IsApplTerm(t)) else if (IsApplTerm(t) && IsBlobFunctor(FunctorOfTerm(t))) {
return BlobTermAdjust(t); return BlobTermAdjust(t);
else if (IsPairTerm(t)) } else if (IsApplTerm(t) || IsPairTerm(t)) {
return CodeComposedTermAdjust(t); return CodeComposedTermAdjust(t);
else return t; } else {
return t;
}
} }

8
H/rheap.h
View File

@ -246,11 +246,13 @@ ConstantTermAdjust (Term t)
return AtomTermAdjust(t); return AtomTermAdjust(t);
else if (IsIntTerm(t)) else if (IsIntTerm(t))
return t; return t;
else if (IsApplTerm(t)) else if (IsApplTerm(t) && IsBlobFunctor(FunctorOfTerm(t))) {
return BlobTermAdjust(t); return BlobTermAdjust(t);
else if (IsPairTerm(t)) } else if (IsApplTerm(t) || IsPairTerm(t)) {
return CodeComposedTermAdjust(t); return CodeComposedTermAdjust(t);
else return t; } else {
return t;
}
} }
/* Now, everything on its place so you must adjust the pointers */ /* Now, everything on its place so you must adjust the pointers */

2
pl/tabling.yap
View File

@ -14,7 +14,7 @@
:- meta_predicate :- meta_predicate
table(:), table(:),
is_tabled(:), is_tabled(:),
tabling_mode(:), tabling_mode(:,?),
abolish_table(:), abolish_table(:),
show_table(:), show_table(:),
table_statistics(:), table_statistics(:),