--- ray/src/common/calexpr.c	1991/08/08 13:40:09	1.14
+++ ray/src/common/calexpr.c	1992/10/06 12:29:36	2.9
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -24,15 +24,19 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <errno.h>
 
+#include  <math.h>
+
 #include  "calcomp.h"
 
-#define  MAXLINE	256		/* maximum line length */
+#define	 MAXLINE	256		/* maximum line length */
 
-#define  newnode()	(EPNODE *)ecalloc(1, sizeof(EPNODE))
+#define	 newnode()	(EPNODE *)ecalloc(1, sizeof(EPNODE))
 
-#define  isdecimal(c)	(isdigit(c) || (c) == '.')
+#define	 isdecimal(c)	(isdigit(c) || (c) == '.')
 
-extern double  atof(), pow();
+#ifndef atof
+extern double  atof();
+#endif
 extern char  *fgets(), *savestr();
 extern char  *emalloc(), *ecalloc();
 extern EPNODE  *curfunc;
@@ -40,25 +44,24 @@ extern double  efunc(), evariable();
 static double  euminus(), echannel(), eargument(), enumber();
 static double  eadd(), esubtr(), emult(), edivi(), epow();
 static double  ebotch();
-extern int  errno;
 
 int  nextc;				/* lookahead character */
 
