--- ray/src/common/calexpr.c	2003/07/17 09:21:29	2.24
+++ ray/src/common/calexpr.c	2003/08/04 19:20:26	2.27
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: calexpr.c,v 2.24 2003/07/17 09:21:29 schorsch Exp $";
+static const char	RCSid[] = "$Id: calexpr.c,v 2.27 2003/08/04 19:20:26 greg Exp $";
 #endif
 /*
  *  Compute data values using expression parser
@@ -47,7 +47,7 @@ unsigned int  esupport =		/* what to support */
 
 int  nextc;				/* lookahead character */
 
-double	(*eoper[])() = {		/* expression operations */
+double	(*eoper[])(EPNODE *) = {	/* expression operations */
 	ebotch,
 	evariable,
 	enumber,
@@ -128,7 +128,7 @@ register EPNODE  *ep1, *ep2;
 		if (ep2->v.num == 0)
 			return(ep1->v.num != 0);
 		d = ep1->v.num / ep2->v.num;
-		return(d > 1.000000000001 | d < 0.999999999999);
+		return((d > 1.000000000001) | (d < 0.999999999999));
 
 	case CHAN:
 	case ARG:
@@ -527,10 +527,10 @@ getnum()			/* scan a positive float */
 	    lnext = scan();
 	}
     }
-    if ((lnext == 'e' | lnext == 'E') && i < RMAXWORD) {
+    if ((lnext == 'e') | (lnext == 'E') && i < RMAXWORD) {
 	str[i++] = lnext;
 	lnext = scan();
-	if ((lnext == '-' | lnext == '+') && i < RMAXWORD) {
+	if ((lnext == '-') | (lnext == '+') && i < RMAXWORD) {
 	    str[i++] = lnext;
 	    lnext = scan();
 	}
@@ -771,11 +771,12 @@ register EPNODE	 *ep;
 
     if (ep->type != VAR)
 	return(0);
-    if ((dp = ep->v.ln->def) != NULL)
+    if ((dp = ep->v.ln->def) != NULL) {
 	if (dp->v.kid->type == FUNC)
 	    return(dp->type == ':');
 	else
 	    return(0);		/* don't identify masked library functions */
+    }
     if ((lp = ep->v.ln->lib) != NULL)
 	return(lp->atyp == ':');
     return(0);