--- ray/src/common/calfunc.c 1991/04/23 15:44:39 1.4 +++ ray/src/common/calfunc.c 2003/11/14 17:22:06 2.14 @@ -1,28 +1,27 @@ -/* Copyright (c) 1986 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: calfunc.c,v 2.14 2003/11/14 17:22:06 schorsch Exp $"; #endif - /* * calfunc.c - routines for calcomp using functions. * - * The define BIGLIB pulls in a large number of the - * available math routines. - * - * If VARIABLE is not defined, only library functions + * If VARIABLE is not set, only library functions * can be accessed. * - * 4/2/86 + * 2/19/03 Eliminated conditional compiles in favor of esupport extern. */ -#include +#include "copyright.h" +#include +#include #include +#include +#include "rterror.h" #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 { @@ -35,20 +34,19 @@ typedef struct activation { static ACTIVATION *curact = NULL; -static double libfunc(); +static double libfunc(char *fname, VARDEF *vp); +#ifndef MAXLIB #define MAXLIB 64 /* maximum number of library functions */ - -static double l_if(), l_select(), l_rand(); -static double l_floor(), l_ceil(); -#ifdef BIGLIB -static double l_sqrt(); -static double l_sin(), l_cos(), l_tan(); -static double l_asin(), l_acos(), l_atan(), l_atan2(); -static double l_exp(), l_log(), l_log10(); #endif -#ifdef BIGLIB +static double l_if(char *), l_select(char *), l_rand(char *); +static double l_floor(char *), l_ceil(char *); +static double l_sqrt(char *); +static double l_sin(char *), l_cos(char *), l_tan(char *); +static double l_asin(char *), l_acos(char *), l_atan(char *), l_atan2(char *); +static double l_exp(char *), l_log(char *), l_log10(char *); + /* functions must be listed alphabetically */ static LIBR library[MAXLIB] = { { "acos", 1, ':', l_acos }, @@ -71,49 +69,23 @@ static LIBR library[MAXLIB] = { 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 }, -}; - -static int libsize = 5; - -#endif - -extern char *savestr(), *emalloc(); - -extern LIBR *liblookup(); - -extern VARDEF *argf(); - -#ifdef VARIABLE #define resolve(ep) ((ep)->type==VAR?(ep)->v.ln:argf((ep)->v.chan)) -#else -#define resolve(ep) ((ep)->v.ln) -#define varlookup(name) NULL -#endif 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); } @@ -130,7 +102,10 @@ double *a; act.name = fname; act.prev = curact; act.ap = a; - act.an = (1L<= AFLAGSIZ) + act.an = ~0; + else + act.an = (1L<= MAXLIB) { eputs("Too many library functons!\n"); quit(1); @@ -168,10 +152,23 @@ 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; + } + if (libsize != oldlibsize) + libupdate(fname); /* relink library */ } @@ -196,7 +193,7 @@ argument(n) /* return nth argument for active functi register int n; { register ACTIVATION *actp = curact; - EPNODE *ep; + register EPNODE *ep = NULL; double aval; if (actp == NULL || --n < 0) { @@ -204,7 +201,7 @@ register int n; quit(1); } /* already computed? */ - if (1L<an) + if (n < AFLAGSIZ && 1L<an) return(actp->ap[n]); if (actp->fun == NULL || (ep = ekid(actp->fun, n+1)) == NULL) { @@ -223,7 +220,6 @@ register int n; } -#ifdef VARIABLE VARDEF * argf(n) /* return function def for nth argument */ int n; @@ -259,6 +255,7 @@ badarg: eputs(actp->name); eputs(": argument not a function\n"); quit(1); + return NULL; /* pro forma return */ } @@ -268,7 +265,6 @@ int n; { return(argf(n)->name); } -#endif double @@ -322,33 +318,6 @@ char *fname; } -#ifndef VARIABLE -VARDEF * -varinsert(vname) /* dummy variable insert */ -char *vname; -{ - register VARDEF *vp; - - vp = (VARDEF *)emalloc(sizeof(VARDEF)); - vp->name = savestr(vname); - vp->nlinks = 1; - vp->def = NULL; - vp->lib = NULL; - vp->next = NULL; - return(vp); -} - - -varfree(vp) /* free dummy variable */ -register VARDEF *vp; -{ - freestr(vp->name); - efree((char *)vp); -} -#endif - - - /* * The following routines are for internal use: */ @@ -357,33 +326,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) { + if (errno == EDOM || errno == ERANGE) { 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; @@ -397,7 +372,7 @@ register VARDEF *vp; static double -l_if() /* if(cond, then, else) conditional expression */ +l_if(char *nm) /* if(cond, then, else) conditional expression */ /* cond evaluates true if greater than zero */ { if (argument(1) > 0.0) @@ -408,11 +383,11 @@ l_if() /* if(cond, then, else) conditional expressio static double -l_select() /* return argument #(A1+1) */ +l_select(char *nm) /* return argument #(A1+1) */ { register int n; - n = argument(1) + .5; + n = (int)(argument(1) + .5); if (n == 0) return(nargum()-1); if (n < 1 || n > nargum()-1) { @@ -424,9 +399,8 @@ l_select() /* return argument #(A1+1) */ static double -l_rand() /* random function between 0 and 1 */ +l_rand(char *nm) /* random function between 0 and 1 */ { - extern double floor(); double x; x = argument(1); @@ -438,119 +412,91 @@ l_rand() /* random function between 0 and 1 */ static double -l_floor() /* return largest integer not greater than arg1 */ +l_floor(char *nm) /* return largest integer not greater than arg1 */ { - extern double floor(); - return(floor(argument(1))); } static double -l_ceil() /* return smallest integer not less than arg1 */ +l_ceil(char *nm) /* return smallest integer not less than arg1 */ { - extern double ceil(); - return(ceil(argument(1))); } -#ifdef BIGLIB static double -l_sqrt() +l_sqrt(char *nm) { - extern double sqrt(); - return(sqrt(argument(1))); } static double -l_sin() +l_sin(char *nm) { - extern double sin(); - return(sin(argument(1))); } static double -l_cos() +l_cos(char *nm) { - extern double cos(); - return(cos(argument(1))); } static double -l_tan() +l_tan(char *nm) { - extern double tan(); - return(tan(argument(1))); } static double -l_asin() +l_asin(char *nm) { - extern double asin(); - return(asin(argument(1))); } static double -l_acos() +l_acos(char *nm) { - extern double acos(); - return(acos(argument(1))); } static double -l_atan() +l_atan(char *nm) { - extern double atan(); - return(atan(argument(1))); } static double -l_atan2() +l_atan2(char *nm) { - extern double atan2(); - return(atan2(argument(1), argument(2))); } static double -l_exp() +l_exp(char *nm) { - extern double exp(); - return(exp(argument(1))); } static double -l_log() +l_log(char *nm) { - extern double log(); - return(log(argument(1))); } static double -l_log10() +l_log10(char *nm) { - extern double log10(); - return(log10(argument(1))); } -#endif