From 792d836ee6bb73cf4c043d91121819492605faff Mon Sep 17 00:00:00 2001 From: vsc Date: Mon, 18 Jun 2001 18:31:19 +0000 Subject: [PATCH] cleanup error messages in functor/3 git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@90 b08c6af1-5177-4d33-ba66-4b1c6b8b522a --- C/absmi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/C/absmi.c b/C/absmi.c index 1ce82f28a..14b8e6b48 100644 --- a/C/absmi.c +++ b/C/absmi.c @@ -1977,7 +1977,7 @@ absmi(int inp) * *cannot* fail before having woken up all suspended goals. */ /* make sure we are here because of an awoken goal */ - if (CFREG == Unsigned(LCL0)) { + if (CFREG == Unsigned(LCL0) && !(PrologMode & AbortMode)) { Term WGs = ReadTimedVar(WokenGoals); Term my_goal = AbsAppl(H); @@ -10103,7 +10103,7 @@ absmi(int inp) if (IsIntegerTerm(d1)) d1 = IntegerOfTerm(d1); else { - Error(TYPE_ERROR_INTEGER,ARG3,"functor/3"); + Error(TYPE_ERROR_INTEGER,d1,"functor/3"); FAIL(); } if (!IsAtomicTerm(d0)) { @@ -10206,7 +10206,7 @@ absmi(int inp) if (IsIntegerTerm(d1)) d1 = IntegerOfTerm(d1); else { - Error(TYPE_ERROR_INTEGER,ARG3,"functor/3"); + Error(TYPE_ERROR_INTEGER,d1,"functor/3"); FAIL(); } /* We made it!!!!! we got in d0 the name, in d1 the arity and @@ -10388,7 +10388,7 @@ absmi(int inp) if (IsIntegerTerm(d1)) d1 = IntegerOfTerm(d1); else { - Error(TYPE_ERROR_INTEGER,ARG3,"functor/3"); + Error(TYPE_ERROR_INTEGER,d1,"functor/3"); FAIL(); } if (!IsAtomicTerm(d0)) {