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

Stasinos noticed that _YAP_ breaks C standard: use Yap_ instead.

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@691 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc
2002-11-18 18:18:05 +00:00
parent 212c64f782
commit d7f80ea1ad
77 changed files with 6703 additions and 6703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
C/corout.c
View File

@@ -164,13 +164,13 @@ UpdateSVarList(sus_record *sl)
/* make sl the new head of the suspension list, and update the list
to use the old one. Note that the list is only bound once,
MutableList is the one variable being updated all the time */
return((sus_record *)_YAP_UpdateTimedVar(MutableList, (CELL)sl));
return((sus_record *)Yap_UpdateTimedVar(MutableList, (CELL)sl));
}
inline static sus_record *
GetSVarList(void)
{
Term t = _YAP_ReadTimedVar(MutableList);
Term t = Yap_ReadTimedVar(MutableList);
/* just return the start of the list */
if (t == TermNil)
return(NULL);
@@ -190,7 +190,7 @@ GetSVarList(void)
static Term
ListOfWokenGoals(void) {
sus_record *pt = (sus_record *)_YAP_ReadTimedVar(WokenGoals);
sus_record *pt = (sus_record *)Yap_ReadTimedVar(WokenGoals);
Term t;
t = TermNil;
@@ -203,7 +203,7 @@ ListOfWokenGoals(void) {
}
Term
_YAP_ListOfWokenGoals(void) {
Yap_ListOfWokenGoals(void) {
return ListOfWokenGoals();
}
@@ -211,10 +211,10 @@ _YAP_ListOfWokenGoals(void) {
static void ReleaseGoals(sus_record *from)
{
/* follow the chain */
sus_record *WGs = (sus_record *)_YAP_ReadTimedVar(WokenGoals);
sus_record *WGs = (sus_record *)Yap_ReadTimedVar(WokenGoals);
if ((Term)WGs == TermNil) {
_YAP_UpdateTimedVar(WokenGoals, (CELL)from);
Yap_UpdateTimedVar(WokenGoals, (CELL)from);
} else {
/* add to the end of the current list of suspended goals */
CELL *where_to = (CELL *)Deref((CELL)WGs);
@@ -335,14 +335,14 @@ CopySuspendedVar(CELL *orig, CELL ***to_visit_ptr, CELL *res)
register sus_tag *sreg = (sus_tag *)orig, *vs;
/* add a new suspension */
vs = (sus_tag *)_YAP_ReadTimedVar(DelayedVars);
vs = (sus_tag *)Yap_ReadTimedVar(DelayedVars);
if (H0 - (CELL *)vs < 1024)
return(FALSE);
RESET_VARIABLE(&(vs->ActiveSus));
vs->sus_id = susp_ext;
vs->SG = copy_suspended_goals(sreg->SG, to_visit_ptr);
*res = (CELL)&(vs->ActiveSus);
_YAP_UpdateTimedVar(DelayedVars, (CELL)(vs+1));
Yap_UpdateTimedVar(DelayedVars, (CELL)(vs+1));
return(TRUE);
}
@@ -386,14 +386,14 @@ TermToSuspendedVar(Term gs, Term var)
{
register sus_tag *vs;
/* add a new suspension */
vs = (sus_tag *)_YAP_ReadTimedVar(DelayedVars);
vs = (sus_tag *)Yap_ReadTimedVar(DelayedVars);
if (H0 - (CELL *)vs < 1024)
return(FALSE);
RESET_VARIABLE(&(vs->ActiveSus));
vs->sus_id = susp_ext;
vs->SG = terms_to_suspended_goals(gs);
_YAP_unify(var,(CELL)&(vs->ActiveSus));
_YAP_UpdateTimedVar(DelayedVars, (CELL)(vs+1));
Yap_unify(var,(CELL)&(vs->ActiveSus));
Yap_UpdateTimedVar(DelayedVars, (CELL)(vs+1));
return(TRUE);
}
@@ -404,10 +404,10 @@ mark_sus_record(sus_record *sg)
if (MARKED(((CELL)(sg->NR))))
return;
MARK(((CELL *)&(sg->NR)));
_YAP_inc_mark_variable();
_YAP_mark_variable((CELL *)&(sg->SG));
Yap_inc_mark_variable();
Yap_mark_variable((CELL *)&(sg->SG));
#ifdef MULTI_ASSIGNMENT_VARIABLES
_YAP_inc_mark_variable();
Yap_inc_mark_variable();
if (!IsAtomTerm((CELL)(sg->NS)))
mark_sus_record(sg->NS);
MARK(((CELL *)&(sg->NS)));
@@ -419,12 +419,12 @@ static void mark_suspended_goal(CELL *orig)
register sus_tag *sreg = (sus_tag *)orig;
mark_sus_record(sreg->SG);
_YAP_mark_external_reference(((CELL *)&(sreg->SG)));
Yap_mark_external_reference(((CELL *)&(sreg->SG)));
}
void
_YAP_mark_all_suspended_goals(void)
Yap_mark_all_suspended_goals(void)
{
sus_record *sg = GetSVarList();
if (sg == NULL)
@@ -474,7 +474,7 @@ Wake(CELL *pt1, CELL reg2)
/* binding two suspended variables, be careful */
if (susp2->sus_id != susp_ext) {
/* joining two suspensions */
_YAP_Error(SYSTEM_ERROR, TermNil, "joining two suspensions not implemented");
Yap_Error(SYSTEM_ERROR, TermNil, "joining two suspensions not implemented");
return;
}
/* join the two suspended lists */
@@ -573,19 +573,19 @@ freeze_goal(Term t, Term g)
id = (exts)(susp->sus_id);
if (id != susp_ext) {
/* obtain the term */
_YAP_Error(SYSTEM_ERROR,TermNil,"multiple suspensions not supported");
Yap_Error(SYSTEM_ERROR,TermNil,"multiple suspensions not supported");
return(FALSE);
}
AddSuspendedGoal(g, susp->SG);
return(TRUE);
}
vs = (sus_tag *)_YAP_ReadTimedVar(DelayedVars);
vs = (sus_tag *)Yap_ReadTimedVar(DelayedVars);
if (H0 - (CELL *)vs < 1024) {
ARG1 = t;
ARG2 = g;
if (!_YAP_growglobal(NULL)) {
_YAP_Error(SYSTEM_ERROR, t, _YAP_ErrorMessage);
if (!Yap_growglobal(NULL)) {
Yap_Error(SYSTEM_ERROR, t, Yap_ErrorMessage);
return FALSE;
}
t = ARG1;
@@ -603,13 +603,13 @@ freeze_goal(Term t, Term g)
vs->sus_id = susp_ext;
vs->SG = gf;
RESET_VARIABLE(&(vs->ActiveSus));
_YAP_UpdateTimedVar(DelayedVars, (CELL)(vs+1));
Yap_UpdateTimedVar(DelayedVars, (CELL)(vs+1));
Bind_Global((CELL *)t,(CELL)&(vs->ActiveSus));
return(TRUE);
}
else {
/* Oops, first argument was bound :-( */
_YAP_Error(TYPE_ERROR_VARIABLE, t, "freeze/2");
Yap_Error(TYPE_ERROR_VARIABLE, t, "freeze/2");
return(FALSE);
}
}
@@ -621,7 +621,7 @@ p_read_svar_list(void)
{
#ifdef COROUTINING
#ifdef MULTI_ASSIGNMENT_VARIABLES
return(_YAP_unify(ARG1, MutableList) && _YAP_unify(ARG2, AttsMutableList));
return(Yap_unify(ARG1, MutableList) && Yap_unify(ARG2, AttsMutableList));
#else
return(TRUE);
#endif
@@ -725,7 +725,7 @@ static Int p_frozen_goals(void)
}
HB = B->cp_h;
#endif
return(_YAP_unify(ARG2,t));
return(Yap_unify(ARG2,t));
}
/* return a queue with all goals frozen in the system */
@@ -733,11 +733,11 @@ static Int p_all_frozen_goals(void)
{
#ifdef COROUTINING
/* initially, we do not know of any goals frozen */
Term t = _YAP_CurrentAttVars();
Term t = Yap_CurrentAttVars();
#ifdef MULTI_ASSIGNMENT_VARIABLES
sus_record *x = GetSVarList();
if (x == NULL)
return(_YAP_unify(ARG1,t));
return(Yap_unify(ARG1,t));
/* okay, we are on top of the list of variables. Let's burn rubber!
*/
while ((CELL)x != TermNil) {
@@ -745,9 +745,9 @@ static Int p_all_frozen_goals(void)
x = x->NS;
}
#endif
return(_YAP_unify(ARG1,t));
return(Yap_unify(ARG1,t));
#else
return(_YAP_unify(ARG1,TermNil));
return(Yap_unify(ARG1,TermNil));
#endif
}
@@ -777,7 +777,7 @@ static int can_unify_complex(register CELL *pt0,
CELL *saved_HB;
choiceptr saved_B;
register CELL **to_visit = (CELL **)_YAP_PreAllocCodeSpace();
register CELL **to_visit = (CELL **)Yap_PreAllocCodeSpace();
CELL **to_visit_base = to_visit;
/* make sure to trail all bindings */
@@ -878,7 +878,7 @@ static int can_unify_complex(register CELL *pt0,
goto comparison_failed;
#ifdef USE_GMP
case (CELL)FunctorBigInt:
if (mpz_cmp(_YAP_BigIntOfTerm(d0),_YAP_BigIntOfTerm(d1)) == 0) continue;
if (mpz_cmp(Yap_BigIntOfTerm(d0),Yap_BigIntOfTerm(d1)) == 0) continue;
goto comparison_failed;
#endif /* USE_GMP */
default:
@@ -929,7 +929,7 @@ static int can_unify_complex(register CELL *pt0,
goto loop;
}
/* success */
_YAP_ReleasePreAllocCodeSpace((ADDR)to_visit);
Yap_ReleasePreAllocCodeSpace((ADDR)to_visit);
/* restore B, and later HB */
B = saved_B;
HB = saved_HB;
@@ -942,7 +942,7 @@ static int can_unify_complex(register CELL *pt0,
comparison_failed:
/* failure */
_YAP_ReleasePreAllocCodeSpace((ADDR)to_visit);
Yap_ReleasePreAllocCodeSpace((ADDR)to_visit);
#ifdef RATIONAL_TREES
while (to_visit > (CELL **)to_visit_base) {
to_visit -= 4;
@@ -1015,7 +1015,7 @@ can_unify(Term t1, Term t2, Term *Vars)
return(FALSE);
#ifdef USE_GMP
case (CELL)FunctorBigInt:
if (mpz_cmp(_YAP_BigIntOfTerm(t1),_YAP_BigIntOfTerm(t2)) == 0) return(TRUE);
if (mpz_cmp(Yap_BigIntOfTerm(t1),Yap_BigIntOfTerm(t2)) == 0) return(TRUE);
return(FALSE);
#endif /* USE_GMP */
default:
@@ -1035,7 +1035,7 @@ static int non_ground_complex(register CELL *pt0,
Term *Var)
{
register CELL **to_visit = (CELL **)_YAP_PreAllocCodeSpace();
register CELL **to_visit = (CELL **)Yap_PreAllocCodeSpace();
CELL **to_visit_base = to_visit;
loop:
@@ -1113,12 +1113,12 @@ static int non_ground_complex(register CELL *pt0,
}
/* the term is ground */
_YAP_ReleasePreAllocCodeSpace((ADDR)to_visit);
Yap_ReleasePreAllocCodeSpace((ADDR)to_visit);
return(FALSE);
var_found:
/* the term is non-ground */
_YAP_ReleasePreAllocCodeSpace((ADDR)to_visit);
Yap_ReleasePreAllocCodeSpace((ADDR)to_visit);
#ifdef RATIONAL_TREES
while (to_visit > (CELL **)to_visit_base) {
to_visit -= 3;
@@ -1165,7 +1165,7 @@ static Int p_can_unify(void)
Term r = TermNil;
if (!can_unify(ARG1, ARG2, &r))
return(FALSE);
return (_YAP_unify(ARG3, r));
return (Yap_unify(ARG3, r));
#else
return(FALSE);
#endif
@@ -1178,7 +1178,7 @@ static Int p_non_ground(void)
Term r;
if (!non_ground(ARG1, &r))
return(FALSE);
return (_YAP_unify(ARG2, r));
return (Yap_unify(ARG2, r));
#else
return(FALSE);
#endif
@@ -1198,13 +1198,13 @@ static Int p_coroutining(void)
static Int p_awoken_goals(void)
{
#ifdef COROUTINING
Term WGs = _YAP_ReadTimedVar(WokenGoals);
Term WGs = Yap_ReadTimedVar(WokenGoals);
if (WGs == TermNil) {
return(FALSE);
}
WGs = ListOfWokenGoals();
_YAP_UpdateTimedVar(WokenGoals, TermNil);
return(_YAP_unify(ARG1,WGs));
Yap_UpdateTimedVar(WokenGoals, TermNil);
return(Yap_unify(ARG1,WGs));
#else
return(FALSE);
#endif
@@ -1212,7 +1212,7 @@ static Int p_awoken_goals(void)
#ifdef COROUTINING
void
_YAP_WakeUp(CELL *pt0) {
Yap_WakeUp(CELL *pt0) {
CELL d0 = *pt0;
RESET_VARIABLE(pt0);
TR--;
@@ -1221,7 +1221,7 @@ _YAP_WakeUp(CELL *pt0) {
#endif
void _YAP_InitCoroutPreds(void)
void Yap_InitCoroutPreds(void)
{
#ifdef COROUTINING
Atom at;
@@ -1232,21 +1232,21 @@ void _YAP_InitCoroutPreds(void)
attas[susp_ext].to_term_op = SuspendedVarToTerm;
attas[susp_ext].term_to_op = TermToSuspendedVar;
attas[susp_ext].mark_op = mark_suspended_goal;
at = _YAP_LookupAtom("$wake_up_goal");
pred = RepPredProp(PredPropByFunc(_YAP_MkFunctor(at, 2),0));
at = Yap_LookupAtom("$wake_up_goal");
pred = RepPredProp(PredPropByFunc(Yap_MkFunctor(at, 2),0));
WakeUpCode = pred;
_YAP_InitAttVarPreds();
Yap_InitAttVarPreds();
#endif /* COROUTINING */
_YAP_InitCPred("$read_svar_list", 2, p_read_svar_list, SafePredFlag);
_YAP_InitCPred("$set_svar_list", 2, p_set_svar_list, SafePredFlag);
_YAP_InitCPred("$freeze", 2, p_freeze, 0);
_YAP_InitCPred("freeze_on_first", 2, p_freeze_on_first, TestPredFlag);
_YAP_InitCPred("$frozen_goals", 2, p_frozen_goals, SafePredFlag);
_YAP_InitCPred("$all_frozen_goals", 1, p_all_frozen_goals, SafePredFlag);
_YAP_InitCPred("$can_unify", 3, p_can_unify, SafePredFlag);
_YAP_InitCPred("$non_ground", 2, p_non_ground, SafePredFlag);
_YAP_InitCPred("$coroutining", 0, p_coroutining, SafePredFlag);
_YAP_InitCPred("$awoken_goals", 1, p_awoken_goals, SafePredFlag);
Yap_InitCPred("$read_svar_list", 2, p_read_svar_list, SafePredFlag);
Yap_InitCPred("$set_svar_list", 2, p_set_svar_list, SafePredFlag);
Yap_InitCPred("$freeze", 2, p_freeze, 0);
Yap_InitCPred("freeze_on_first", 2, p_freeze_on_first, TestPredFlag);
Yap_InitCPred("$frozen_goals", 2, p_frozen_goals, SafePredFlag);
Yap_InitCPred("$all_frozen_goals", 1, p_all_frozen_goals, SafePredFlag);
Yap_InitCPred("$can_unify", 3, p_can_unify, SafePredFlag);
Yap_InitCPred("$non_ground", 2, p_non_ground, SafePredFlag);
Yap_InitCPred("$coroutining", 0, p_coroutining, SafePredFlag);
Yap_InitCPred("$awoken_goals", 1, p_awoken_goals, SafePredFlag);
}