-double  (*eoper[])() = {		/* expression operations */
+double	(*eoper[])() = {		/* expression operations */
 	ebotch,
-#ifdef  VARIABLE
+#ifdef	VARIABLE
 	evariable,
 #else
 	ebotch,
 #endif
 	enumber,
 	euminus,
-#ifdef  INCHAN
+#ifdef	INCHAN
 	echannel,
 #else
 	ebotch,
 #endif
-#ifdef  FUNCTION
+#ifdef	FUNCTION
 	efunc,
 	eargument,
 #else
@@ -123,7 +126,7 @@ char  *expr;
 
 
 epfree(epar)			/* free a parse tree */
-register EPNODE  *epar;
+register EPNODE	 *epar;
 {
     register EPNODE  *ep;
 
@@ -133,11 +136,11 @@ register EPNODE  *epar;
 	case VAR:
 	    varfree(epar->v.ln);
 	    break;
-#endif
 	    
 	case SYM:
 	    freestr(epar->v.name);
 	    break;
+#endif
 
 	case NUM:
 	case CHAN:
@@ -156,10 +159,10 @@ register EPNODE  *epar;
 }
 
 				/* the following used to be a switch */
-#ifdef  FUNCTION
+#ifdef	FUNCTION
 static double
 eargument(ep)
-EPNODE  *ep;
+EPNODE	*ep;
 {
     return(argument(ep->v.chan));
 }
@@ -167,24 +170,24 @@ EPNODE  *ep;
 
 static double
 enumber(ep)
-EPNODE  *ep;
+EPNODE	*ep;
 {
     return(ep->v.num);
 }
 
 static double
 euminus(ep)
-EPNODE  *ep;
+EPNODE	*ep;
 {
     register EPNODE  *ep1 = ep->v.kid;
 
     return(-evalue(ep1));
 }
 
-#ifdef  INCHAN
+#ifdef	INCHAN
 static double
 echannel(ep)
-EPNODE  *ep;
+EPNODE	*ep;
 {
     return(chanvalue(ep->v.chan));
 }
@@ -192,7 +195,7 @@ EPNODE  *ep;
 
 static double
 eadd(ep)
-EPNODE  *ep;
+EPNODE	*ep;
 {
     register EPNODE  *ep1 = ep->v.kid;
 
@@ -201,7 +204,7 @@ EPNODE  *ep;
 
 static double
 esubtr(ep)
-EPNODE  *ep;
+EPNODE	*ep;
 {
     register EPNODE  *ep1 = ep->v.kid;
 
@@ -210,7 +213,7 @@ EPNODE  *ep;
 
 static double
 emult(ep)
-EPNODE  *ep;
+EPNODE	*ep;
 {
     register EPNODE  *ep1 = ep->v.kid;
 
@@ -219,7 +222,7 @@ EPNODE  *ep;
 
 static double
 edivi(ep)
-EPNODE  *ep;
+EPNODE	*ep;
 {
     register EPNODE  *ep1 = ep->v.kid;
     double  d;
@@ -235,16 +238,16 @@ EPNODE  *ep;
 
 static double
 epow(ep)
-EPNODE  *ep;
+EPNODE	*ep;
 {
     register EPNODE  *ep1 = ep->v.kid;
     double  d;
-    int  lasterrno;
+    int	 lasterrno;
 
     lasterrno = errno;
     errno = 0;
     d = pow(evalue(ep1), evalue(ep1->sibling));
-#ifdef  IEEE
+#ifdef	IEEE
     if (!finite(d))
 	errno = EDOM;
 #endif
@@ -258,7 +261,7 @@ EPNODE  *ep;
 
 static double
 ebotch(ep)
-EPNODE  *ep;
+EPNODE	*ep;
 {
     eputs("Bad expression!\n");
     quit(1);
@@ -267,7 +270,7 @@ EPNODE  *ep;
 
 EPNODE *
 ekid(ep, n)			/* return pointer to a node's nth kid */
-register EPNODE  *ep;
+register EPNODE	 *ep;
 register int  n;
 {
 
@@ -281,7 +284,7 @@ register int  n;
 
 int
 nekids(ep)			/* return # of kids for node ep */
-register EPNODE  *ep;
+register EPNODE	 *ep;
 {
     register int  n = 0;
 
@@ -297,7 +300,7 @@ FILE  *fp;
 char  *fn;
 int  ln;
 {
-    static char  inpbuf[MAXLINE];
+    static char	 inpbuf[MAXLINE];
 
     infp = fp;
     linbuf = inpbuf;
@@ -369,12 +372,12 @@ scan()				/* scan next character, return literal next 
 
 
 char *
-ltoa(l)				/* convert long to ascii */
+long2ascii(l)			      /* convert long to ascii */
 long  l;
 {
-    static char  buf[16];
+    static char	 buf[16];
     register char  *cp;
-    int  neg = 0;
+    int	 neg = 0;
 
     if (l == 0)
 	return("0");
@@ -403,9 +406,9 @@ char  *err;
 	if (infile != NULL) eputs(infile);
 	if (lineno != 0) {
 	    eputs(infile != NULL ? ", line " : "line ");
-	    eputs(ltoa((long)lineno));
+	    eputs(long2ascii((long)lineno));
 	}
-	eputs(": syntax error:\n");
+	eputs(":\n");
     }
     eputs(linbuf);
     if (linbuf[strlen(linbuf)-1] != '\n')
@@ -420,8 +423,8 @@ char  *err;
 
 
 addekid(ep, ekid)			/* add a child to ep */
-register EPNODE  *ep;
-EPNODE  *ekid;
+register EPNODE	 *ep;
+EPNODE	*ekid;
 {
     if (ep->v.kid == NULL)
 	ep->v.kid = ekid;
@@ -434,19 +437,23 @@ EPNODE  *ekid;
 }
 
 
+#if  defined(VARIABLE) || defined(FUNCTION)
 char *
 getname()			/* scan an identifier */
 {
-    static char  str[MAXWORD+1];
+    static char	 str[MAXWORD+1];
     register int  i, lnext;
 
     lnext = nextc;
     for (i = 0; i < MAXWORD && isid(lnext); i++, lnext = scan())
 	str[i] = lnext;
     str[i] = '\0';
+    while (isid(lnext))		/* skip rest of name */
+	lnext = scan();
 
     return(str);
 }
+#endif
 
 
 int
@@ -477,16 +484,16 @@ getnum()			/* scan a positive float */
 	lnext = scan();
     }
     if (lnext == '.' && i < MAXWORD) {
-    	str[i++] = lnext;
-    	lnext = scan();
+	str[i++] = lnext;
+	lnext = scan();
 	while (isdigit(lnext) && i < MAXWORD) {
 	    str[i++] = lnext;
 	    lnext = scan();
 	}
     }
     if ((lnext == 'e' || lnext == 'E') && i < MAXWORD) {
-    	str[i++] = lnext;
-    	lnext = scan();
+	str[i++] = lnext;
+	lnext = scan();
 	if ((lnext == '-' || lnext == '+') && i < MAXWORD) {
 	    str[i++] = lnext;
 	    lnext = scan();
@@ -504,7 +511,7 @@ getnum()			/* scan a positive float */
 
 EPNODE *
 getE1()				/* E1 -> E1 ADDOP E2 */
-				/*       E2 */
+				/*	 E2 */
 {
     register EPNODE  *ep1, *ep2;
 
@@ -515,7 +522,7 @@ getE1()				/* E1 -> E1 ADDOP E2 */
 	scan();
 	addekid(ep2, ep1);
 	addekid(ep2, getE2());
-#ifdef  RCONST
+#ifdef	RCONST
 	if (ep1->type == NUM && ep1->sibling->type == NUM)
 		ep2 = rconst(ep2);
 #endif
@@ -527,7 +534,7 @@ getE1()				/* E1 -> E1 ADDOP E2 */
 
 EPNODE *
 getE2()				/* E2 -> E2 MULOP E3 */
-				/*       E3 */
+				/*	 E3 */
 {
     register EPNODE  *ep1, *ep2;
 
@@ -538,7 +545,7 @@ getE2()				/* E2 -> E2 MULOP E3 */
 	scan();
 	addekid(ep2, ep1);
 	addekid(ep2, getE3());
-#ifdef  RCONST
+#ifdef	RCONST
 	if (ep1->type == NUM && ep1->sibling->type == NUM)
 		ep2 = rconst(ep2);
 #endif
@@ -550,7 +557,7 @@ getE2()				/* E2 -> E2 MULOP E3 */
 
 EPNODE *
 getE3()				/* E3 -> E4 ^ E3 */
-				/*       E4 */
+				/*	 E4 */
 {
     register EPNODE  *ep1, *ep2;
 
@@ -561,7 +568,7 @@ getE3()				/* E3 -> E4 ^ E3 */
 	scan();
 	addekid(ep2, ep1);
 	addekid(ep2, getE3());
-#ifdef  RCONST
+#ifdef	RCONST
 	if (ep1->type == NUM && ep1->sibling->type == NUM)
 		ep2 = rconst(ep2);
 #endif
@@ -573,7 +580,7 @@ getE3()				/* E3 -> E4 ^ E3 */
 
 EPNODE *
 getE4()				/* E4 -> ADDOP E5 */
-				/*       E5 */
+				/*	 E5 */
 {
     register EPNODE  *ep1, *ep2;
 
@@ -584,6 +591,10 @@ getE4()				/* E4 -> ADDOP E5 */
 		ep2->v.num = -ep2->v.num;
 		return(ep2);
 	}
+	if (ep2->type == UMINUS) {	/* don't generate -(-E5) */
+	    efree((char *)ep2);
+	    return(ep2->v.kid);
+	}
 	ep1 = newnode();
 	ep1->type = UMINUS;
 	addekid(ep1, ep2);
@@ -597,13 +608,13 @@ getE4()				/* E4 -> ADDOP E5 */
 
 EPNODE *
 getE5()				/* E5 -> (E1) */
-				/*       VAR */
-				/*       NUM */
-				/*       $N */
-				/*       FUNC(E1,..) */
-				/*       ARG */
+				/*	 VAR */
+				/*	 NUM */
+				/*	 $N */
+				/*	 FUNC(E1,..) */
+				/*	 ARG */
 {
-    int  i;
+    int	 i;
     char  *nam;
     register EPNODE  *ep1, *ep2;
 
@@ -616,7 +627,7 @@ getE5()				/* E5 -> (E1) */
 	return(ep1);
     }
 
-#ifdef  INCHAN
+#ifdef	INCHAN
     if (nextc == '$') {
 	scan();
 	ep1 = newnode();
@@ -627,13 +638,13 @@ getE5()				/* E5 -> (E1) */
 #endif
 
 #if  defined(VARIABLE) || defined(FUNCTION)
-    if (isalpha(nextc)) {
+    if (isalpha(nextc) || nextc == CNTXMARK) {
 	nam = getname();
 #if  defined(VARIABLE) && defined(FUNCTION)
 	ep1 = NULL;
 	if (curfunc != NULL)
 	    for (i = 1, ep2 = curfunc->v.kid->sibling;
-	    			ep2 != NULL; i++, ep2 = ep2->sibling)
+				ep2 != NULL; i++, ep2 = ep2->sibling)
 		if (!strcmp(ep2->v.name, nam)) {
 		    ep1 = newnode();
 		    ep1->type = ARG;
@@ -647,7 +658,7 @@ getE5()				/* E5 -> (E1) */
 	    ep1->type = VAR;
 	    ep1->v.ln = varinsert(nam);
 	}
-#ifdef  FUNCTION
+#ifdef	FUNCTION
 	if (nextc == '(') {
 	    ep2 = newnode();
 	    ep2->type = FUNC;
@@ -661,12 +672,12 @@ getE5()				/* E5 -> (E1) */
 		syntax("')' expected");
 	    scan();
 	}
-#ifndef  VARIABLE
+#ifndef	 VARIABLE
 	else
 	    syntax("'(' expected");
 #endif
 #endif
-#ifdef  RCONST
+#ifdef	RCONST
 	if (isconstvar(ep1))
 	    ep1 = rconst(ep1);
 #endif
@@ -684,10 +695,10 @@ getE5()				/* E5 -> (E1) */
 }
 
 
-#ifdef  RCONST
+#ifdef	RCONST
 EPNODE *
 rconst(epar)			/* reduce a constant expression */
-register EPNODE  *epar;
+register EPNODE	 *epar;
 {
     register EPNODE  *ep;
 
@@ -696,7 +707,7 @@ register EPNODE  *epar;
     errno = 0;
     ep->v.num = evalue(epar);
     if (errno)
-    	syntax("bad constant expression");
+	syntax("bad constant expression");
     epfree(epar);
  
     return(ep);
@@ -704,11 +715,11 @@ register EPNODE  *epar;
 
 
 isconstvar(ep)			/* is ep linked to a constant expression? */
-register EPNODE  *ep;
+register EPNODE	 *ep;
 {
-#ifdef  VARIABLE
+#ifdef	VARIABLE
     register EPNODE  *ep1;
-#ifdef  FUNCTION
+#ifdef	FUNCTION
 
     if (ep->type == FUNC) {
 	if (!isconstfun(ep->v.kid))
@@ -724,7 +735,7 @@ register EPNODE  *ep;
     ep1 = ep->v.ln->def;
     if (ep1 == NULL || ep1->type != ':')
 	return(0);
-#ifdef  FUNCTION
+#ifdef	FUNCTION
     if (ep1->v.kid->type != SYM)
 	return(0);
 #endif
@@ -737,21 +748,18 @@ register EPNODE  *ep;
 
 #if  defined(FUNCTION) && defined(VARIABLE)
 isconstfun(ep)			/* is ep linked to a constant function? */
-register EPNODE  *ep;
+register EPNODE	 *ep;
 {
     register EPNODE  *dp;
     register LIBR  *lp;
 
     if (ep->type != VAR)
 	return(0);
-    dp = ep->v.ln->def;
-    if (dp != NULL && dp->type != ':')
-	return(0);
-    if ((dp == NULL || dp->v.kid->type != FUNC)
-	    && ((lp = liblookup(ep->v.ln->name)) == NULL
-		    || lp->atyp != ':'))
-	return(0);
-    return(1);
+    if ((dp = ep->v.ln->def) != NULL && dp->v.kid->type == FUNC)
+	return(dp->type == ':');
+    if ((lp = ep->v.ln->lib) != NULL)
+	return(lp->atyp == ':');
+    return(0);
 }
 #endif
 #endif