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

generate error if module is unspecified (obs from Ulrich Neumerkel).

Browse Source
This commit is contained in:
Vitor Santos Costa 2009-05-07 23:14:28 -04:00
parent 7d37428f36
commit 21fa27526c
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
C/exec.c
View File

@ -210,6 +210,12 @@ do_execute(Term t, Term mod)
mod = tmod; mod = tmod;
t = ArgOfTerm(2,t); t = ArgOfTerm(2,t);
goto restart_exec; goto restart_exec;
} else {
if (IsVarTerm(tmod)) {
return CallError(INSTANTIATION_ERROR,t);
} else {
return CallError(TYPE_ERROR_ATOM,t);
}
} }
} else { } else {
return CallMetaCall(mod); return CallMetaCall(mod);
@ -320,6 +326,12 @@ do_execute_n(Term t, Term mod, unsigned int n)
mod = tmod; mod = tmod;
t = ArgOfTerm(2,t); t = ArgOfTerm(2,t);
goto restart_exec; goto restart_exec;
} else {
if (IsVarTerm(tmod)) {
return CallError(INSTANTIATION_ERROR,t);
} else {
return CallError(TYPE_ERROR_ATOM,t);
}
} }
} }
arity = ArityOfFunctor(f)+n; arity = ArityOfFunctor(f)+n;
@ -674,6 +686,12 @@ p_execute0(void)
mod = tmod; mod = tmod;
t = ArgOfTerm(2,t); t = ArgOfTerm(2,t);
goto restart_exec; goto restart_exec;
} else {
if (IsVarTerm(tmod)) {
return CallError(INSTANTIATION_ERROR,t);
} else {
return CallError(TYPE_ERROR_ATOM,t);
}
} }
} }
pe = PredPropByFunc(f, mod); pe = PredPropByFunc(f, mod);
@ -734,6 +752,12 @@ p_execute_nonstop(void)
mod = tmod; mod = tmod;
t = ArgOfTerm(2,t); t = ArgOfTerm(2,t);
goto restart_exec; goto restart_exec;
} else {
if (IsVarTerm(tmod)) {
return CallError(INSTANTIATION_ERROR,t);
} else {
return CallError(TYPE_ERROR_ATOM,t);
}
} }
} }
pe = PredPropByFunc(f, mod); pe = PredPropByFunc(f, mod);
@ -1221,6 +1245,13 @@ Yap_RunTopGoal(Term t)
mod = tmod; mod = tmod;
t = ArgOfTerm(2,t); t = ArgOfTerm(2,t);
goto restart_runtopgoal; goto restart_runtopgoal;
} else {
if (IsVarTerm(tmod)) {
Yap_Error(INSTANTIATION_ERROR,t,"call/1");
} else {
Yap_Error(TYPE_ERROR_ATOM,t,"call/1");
}
return FALSE;
} }
} }
/* I cannot use the standard macro here because /* I cannot use the standard macro here because