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

improve error handling

Browse Source
This commit is contained in:
Vítor Santos Costa 2014-10-16 23:55:34 +01:00
parent f5b48e3f82
commit 168f0c6c0c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
C/arith2.c
View File

@ -1180,14 +1180,14 @@ p_binary_is( USES_REGS1 )
if (IsIntTerm(t)) { if (IsIntTerm(t)) {
Int i = IntOfTerm(t); Int i = IntOfTerm(t);
Term tout = eval2(i, t1, t2 PASS_REGS); Term tout = eval2(i, t1, t2 PASS_REGS);
if (Yap_FoundArithError()) { if ((err = Yap_FoundArithError()) != YAP_NO_ERROR) {
Term ts[2], terr; Term ts[2], terr;
Atom name = Yap_NameOfBinaryOp( i ); Atom name = Yap_NameOfBinaryOp( i );
Functor f = Yap_MkFunctor( name, 2 ); Functor f = Yap_MkFunctor( name, 2 );
ts[0] = t1; ts[0] = t1;
ts[1] = t2; ts[1] = t2;
terr = Yap_MkApplTerm( f, 2, ts ); terr = Yap_MkApplTerm( f, 2, ts );
Yap_EvalError(err, terr ,"error in ~s/2 ", RepAtom(name)->StrOfAE); Yap_EvalError(err, terr ,"error in %s/2 ", RepAtom(name)->StrOfAE);
return FALSE; return FALSE;
} }
return Yap_unify_constant(ARG1,tout); return Yap_unify_constant(ARG1,tout);
@ -1205,13 +1205,13 @@ p_binary_is( USES_REGS1 )
ti[1] = MkIntTerm(1); ti[1] = MkIntTerm(1);
t = Yap_MkApplTerm(FunctorSlash, 2, ti); t = Yap_MkApplTerm(FunctorSlash, 2, ti);
Yap_EvalError(TYPE_ERROR_EVALUABLE, t, Yap_EvalError(TYPE_ERROR_EVALUABLE, t,
"functor %s/%d for arithmetic expression", "functor %s/2 for arithmetic expression",
RepAtom(name)->StrOfAE,2); RepAtom(name)->StrOfAE);
P = FAILCODE; P = FAILCODE;
return(FALSE); return(FALSE);
} }
out= eval2(p->FOfEE, t1, t2 PASS_REGS); out= eval2(p->FOfEE, t1, t2 PASS_REGS);
if (Yap_FoundArithError()) { if ((err = Yap_FoundArithError()) != YAP_NO_ERROR) {
Term ts[2], terr; Term ts[2], terr;
Functor f = Yap_MkFunctor( name, 2 ); Functor f = Yap_MkFunctor( name, 2 );
ts[0] = t1; ts[0] = t1;