- Added some useful macros to term.h to address subparts (e.g.

TermOp1(t)). Renamed all uses.
This commit is contained in:
ccremers
2004-11-16 12:06:36 +00:00
parent 343314896b
commit a38925c9c2
15 changed files with 235 additions and 225 deletions

View File

@@ -241,7 +241,7 @@ levelFind (Symbol s, int level)
{
if (isTermLeaf (tl->term))
{
if (tl->term->left.symb == s)
if (TermSymb(tl->term) == s)
{
return tl->term;
}
@@ -505,7 +505,7 @@ commEvent (int event, Tac tc)
else
{
/* n parameters */
msg = deVar (claimbig)->right.op2;
msg = TermOp2(deVar (claimbig));
if (tupleCount (msg) != n)
{
error ("Problem with claim tuple unfolding at line %i.",
@@ -690,7 +690,7 @@ runInstanceCreate (Tac tc)
/* first, locate the protocol */
psym = tc->t1.tac->t1.sym;
p = sys->protocols;
while (p != NULL && p->nameterm->left.symb != psym)
while (p != NULL && TermSymb(p->nameterm) != psym)
p = p->next;
if (p == NULL)
{
@@ -703,7 +703,7 @@ runInstanceCreate (Tac tc)
/* locate the role */
rsym = tc->t1.tac->t2.sym;
r = p->roles;
while (r != NULL && r->nameterm->left.symb != rsym)
while (r != NULL && TermSymb(r->nameterm) != rsym)
r = r->next;
if (r == NULL)
{