[Yap-commits] CVS: C absmi.c,1.7,1.8

[Vitor S. C. <vs...@us...>]

Update of /cvsroot/yap/C
In directory usw-pr-cvs1:/tmp/cvs-serv13248/C

Modified Files:
	absmi.c 
Log Message:
cleanup error messages in functor/3


Index: absmi.c
===================================================================
RCS file: /cvsroot/yap/C/absmi.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- absmi.c	2001/06/08 14:52:53	1.7
+++ absmi.c	2001/06/18 18:31:19	1.8
@@ -1977,7 +1977,7 @@
        * *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 @@
       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 @@
       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 @@
       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)) {