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

TermOp1(t)). Renamed all uses.
2004-11-16 12:06:36 +00:00
parent 343314896b
commit a38925c9c2
15 changed files with 235 additions and 225 deletions
--- a/src/substitution.c
+++ b/src/substitution.c
@@ -64,14 +64,14 @@ termSubstitute (Term term, Substitution subs)
 	{
 	  if (isTermEncrypt (term))
 	    {
-	      return makeTermEncrypt (termSubstitute (term->left.op, subs),
-				      termSubstitute (term->right.key, subs));
+	      return makeTermEncrypt (termSubstitute (TermOp(term), subs),
+				      termSubstitute (TermKey(term), subs));
 	    }
 	  else
 	    {
 	      return
-		makeTermTuple (termSubstitute (term->left.op1, subs),
-			       termSubstitute (term->right.op2, subs));
+		makeTermTuple (termSubstitute (TermOp1(term), subs),
+			       termSubstitute (TermOp2(term), subs));
 	    }
 	}
      else