- Fixed another '&' error.

This commit is contained in:
ccremers 2004-08-13 12:14:58 +00:00
parent 887b2f3a80
commit eb55dbe35d

View File

@ -176,15 +176,15 @@ termMguInTerm (Term t1, Term t2, int (*iterator) ())
if (t2 != NULL && isTermTuple (t2)) if (t2 != NULL && isTermTuple (t2))
{ {
// t2 is a tuple, consider interm options as well. // t2 is a tuple, consider interm options as well.
flag = flag & termMguInTerm (t1, t2->left.op1, iterator); flag = flag && termMguInTerm (t1, t2->left.op1, iterator);
flag = flag & termMguInTerm (t1, t2->right.op2, iterator); flag = flag && termMguInTerm (t1, t2->right.op2, iterator);
} }
// simple clause or combined // simple clause or combined
tl = termMguTerm (t1, t2); tl = termMguTerm (t1, t2);
if (tl != MGUFAIL) if (tl != MGUFAIL)
{ {
// Iterate // Iterate
flag = flag & iterator (tl); flag = flag && iterator (tl);
// Reset variables // Reset variables
termlistSubstReset (tl); termlistSubstReset (tl);
} }
@ -211,10 +211,10 @@ termMguSubTerm (Term t1, Term t2, int (*iterator) (),
{ {
// 'simple' tuple // 'simple' tuple
flag = flag =
flag & termMguSubTerm (t1, t2->left.op1, iterator, inverses, flag && termMguSubTerm (t1, t2->left.op1, iterator, inverses,
keylist); keylist);
flag = flag =
flag & termMguSubTerm (t1, t2->right.op2, iterator, inverses, flag && termMguSubTerm (t1, t2->right.op2, iterator, inverses,
keylist); keylist);
} }
else else