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

Work in progress fixing evaluable type error terms

Browse Source
This commit is contained in:
Paulo Moura
2015-04-09 01:51:36 +01:00
parent 580bc9eb27
commit b91c535ea3
4 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
C/arith1.c
View File

@@ -1003,14 +1003,7 @@ p_unary_is( USES_REGS1 )
Term out;
if (EndOfPAEntr(p = RepExpProp(Yap_GetExpProp(name, 1)))) {
Term ti[2];
/* error */
ti[0] = t;
ti[1] = MkIntTerm(1);
t = Yap_MkApplTerm(FunctorSlash, 2, ti);
Yap_EvalError(TYPE_ERROR_EVALUABLE, t,
Yap_EvalError(TYPE_ERROR_EVALUABLE, takeName(t),
"functor %s/1 for arithmetic expression",
RepAtom(name)->StrOfAE);
return FALSE;

8
C/arith2.c
View File

@@ -1199,13 +1199,7 @@ p_binary_is( USES_REGS1 )
Term out;
if (EndOfPAEntr(p = RepExpProp(Yap_GetExpProp(name, 2)))) {
Term ti[2];
/* error */
ti[0] = t;
ti[1] = MkIntTerm(1);
t = Yap_MkApplTerm(FunctorSlash, 2, ti);
Yap_EvalError(TYPE_ERROR_EVALUABLE, t,
Yap_EvalError(TYPE_ERROR_EVALUABLE, takeName(t),
"functor %s/2 for arithmetic expression",
RepAtom(name)->StrOfAE);
P = FAILCODE;

16
C/eval.c
View File

@@ -106,14 +106,6 @@ Eval(Term t USES_REGS)
Atom name = AtomOfTerm(t);
if (EndOfPAEntr(p = RepExpProp(Yap_GetExpProp(name, 0)))) {
/* error */
Term ti[2];
/* error */
ti[0] = t;
ti[1] = MkIntTerm(0);
t = Yap_MkApplTerm(FunctorSlash, 2, ti);
return Yap_ArithError(TYPE_ERROR_EVALUABLE, t,
"atom %s in arithmetic expression",
RepAtom(name)->StrOfAE);
@@ -137,13 +129,7 @@ Eval(Term t USES_REGS)
Term t1, t2;
if (EndOfPAEntr(p = RepExpProp(Yap_GetExpProp(name, n)))) {
Term ti[2];
/* error */
ti[0] = t;
ti[1] = MkIntegerTerm(n);
t = Yap_MkApplTerm(FunctorSlash, 2, ti);
return Yap_ArithError(TYPE_ERROR_EVALUABLE, t,
return Yap_ArithError(TYPE_ERROR_EVALUABLE, takeName(t),
"functor %s/%d for arithmetic expression",
RepAtom(name)->StrOfAE,n);
}

7
H/eval.h
View File

@@ -415,6 +415,13 @@ Yap_FoundArithError__(USES_REGS1)
return YAP_NO_ERROR;
}
static inline Term takeName(Term t) {
if (IsAtomTerm(t)) return t;
MkAtomTerm(NameOfFunctor(FunctorOfTerm(t)));
if (IsPairTerm(t)) return TermNil;
return t;
}
Atom Yap_NameOfUnaryOp(int i);
Atom Yap_NameOfBinaryOp(int i);