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

error handling

Browse Source
This commit is contained in:
Vítor Santos Costa 2015-10-08 02:11:10 +01:00
parent 5bf02425d2
commit 3192e094af
1 changed files with 125 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
C/args.c
View File

@ -30,19 +30,65 @@ matchKey(Atom key, xarg *e0, int n, const param_t *def)
xarg * xarg *
Yap_ArgListToVector (Term listl, const param_t *def, int n) Yap_ArgListToVector (Term listl, const param_t *def, int n)
{ {
CACHE_REGS CACHE_REGS
if (IsApplTerm(listl) && FunctorOfTerm(listl) == FunctorModule) xarg *a = calloc( n , sizeof(xarg) );
listl = ArgOfTerm(2,listl); if (IsApplTerm(listl) && FunctorOfTerm(listl) == FunctorModule)
if (!IsPairTerm(listl) && listl != TermNil) { listl = ArgOfTerm(2,listl);
if (!IsPairTerm(listl) && listl != TermNil) {
if (IsVarTerm(listl) ) {
free( a );
LOCAL_Error_TYPE = INSTANTIATION_ERROR;
LOCAL_Error_Term = listl;
return NULL;
}
if (IsAtomTerm(listl) ) {
xarg *na = matchKey( AtomOfTerm(listl), a, n, def);
if (!na) {
free( a );
LOCAL_Error_TYPE = TYPE_ERROR_LIST;
LOCAL_Error_Term = listl;
return NULL;
}
} else if (IsApplTerm(listl)) {
Functor f = FunctorOfTerm( listl );
if (IsExtensionFunctor(f)) {
free( a );
LOCAL_Error_TYPE = TYPE_ERROR_LIST;
LOCAL_Error_Term = listl;
return NULL;
}
arity_t arity = ArityOfFunctor( f );
if (arity != 1) {
free( a );
LOCAL_Error_TYPE = TYPE_ERROR_LIST;
LOCAL_Error_Term = listl;
return NULL;
}
xarg *na = matchKey( NameOfFunctor( f ), a, n, def);
if (!na) {
free( a );
LOCAL_Error_TYPE = TYPE_ERROR_LIST;
LOCAL_Error_Term = listl;
return NULL;
}
} else {
free( a );
LOCAL_Error_TYPE = TYPE_ERROR_LIST;
LOCAL_Error_Term = listl;
return NULL;
}
listl = MkPairTerm( listl, TermNil ); listl = MkPairTerm( listl, TermNil );
} }
xarg *a = calloc( n , sizeof(xarg) );
while (IsPairTerm(listl)) { while (IsPairTerm(listl)) {
Term hd = HeadOfTerm( listl ); Term hd = HeadOfTerm( listl );
listl = TailOfTerm( listl ); listl = TailOfTerm( listl );
if (IsVarTerm(hd)) { if (IsVarTerm(hd) || IsVarTerm(listl)) {
LOCAL_Error_TYPE = INSTANTIATION_ERROR; LOCAL_Error_TYPE = INSTANTIATION_ERROR;
LOCAL_Error_Term = hd; if (IsVarTerm(hd)) {
LOCAL_Error_Term = hd;
} else {
LOCAL_Error_Term = listl;
}
free( a ); free( a );
return NULL; return NULL;
} }
@ -58,7 +104,7 @@ Yap_ArgListToVector (Term listl, const param_t *def, int n)
Functor f = FunctorOfTerm( hd ); Functor f = FunctorOfTerm( hd );
if (IsExtensionFunctor(f)) { if (IsExtensionFunctor(f)) {
LOCAL_Error_TYPE = TYPE_ERROR_PARAMETER; LOCAL_Error_TYPE = TYPE_ERROR_PARAMETER;
LOCAL_Error_Term = hd; LOCAL_Error_Term = hd;
free( a ); free( a );
return NULL; return NULL;
} }
@ -80,6 +126,17 @@ Yap_ArgListToVector (Term listl, const param_t *def, int n)
return NULL; return NULL;
} }
} }
if (IsVarTerm(listl)) {
LOCAL_Error_TYPE = INSTANTIATION_ERROR;
LOCAL_Error_Term = listl;
free( a );
return NULL;
} else if (listl != TermNil) {
LOCAL_Error_TYPE = TYPE_ERROR_LIST;
LOCAL_Error_Term = listl;
free( a );
return NULL;
}
return a; return a;
} }
@ -104,11 +161,54 @@ matchKey2(Atom key, xarg *e0, int n, const param2_t *def)
xarg * xarg *
Yap_ArgList2ToVector (Term listl, const param2_t *def, int n) Yap_ArgList2ToVector (Term listl, const param2_t *def, int n)
{ {
CACHE_REGS CACHE_REGS
xarg *a = calloc( n , sizeof(xarg) );
if (!IsPairTerm(listl) && listl != TermNil) { if (!IsPairTerm(listl) && listl != TermNil) {
if (IsVarTerm(listl) ) {
free( a );
LOCAL_Error_TYPE = INSTANTIATION_ERROR;
LOCAL_Error_Term = listl;
return NULL;
}
if (IsAtomTerm(listl) ) {
xarg *na = matchKey2( AtomOfTerm(listl), a, n, def);
if (!na) {
free( a );
LOCAL_Error_TYPE = TYPE_ERROR_LIST;
LOCAL_Error_Term = listl;
return NULL;
}
}
if (IsApplTerm(listl)) {
Functor f = FunctorOfTerm( listl );
if (IsExtensionFunctor(f)) {
free( a );
LOCAL_Error_TYPE = TYPE_ERROR_LIST;
LOCAL_Error_Term = listl;
return NULL;
}
arity_t arity = ArityOfFunctor( f );
if (arity != 1) {
free( a );
LOCAL_Error_TYPE = TYPE_ERROR_LIST;
LOCAL_Error_Term = listl;
return NULL;
}
xarg *na = matchKey2( NameOfFunctor( f ), a, n, def);
if (!na) {
free( a );
LOCAL_Error_TYPE = TYPE_ERROR_LIST;
LOCAL_Error_Term = listl;
return NULL;
}
} else {
free( a );
LOCAL_Error_TYPE = TYPE_ERROR_LIST;
LOCAL_Error_Term = listl;
return NULL;
}
listl = MkPairTerm( listl, TermNil ); listl = MkPairTerm( listl, TermNil );
} }
xarg *a = calloc( n , sizeof(xarg) );
while (IsPairTerm(listl)) { while (IsPairTerm(listl)) {
Term hd = HeadOfTerm( listl ); Term hd = HeadOfTerm( listl );
if (IsVarTerm(hd)) { if (IsVarTerm(hd)) {
@ -118,8 +218,12 @@ Yap_ArgList2ToVector (Term listl, const param2_t *def, int n)
} }
if (IsAtomTerm(hd)) { if (IsAtomTerm(hd)) {
xarg *na = matchKey2( AtomOfTerm( hd ), a, n, def); xarg *na = matchKey2( AtomOfTerm( hd ), a, n, def);
if (!na) if (!na) {
LOCAL_Error_TYPE = DOMAIN_ERROR_OUT_OF_RANGE;
LOCAL_Error_Term = hd;
free( a );
return NULL; return NULL;
}
na->used = true; na->used = true;
na->tvalue = TermNil; na->tvalue = TermNil;
continue; continue;
@ -150,17 +254,17 @@ Yap_ArgList2ToVector (Term listl, const param2_t *def, int n)
return NULL; return NULL;
} }
listl = TailOfTerm(listl); listl = TailOfTerm(listl);
} }
if (IsVarTerm(listl)) { if (IsVarTerm(listl)) {
LOCAL_Error_TYPE = INSTANTIATION_ERROR; LOCAL_Error_TYPE = INSTANTIATION_ERROR;
free( a ); free( a );
return NULL; return NULL;
} }
if (TermNil != listl) { if (TermNil != listl) {
LOCAL_Error_TYPE = TYPE_ERROR_LIST; LOCAL_Error_TYPE = TYPE_ERROR_LIST;
LOCAL_Error_Term = listl; LOCAL_Error_Term = listl;
free( a ); free( a );
return NULL; return NULL;
} }
return a; return a;
} }