--- ray/src/common/calfunc.c	1990/06/26 09:15:13	1.2
+++ ray/src/common/calfunc.c	1992/05/18 14:15:49	2.3
@@ -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 {
@@ -51,22 +52,22 @@ static double  l_exp(), l_log(), l_log10();
 #ifdef  BIGLIB
 			/* functions must be listed alphabetically */
 static LIBR  library[MAXLIB] = {
-    { "acos", 1, l_acos },
-    { "asin", 1, l_asin },
-    { "atan", 1, l_atan },
-    { "atan2", 2, l_atan2 },
-    { "ceil", 1, l_ceil },
-    { "cos", 1, l_cos },
-    { "exp", 1, l_exp },
-    { "floor", 1, l_floor },
-    { "if", 3, l_if },
-    { "log", 1, l_log },
-    { "log10", 1, l_log10 },
-    { "rand", 1, l_rand },
-    { "select", 1, l_select },
-    { "sin", 1, l_sin },
-    { "sqrt", 1, l_sqrt },
-    { "tan", 1, l_tan },
+    { "acos", 1, ':', l_acos },
+    { "asin", 1, ':', l_asin },
+    { "atan", 1, ':', l_atan },
+    { "atan2", 2, ':', l_atan2 },
+    { "ceil", 1, ':', l_ceil },
+    { "cos", 1, ':', l_cos },
+    { "exp", 1, ':', l_exp },
+    { "floor", 1, ':', l_floor },
+    { "if", 3, ':', l_if },
+    { "log", 1, ':', l_log },
+    { "log10", 1, ':', l_log10 },
+    { "rand", 1, ':', l_rand },
+    { "select", 1, ':', l_select },
+    { "sin", 1, ':', l_sin },
+    { "sqrt", 1, ':', l_sqrt },
+    { "tan", 1, ':', l_tan },
 };
 
 static int  libsize = 16;
@@ -74,11 +75,11 @@ static int  libsize = 16;
 #else
 			/* functions must be listed alphabetically */
 static LIBR  library[MAXLIB] = {
-    { "ceil", 1, l_ceil },
-    { "floor", 1, l_floor },
-    { "if", 3, l_if },
-    { "rand", 1, l_rand },
-    { "select", 1, l_select },
+    { "ceil", 1, ':', l_ceil },
+    { "floor", 1, ':', l_floor },
+    { "if", 3, ':', l_if },
+    { "rand", 1, ':', l_rand },
+    { "select", 1, ':', l_select },
 };
 
 static int  libsize = 5;
@@ -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;
 
@@ -145,14 +147,15 @@ double  *a;
 }
 
 
-funset(fname, nargs, fptr)		/* set a library function */
+funset(fname, nargs, assign, fptr)	/* set a library function */
 char  *fname;
 int  nargs;
+int  assign;
 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);
@@ -161,14 +164,28 @@ double  (*fptr)();
 	    if (strcmp(lp[-1].fname, fname) > 0) {
 		lp[0].fname = lp[-1].fname;
 		lp[0].nargs = lp[-1].nargs;
+		lp[0].atyp = lp[-1].atyp;
 		lp[0].f = lp[-1].f;
 	    } else
 		break;
 	libsize++;
     }
-    lp[0].fname = fname;		/* string must be static! */
-    lp[0].nargs = nargs;
-    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 */
 }
 
 
@@ -193,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) {
@@ -201,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) {
@@ -354,33 +371,39 @@ register VARDEF  *vp;
 static double
 libfunc(fname, vp)			/* execute library function */
 char  *fname;
-register VARDEF  *vp;
+VARDEF  *vp;
 {
-    VARDEF  dumdef;
+    register LIBR  *lp;
     double  d;
     int  lasterrno;
 
-    if (vp == NULL) {
-	vp = &dumdef;
-	vp->lib = NULL;
-    }
-    if (((vp->lib == NULL || strcmp(fname, vp->lib->fname)) &&
-				(vp->lib = liblookup(fname)) == NULL) ||
-		vp->lib->f == NULL) {
+    if (vp != NULL)
+	lp = vp->lib;
+    else
+	lp = liblookup(fname);
+    if (lp == NULL) {
 	eputs(fname);
 	eputs(": undefined function\n");
 	quit(1);
     }
     lasterrno = errno;
     errno = 0;
-    d = (*vp->lib->f)();
+    d = (*lp->f)(lp->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;