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

compiler should check for variables first!

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@694 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2002-11-20 05:17:26 +00:00
parent bf37b29b4b
commit 1530bf21ed
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
C/compiler.c
View File

@ -1127,8 +1127,12 @@ c_goal(Term Goal, int mod)
if (IsApplTerm(Goal) && FunctorOfTerm(Goal) == FunctorModule) {
Term M = ArgOfTerm(1, Goal);
if (!IsVarTerm(M) && !IsAtomTerm(M)) {
Yap_Error_TYPE = TYPE_ERROR_ATOM;
if (IsVarTerm(M) || !IsAtomTerm(M)) {
if (IsVarTerm(M)) {
Yap_Error_TYPE = INSTANTIATION_ERROR;
} else {
Yap_Error_TYPE = TYPE_ERROR_ATOM;
}
Yap_Error_Term = M;
Yap_ErrorMessage = "in module name";
save_machine_regs();
@ -1137,10 +1141,11 @@ c_goal(Term Goal, int mod)
Goal = ArgOfTerm(2, Goal);
mod = Yap_LookupModule(M);
}
if (IsNumTerm(Goal)) {
if (IsVarTerm(Goal)) {
Goal = Yap_MkApplTerm(FunctorCall, 1, &Goal);
} else if (IsNumTerm(Goal)) {
FAIL("goal can not be a number", TYPE_ERROR_CALLABLE, Goal);
}
else if (IsRefTerm(Goal)) {
} else if (IsRefTerm(Goal)) {
Yap_Error_TYPE = TYPE_ERROR_DBREF;
Yap_Error_Term = Goal;
FAIL("goal argument in static procedure can not be a data base reference", TYPE_ERROR_CALLABLE, Goal);
@ -1148,9 +1153,6 @@ c_goal(Term Goal, int mod)
else if (IsPairTerm(Goal)) {
Goal = Yap_MkApplTerm(FunctorCall, 1, &Goal);
}
else if (IsVarTerm(Goal)) {
Goal = Yap_MkApplTerm(FunctorCall, 1, &Goal);
}
if (IsAtomTerm(Goal)) {
Atom atom = AtomOfTerm(Goal);