From 8e1c8d723e6da2fb8362dea6da96b7add8a91506 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Fri, 22 May 2009 11:24:44 -0500
Subject: [PATCH] never do P=FAILCODE directly in the code.

---
 C/eval.c | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/C/eval.c b/C/eval.c
index 0b2f69eca..f3b8dd6c6 100644
--- a/C/eval.c
+++ b/C/eval.c
@@ -46,11 +46,9 @@ Eval(Term t)
       ti[1] = MkIntegerTerm(0);
       /* error */
       terror = Yap_MkApplTerm(FunctorSlash, 2, ti);
-      Yap_ArithError(TYPE_ERROR_EVALUABLE, terror,
-	    "atom %s for arithmetic expression",
-	    RepAtom(name)->StrOfAE);
-      P = (yamop *)FAILCODE;
-      return 0L;
+      return Yap_ArithError(TYPE_ERROR_EVALUABLE, terror,
+			    "atom %s for arithmetic expression",
+			    RepAtom(name)->StrOfAE);
     }
     return Yap_eval_atom(p->FOfEE);
   } else if (IsIntTerm(t)) {
@@ -67,10 +65,8 @@ Eval(Term t)
     default:
       {
 	if ((Atom)fun == AtomFoundVar) {
-	  Yap_ArithError(TYPE_ERROR_EVALUABLE, TermNil,
+	  return Yap_ArithError(TYPE_ERROR_EVALUABLE, TermNil,
 		    "cyclic term in arithmetic expression");
-	  P = (yamop *)FAILCODE;
-	  RERROR();
 	} else {
 	  Int n = ArityOfFunctor(fun);
 	  Atom name  = NameOfFunctor(fun);
@@ -84,11 +80,9 @@ Eval(Term t)
 	    ti[0] = t;
 	    ti[1] = MkIntegerTerm(n);
 	    t = Yap_MkApplTerm(FunctorSlash, 2, ti);
-	    Yap_ArithError(TYPE_ERROR_EVALUABLE, t,
-		      "functor %s/%d for arithmetic expression",
-		      RepAtom(name)->StrOfAE,n);
-	    P = (yamop *)FAILCODE;
-	    RERROR();
+	    return Yap_ArithError(TYPE_ERROR_EVALUABLE, t,
+				  "functor %s/%d for arithmetic expression",
+				  RepAtom(name)->StrOfAE,n);
 	  }
 	  *RepAppl(t) = (CELL)AtomFoundVar;
 	  t1 = Eval(ArgOfTerm(1,t));
@@ -110,10 +104,8 @@ Eval(Term t)
     }
   } /* else if (IsPairTerm(t)) */ {
     if (TailOfTerm(t) != TermNil) {
-      Yap_ArithError(TYPE_ERROR_EVALUABLE, t,
-		"string must contain a single character to be evaluated as an arithmetic expression");
-      P = FAILCODE;
-      return 0L;
+      return Yap_ArithError(TYPE_ERROR_EVALUABLE, t,
+			    "string must contain a single character to be evaluated as an arithmetic expression");
     }
     return Eval(HeadOfTerm(t));
   }