--- ray/src/common/calfunc.c	1991/08/02 14:11:17	1.9
+++ ray/src/common/calfunc.c	1992/11/22 17:29:46	2.7
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -20,6 +20,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <errno.h>
 
+#include  <math.h>
+
 #include  "calcomp.h"
 
 				/* bits in argument flag (better be right!) */
@@ -88,8 +90,6 @@ static int  libsize = 5;
 
 extern char  *savestr(), *emalloc();
 
-extern LIBR  *liblookup();
-
 extern VARDEF  *argf();
 
 #ifdef  VARIABLE
@@ -104,17 +104,16 @@ int
 fundefined(fname)		/* return # of arguments for function */
 char  *fname;
 {
-    LIBR  *lp;
+    register LIBR  *lp;
     register VARDEF  *vp;
 
-    if ((vp = varlookup(fname)) == NULL || vp->def == NULL
-		|| vp->def->v.kid->type != FUNC)
-	if ((lp = liblookup(fname)) == NULL)
-	    return(0);
-	else
-	    return(lp->nargs);
-    else
+    if ((vp = varlookup(fname)) != NULL && vp->def != NULL
+		&& vp->def->v.kid->type == FUNC)
 	return(nekids(vp->def->v.kid) - 1);
+    lp = vp != NULL ? vp->lib : liblookup(fname);
+    if (lp == NULL)
+	return(0);
+    return(lp->nargs);
 }
 
 
@@ -155,9 +154,10 @@ int  nargs;
 int  assign;
 double  (*fptr)();
 {
+    int  oldlibsize = libsize;
     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);
@@ -172,10 +172,23 @@ double  (*fptr)();
 		break;
 	libsize++;
     }
-    lp[0].fname = fname;		/* must be static! */
-    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;
+    }
+    if (libsize != oldlibsize)
+	libupdate(fname);			/* relink library */
 }
 
 
@@ -327,6 +340,9 @@ char  *fname;
 
 
 #ifndef  VARIABLE
+static VARDEF  *varlist = NULL;		/* our list of dummy variables */
+
+
 VARDEF *
 varinsert(vname)		/* dummy variable insert */
 char  *vname;
@@ -337,8 +353,9 @@ char  *vname;
     vp->name = savestr(vname);
     vp->nlinks = 1;
     vp->def = NULL;
-    vp->lib = NULL;
-    vp->next = NULL;
+    vp->lib = liblookup(vname);
+    vp->next = varlist;
+    varlist = vp;
     return(vp);
 }
 
@@ -346,9 +363,28 @@ char  *vname;
 varfree(vp)			/* free dummy variable */
 register VARDEF  *vp;
 {
+    register VARDEF  *vp2;
+
+    if (vp == varlist)
+	varlist = vp->next;
+    else {
+	for (vp2 = varlist; vp2->next != vp; vp2 = vp2->next)
+		;
+	vp2->next = vp->next;
+    }
     freestr(vp->name);
     efree((char *)vp);
 }
+
+
+libupdate(nm)			/* update library */
+char  *nm;
+{
+    register VARDEF  *vp;
+
+    for (vp = varlist; vp != NULL; vp = vp->next)
+	vp->lib = liblookup(vp->name);
+}
 #endif
 
 
@@ -361,26 +397,24 @@ 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)(vp->lib->fname);
+    d = (*lp->f)(lp->fname);
 #ifdef  IEEE
     if (errno == 0)
 	if (isnan(d))
@@ -438,7 +472,6 @@ l_select()		/* return argument #(A1+1) */
 static double
 l_rand()		/* random function between 0 and 1 */
 {
-    extern double  floor();
     double  x;
 
     x = argument(1);
@@ -452,8 +485,6 @@ l_rand()		/* random function between 0 and 1 */
 static double
 l_floor()		/* return largest integer not greater than arg1 */
 {
-    extern double  floor();
-
     return(floor(argument(1)));
 }
 
@@ -461,8 +492,6 @@ l_floor()		/* return largest integer not greater than 
 static double
 l_ceil()		/* return smallest integer not less than arg1 */
 {
-    extern double  ceil();
-
     return(ceil(argument(1)));
 }
 
@@ -471,8 +500,6 @@ l_ceil()		/* return smallest integer not less than arg
 static double
 l_sqrt()
 {
-    extern double  sqrt();
-
     return(sqrt(argument(1)));
 }
 
@@ -480,8 +507,6 @@ l_sqrt()
 static double
 l_sin()
 {
-    extern double  sin();
-
     return(sin(argument(1)));
 }
 
@@ -489,8 +514,6 @@ l_sin()
 static double
 l_cos()
 {
-    extern double  cos();
-
     return(cos(argument(1)));
 }
 
@@ -498,8 +521,6 @@ l_cos()
 static double
 l_tan()
 {
-    extern double  tan();
-
     return(tan(argument(1)));
 }
 
@@ -507,8 +528,6 @@ l_tan()
 static double
 l_asin()
 {
-    extern double  asin();
-
     return(asin(argument(1)));
 }
 
@@ -516,8 +535,6 @@ l_asin()
 static double
 l_acos()
 {
-    extern double  acos();
-
     return(acos(argument(1)));
 }
 
@@ -525,8 +542,6 @@ l_acos()
 static double
 l_atan()
 {
-    extern double  atan();
-
     return(atan(argument(1)));
 }
 
@@ -534,8 +549,6 @@ l_atan()
 static double
 l_atan2()
 {
-    extern double  atan2();
-
     return(atan2(argument(1), argument(2)));
 }
 
@@ -543,8 +556,6 @@ l_atan2()
 static double
 l_exp()
 {
-    extern double  exp();
-
     return(exp(argument(1)));
 }
 
@@ -552,8 +563,6 @@ l_exp()
 static double
 l_log()
 {
-    extern double  log();
-
     return(log(argument(1)));
 }
 
@@ -561,8 +570,6 @@ l_log()
 static double
 l_log10()
 {
-    extern double  log10();
-
     return(log10(argument(1)));
 }
 #endif