cleanup unnecessary MkFunctor

This commit is contained in:
Vitor Santos Costa
2008-12-23 02:20:22 +00:00
parent a8ac9bfb43
commit f679f21a71
7 changed files with 165 additions and 80 deletions

View File

@@ -536,7 +536,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomConsistencyError, 1), 1, ti);
nt[0] = Yap_MkApplTerm(FunctorConsistencyError, 1, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -551,7 +551,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomArrayOverflow);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -566,7 +566,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomArrayType);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -581,7 +581,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomIOMode);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -596,7 +596,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomMutable);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -611,7 +611,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomNonEmptyList);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -626,7 +626,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomNotLessThanZero);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -641,7 +641,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomNotNewline);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -656,7 +656,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomNotZero);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -671,7 +671,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomOutOfRange);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -686,7 +686,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomOperatorPriority);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -701,7 +701,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomOperatorSpecifier);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -716,7 +716,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomRadix);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -731,7 +731,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomShiftCountOverflow);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -746,7 +746,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomSourceSink);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -761,7 +761,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomStream);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -776,7 +776,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomStreamOrAlias);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -791,7 +791,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomStreamPosition);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -806,7 +806,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomSyntaxErrorHandler);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -821,7 +821,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomTimeOutSpec);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomDomainError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorDomainError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -836,7 +836,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomSourceSink);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomExistenceError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorExistenceError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -851,7 +851,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomArray);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomExistenceError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorExistenceError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -866,7 +866,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomKey);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomExistenceError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorExistenceError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -881,7 +881,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomStream);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomExistenceError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorExistenceError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -895,7 +895,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomFloatOverflow);
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomEvaluationError,1), 1, ti);
nt[0] = Yap_MkApplTerm(FunctorEvaluationError, 1, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -909,7 +909,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomIntOverflow);
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomEvaluationError,1), 1, ti);
nt[0] = Yap_MkApplTerm(FunctorEvaluationError, 1, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -923,7 +923,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomUndefined);
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomEvaluationError,1), 1, ti);
nt[0] = Yap_MkApplTerm(FunctorEvaluationError, 1, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -937,7 +937,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomFloatUnderflow);
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomEvaluationError,1), 1, ti);
nt[0] = Yap_MkApplTerm(FunctorEvaluationError, 1, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -951,7 +951,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomUnderflow);
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomEvaluationError,1), 1, ti);
nt[0] = Yap_MkApplTerm(FunctorEvaluationError, 1, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -965,7 +965,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomZeroDivisor);
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomEvaluationError,1), 1, ti);
nt[0] = Yap_MkApplTerm(FunctorEvaluationError, 1, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1070,7 +1070,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
ti[0] = MkAtomTerm(AtomAccess);
ti[1] = MkAtomTerm(AtomPrivateProcedure);
ti[2] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomPermissionError,3), 3, ti);
nt[0] = Yap_MkApplTerm(FunctorPermissionError, 3, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1086,7 +1086,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
ti[0] = MkAtomTerm(AtomCreate);
ti[1] = MkAtomTerm(AtomArray);
ti[2] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomPermissionError,3), 3, ti);
nt[0] = Yap_MkApplTerm(FunctorPermissionError, 3, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1102,7 +1102,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
ti[0] = MkAtomTerm(AtomCreate);
ti[1] = MkAtomTerm(AtomOperator);
ti[2] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomPermissionError,3), 3, ti);
nt[0] = Yap_MkApplTerm(FunctorPermissionError, 3, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1118,7 +1118,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
ti[0] = MkAtomTerm(AtomInput);
ti[1] = MkAtomTerm(AtomBinaryStream);
ti[2] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomPermissionError,3), 3, ti);
nt[0] = Yap_MkApplTerm(FunctorPermissionError, 3, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1134,7 +1134,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
ti[0] = MkAtomTerm(AtomInput);
ti[1] = MkAtomTerm(AtomPastEndOfStream);
ti[2] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomPermissionError,3), 3, ti);
nt[0] = Yap_MkApplTerm(FunctorPermissionError, 3, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1150,7 +1150,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
ti[0] = MkAtomTerm(AtomInput);
ti[1] = MkAtomTerm(AtomStream);
ti[2] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomPermissionError,3), 3, ti);
nt[0] = Yap_MkApplTerm(FunctorPermissionError, 3, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1166,7 +1166,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
ti[0] = MkAtomTerm(AtomInput);
ti[1] = MkAtomTerm(AtomTextStream);
ti[2] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomPermissionError,3), 3, ti);
nt[0] = Yap_MkApplTerm(FunctorPermissionError, 3, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1182,7 +1182,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
ti[0] = MkAtomTerm(AtomModify);
ti[1] = MkAtomTerm(AtomStaticProcedure);
ti[2] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomPermissionError,3), 3, ti);
nt[0] = Yap_MkApplTerm(FunctorPermissionError, 3, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1198,7 +1198,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
ti[0] = MkAtomTerm(AtomNew);
ti[1] = MkAtomTerm(AtomAlias);
ti[2] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomPermissionError,3), 3, ti);
nt[0] = Yap_MkApplTerm(FunctorPermissionError, 3, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1214,7 +1214,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
ti[0] = MkAtomTerm(AtomOpen);
ti[1] = MkAtomTerm(AtomSourceSink);
ti[2] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomPermissionError,3), 3, ti);
nt[0] = Yap_MkApplTerm(FunctorPermissionError, 3, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1230,7 +1230,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
ti[0] = MkAtomTerm(AtomOutput);
ti[1] = MkAtomTerm(AtomBinaryStream);
ti[2] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomPermissionError,3), 3, ti);
nt[0] = Yap_MkApplTerm(FunctorPermissionError, 3, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1246,7 +1246,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
ti[0] = MkAtomTerm(AtomOutput);
ti[1] = MkAtomTerm(AtomStream);
ti[2] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomPermissionError,3), 3, ti);
nt[0] = Yap_MkApplTerm(FunctorPermissionError, 3, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1262,7 +1262,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
ti[0] = MkAtomTerm(AtomOutput);
ti[1] = MkAtomTerm(AtomTextStream);
ti[2] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomPermissionError,3), 3, ti);
nt[0] = Yap_MkApplTerm(FunctorPermissionError, 3, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1278,7 +1278,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
ti[0] = MkAtomTerm(AtomReposition);
ti[1] = MkAtomTerm(AtomStream);
ti[2] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomPermissionError,3), 3, ti);
nt[0] = Yap_MkApplTerm(FunctorPermissionError, 3, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1294,7 +1294,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
ti[0] = MkAtomTerm(AtomResize);
ti[1] = MkAtomTerm(AtomArray);
ti[2] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomPermissionError,3), 3, ti);
nt[0] = Yap_MkApplTerm(FunctorPermissionError, 3, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1308,7 +1308,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomCharacter);
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomRepresentationError,1), 1, ti);
nt[0] = Yap_MkApplTerm(FunctorRepresentationError, 1, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1322,7 +1322,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomCharacterCode);
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomRepresentationError,1), 1, ti);
nt[0] = Yap_MkApplTerm(FunctorRepresentationError, 1, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1336,7 +1336,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomMaxArity);
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomRepresentationError,1), 1, ti);
nt[0] = Yap_MkApplTerm(FunctorRepresentationError, 1, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1350,7 +1350,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomThreads);
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomResourceError,1), 1, ti);
nt[0] = Yap_MkApplTerm(FunctorResourceError, 1, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1401,7 +1401,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomArray);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1416,7 +1416,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomAtom);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1431,7 +1431,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomAtomic);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1446,7 +1446,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomByte);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1461,7 +1461,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomCallable);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1476,7 +1476,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomChar);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1491,7 +1491,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomCharacter);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1506,7 +1506,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomCompound);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1521,7 +1521,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomDBReference);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1536,7 +1536,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomDBTerm);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1551,7 +1551,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomEvaluable);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1566,7 +1566,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomFloat);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1581,7 +1581,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomInteger);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1596,7 +1596,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomKey);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1611,7 +1611,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomList);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1626,7 +1626,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomNumber);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1641,7 +1641,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomPredicateIndicator);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1656,7 +1656,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomPointer);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1671,7 +1671,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomUnsignedByte);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1686,7 +1686,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomUnsignedChar);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;
@@ -1701,7 +1701,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
i = strlen(tmpbuf);
ti[0] = MkAtomTerm(AtomVariable);
ti[1] = where;
nt[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomTypeError,2), 2, ti);
nt[0] = Yap_MkApplTerm(FunctorTypeError, 2, ti);
tp = tmpbuf+i;
psize -= i;
fun = FunctorError;