--- ray/src/common/calfunc.c	1991/04/23 15:44:39	1.4
+++ ray/src/common/calfunc.c	1992/05/15 16:38:47	2.2
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1991 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -22,7 +22,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "calcomp.h"
 
-
+				/* bits in argument flag (better be right!) */
+#define  AFLAGSIZ	(8*sizeof(unsigned long))
 #define  ALISTSIZ	6	/* maximum saved argument list */
 
 typedef struct activation {
@@ -87,8 +88,6 @@ static int  libsize = 5;
 
 extern char  *savestr(), *emalloc();
 
-extern LIBR  *liblookup();
-
 extern VARDEF  *argf();
 
 #ifdef  VARIABLE
@@ -130,7 +129,10 @@ double  *a;
     act.name = fname;
     act.prev = curact;
     act.ap = a;
-    act.an = (1L<<n)-1;
+    if (n >= AFLAGSIZ)
+	act.an = ~0;
+    else
+	act.an = (1L<<n)-1;
     act.fun = NULL;
     curact = &act;
 
@@ -153,7 +155,7 @@ double  (*fptr)();
 {
     register LIBR  *lp;
 
-    if ((lp = liblookup(fname)) == NULL) {
+    if ((lp = liblookup(fname)) == NULL) {	/* insert */
 	if (libsize >= MAXLIB) {
 	    eputs("Too many library functons!\n");
 	    quit(1);
@@ -168,10 +170,22 @@ double  (*fptr)();
 		break;
 	libsize++;
     }
-    lp[0].fname = savestr(fname);
-    lp[0].nargs = nargs;
-    lp[0].atyp = assign;
-    lp[0].f = fptr;
+    if (fptr == NULL) {				/* delete */
+	while (lp < &library[libsize-1]) {
+	    lp[0].fname = lp[1].fname;
+	    lp[0].nargs = lp[1].nargs;
+	    lp[0].atyp = lp[1].atyp;
+	    lp[0].f = lp[1].f;
+	    lp++;
+	}
+	libsize--;
+    } else {					/* or assign */
+	lp[0].fname = fname;		/* string must be static! */
+	lp[0].nargs = nargs;
+	lp[0].atyp = assign;
+	lp[0].f = fptr;
+    }
+    libupdate(fname);			/* relink library */
 }
 
 
@@ -196,7 +210,7 @@ argument(n)			/* return nth argument for active functi
 register int  n;
 {
     register ACTIVATION  *actp = curact;
-    EPNODE  *ep;
+    register EPNODE  *ep;
     double  aval;
 
     if (actp == NULL || --n < 0) {
@@ -204,7 +218,7 @@ register int  n;
 	quit(1);
     }
 						/* already computed? */
-    if (1L<<n & actp->an)
+    if (n < AFLAGSIZ && 1L<<n & actp->an)
 	return(actp->ap[n]);
 
     if (actp->fun == NULL || (ep = ekid(actp->fun, n+1)) == NULL) {
@@ -365,25 +379,31 @@ register VARDEF  *vp;
 
     if (vp == NULL) {
 	vp = &dumdef;
-	vp->lib = NULL;
+	vp->lib = liblookup(fname);
     }
-    if (((vp->lib == NULL || strcmp(fname, vp->lib->fname)) &&
-				(vp->lib = liblookup(fname)) == NULL) ||
-		vp->lib->f == NULL) {
+    if (vp->lib == NULL) {
 	eputs(fname);
 	eputs(": undefined function\n");
 	quit(1);
     }
     lasterrno = errno;
     errno = 0;
-    d = (*vp->lib->f)();
+    d = (*vp->lib->f)(vp->lib->fname);
 #ifdef  IEEE
-    if (!finite(d))
-	errno = EDOM;
+    if (errno == 0)
+	if (isnan(d))
+	    errno = EDOM;
+	else if (isinf(d))
+	    errno = ERANGE;
 #endif
     if (errno) {
 	wputs(fname);
-	wputs(": bad call\n");
+	if (errno == EDOM)
+		wputs(": domain error\n");
+	else if (errno == ERANGE)
+		wputs(": range error\n");
+	else
+		wputs(": error in call\n");
 	return(0.0);
     }
     errno = lasterrno;