ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/calfunc.c
(Generate patch)

Comparing ray/src/common/calfunc.c (file contents):
Revision 2.8 by greg, Sat Feb 22 02:07:21 2003 UTC vs.
Revision 2.20 by greg, Mon Mar 4 20:34:13 2019 UTC

# Line 10 | Line 10 | static const char      RCSid[] = "$Id$";
10   *  2/19/03     Eliminated conditional compiles in favor of esupport extern.
11   */
12  
13 < /* ====================================================================
14 < * The Radiance Software License, Version 1.0
15 < *
16 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
17 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
18 < *
19 < * Redistribution and use in source and binary forms, with or without
20 < * modification, are permitted provided that the following conditions
21 < * are met:
22 < *
23 < * 1. Redistributions of source code must retain the above copyright
24 < *         notice, this list of conditions and the following disclaimer.
25 < *
26 < * 2. Redistributions in binary form must reproduce the above copyright
27 < *       notice, this list of conditions and the following disclaimer in
28 < *       the documentation and/or other materials provided with the
29 < *       distribution.
30 < *
31 < * 3. The end-user documentation included with the redistribution,
32 < *           if any, must include the following acknowledgment:
33 < *             "This product includes Radiance software
34 < *                 (http://radsite.lbl.gov/)
35 < *                 developed by the Lawrence Berkeley National Laboratory
36 < *               (http://www.lbl.gov/)."
37 < *       Alternately, this acknowledgment may appear in the software itself,
38 < *       if and wherever such third-party acknowledgments normally appear.
39 < *
40 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
41 < *       and "The Regents of the University of California" must
42 < *       not be used to endorse or promote products derived from this
43 < *       software without prior written permission. For written
44 < *       permission, please contact [email protected].
45 < *
46 < * 5. Products derived from this software may not be called "Radiance",
47 < *       nor may "Radiance" appear in their name, without prior written
48 < *       permission of Lawrence Berkeley National Laboratory.
49 < *
50 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
51 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
52 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
53 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
54 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
55 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
56 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
57 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
58 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
59 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
60 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
61 < * SUCH DAMAGE.
62 < * ====================================================================
63 < *
64 < * This software consists of voluntary contributions made by many
65 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
66 < * information on Lawrence Berkeley National Laboratory, please see
67 < * <http://www.lbl.gov/>.
68 < */
13 > #include "copyright.h"
14  
15   #include  <stdio.h>
16 <
16 > #include  <string.h>
17   #include  <errno.h>
73 –
18   #include  <math.h>
19  
20 + #include  "rterror.h"
21   #include  "calcomp.h"
22  
23                                  /* bits in argument flag (better be right!) */
24   #define  AFLAGSIZ       (8*sizeof(unsigned long))
25 < #define  ALISTSIZ       6       /* maximum saved argument list */
25 > #define  ALISTSIZ       8       /* maximum saved argument list */
26  
27   typedef struct activation {
28      char  *name;                /* function name */
# Line 89 | Line 34 | typedef struct activation {
34  
35   static ACTIVATION  *curact = NULL;
36  
37 < static double  libfunc();
37 > static double  libfunc(char *fname, VARDEF *vp);
38  
39   #ifndef  MAXLIB
40   #define  MAXLIB         64      /* maximum number of library functions */
41   #endif
42  
43 < static double  l_if(), l_select(), l_rand();
44 < static double  l_floor(), l_ceil();
45 < static double  l_sqrt();
46 < static double  l_sin(), l_cos(), l_tan();
47 < static double  l_asin(), l_acos(), l_atan(), l_atan2();
48 < static double  l_exp(), l_log(), l_log10();
43 > static double  l_if(char *), l_select(char *), l_rand(char *);
44 > static double  l_floor(char *), l_ceil(char *);
45 > static double  l_sqrt(char *);
46 > static double  l_sin(char *), l_cos(char *), l_tan(char *);
47 > static double  l_asin(char *), l_acos(char *), l_atan(char *), l_atan2(char *);
48 > static double  l_exp(char *), l_log(char *), l_log10(char *);
49  
50                          /* functions must be listed alphabetically */
51   static LIBR  library[MAXLIB] = {
# Line 128 | Line 73 | static int  libsize = 16;
73  
74  
75   int
76 < fundefined(fname)               /* return # of arguments for function */
77 < char  *fname;
76 > fundefined(                     /* return # of arguments for function */
77 >        char  *fname
78 > )
79   {
80 <    register LIBR  *lp;
81 <    register VARDEF  *vp;
80 >    LIBR  *lp;
81 >    VARDEF  *vp;
82  
83      if ((vp = varlookup(fname)) != NULL && vp->def != NULL
84                  && vp->def->v.kid->type == FUNC)
# Line 145 | Line 91 | char  *fname;
91  
92  
93   double
94 < funvalue(fname, n, a)           /* return a function value to the user */
95 < char  *fname;
96 < int  n;
97 < double  *a;
94 > funvalue(                       /* return a function value to the user */
95 >        char  *fname,
96 >        int  n,
97 >        double  *a
98 > )
99   {
100      ACTIVATION  act;
101 <    register VARDEF  *vp;
101 >    VARDEF  *vp;
102      double  rval;
103                                          /* push environment */
104      act.name = fname;
105      act.prev = curact;
106      act.ap = a;
107 <    if (n >= AFLAGSIZ)
161 <        act.an = ~0;
162 <    else
107 >    if (n < AFLAGSIZ)
108          act.an = (1L<<n)-1;
109 +    else {
110 +        act.an = ~0;
111 +        if (n > AFLAGSIZ)
112 +            wputs("Excess arguments in funvalue()\n");
113 +    }
114      act.fun = NULL;
115      curact = &act;
116  
# Line 176 | Line 126 | double  *a;
126  
127  
128   void
129 < funset(fname, nargs, assign, fptr)      /* set a library function */
130 < char  *fname;
131 < int  nargs;
132 < int  assign;
133 < double  (*fptr)();
129 > funset(                         /* set a library function */
130 >        char  *fname,
131 >        int  nargs,
132 >        int  assign,
133 >        double  (*fptr)(char *)
134 > )
135   {
136      int  oldlibsize = libsize;
137      char *cp;
138 <    register LIBR  *lp;
138 >    LIBR  *lp;
139                                                  /* check for context */
140      for (cp = fname; *cp; cp++)
141          ;
# Line 198 | Line 149 | double  (*fptr)();
149              quit(1);
150          }
151          for (lp = &library[libsize]; lp > library; lp--)
152 <            if (strcmp(lp[-1].fname, fname) > 0) {
153 <                lp[0].fname = lp[-1].fname;
154 <                lp[0].nargs = lp[-1].nargs;
204 <                lp[0].atyp = lp[-1].atyp;
205 <                lp[0].f = lp[-1].f;
206 <            } else
152 >            if (strcmp(lp[-1].fname, fname) > 0)
153 >                lp[0] = lp[-1];
154 >            else
155                  break;
156          libsize++;
157      }
158      if (fptr == NULL) {                         /* delete */
159          while (lp < &library[libsize-1]) {
160 <            lp[0].fname = lp[1].fname;
213 <            lp[0].nargs = lp[1].nargs;
214 <            lp[0].atyp = lp[1].atyp;
215 <            lp[0].f = lp[1].f;
160 >            lp[0] = lp[1];
161              lp++;
162          }
163          libsize--;
# Line 228 | Line 173 | double  (*fptr)();
173  
174  
175   int
176 < nargum()                        /* return number of available arguments */
176 > nargum(void)                    /* return number of available arguments */
177   {
178 <    register int  n;
178 >    int  n;
179  
180      if (curact == NULL)
181          return(0);
# Line 244 | Line 189 | nargum()                       /* return number of available arguments */
189  
190  
191   double
192 < argument(n)                     /* return nth argument for active function */
248 < register int  n;
192 > argument(int n)                 /* return nth argument for active function */
193   {
194 <    register ACTIVATION  *actp = curact;
195 <    register EPNODE  *ep;
194 >    ACTIVATION  *actp = curact;
195 >    EPNODE  *ep = NULL;
196      double  aval;
197  
198 <    if (actp == NULL || --n < 0) {
198 >    if (!actp | (--n < 0)) {
199          eputs("Bad call to argument!\n");
200          quit(1);
201      }
202 <                                                /* already computed? */
259 <    if (n < AFLAGSIZ && 1L<<n & actp->an)
202 >    if ((n < AFLAGSIZ) & actp->an >> n)         /* already computed? */
203          return(actp->ap[n]);
204  
205 <    if (actp->fun == NULL || (ep = ekid(actp->fun, n+1)) == NULL) {
205 >    if (!actp->fun || !(ep = ekid(actp->fun, n+1))) {
206          eputs(actp->name);
207          eputs(": too few arguments\n");
208          quit(1);
209      }
210 <    curact = actp->prev;                        /* pop environment */
210 >    curact = actp->prev;                        /* previous context */
211      aval = evalue(ep);                          /* compute argument */
212 <    curact = actp;                              /* push back environment */
213 <    if (n < ALISTSIZ) {                         /* save value */
212 >    curact = actp;                              /* put back calling context */
213 >    if (n < ALISTSIZ) {                         /* save value if room */
214          actp->ap[n] = aval;
215          actp->an |= 1L<<n;
216      }
# Line 276 | Line 219 | register int  n;
219  
220  
221   VARDEF *
222 < argf(n)                         /* return function def for nth argument */
280 < int  n;
222 > argf(int n)                     /* return function def for nth argument */
223   {
224 <    register ACTIVATION  *actp;
225 <    register EPNODE  *ep;
224 >    ACTIVATION  *actp;
225 >    EPNODE  *ep;
226  
227      for (actp = curact; actp != NULL; actp = actp->prev) {
228  
# Line 310 | Line 252 | badarg:
252      eputs(actp->name);
253      eputs(": argument not a function\n");
254      quit(1);
255 +        return NULL; /* pro forma return */
256   }
257  
258  
259   char *
260 < argfun(n)                       /* return function name for nth argument */
318 < int  n;
260 > argfun(int n)                   /* return function name for nth argument */
261   {
262      return(argf(n)->name);
263   }
264  
265  
266   double
267 < efunc(ep)                               /* evaluate a function */
326 < register EPNODE  *ep;
267 > efunc(EPNODE *ep)                       /* evaluate a function */
268   {
269      ACTIVATION  act;
270      double  alist[ALISTSIZ];
271      double  rval;
272 <    register VARDEF  *dp;
272 >    VARDEF  *dp;
273                                          /* push environment */
274      dp = resolve(ep->v.kid);
275      act.name = dp->name;
# Line 349 | Line 290 | register EPNODE  *ep;
290  
291  
292   LIBR *
293 < liblookup(fname)                /* look up a library function */
353 < char  *fname;
293 > liblookup(char *fname)          /* look up a library function */
294   {
295      int  upper, lower;
296 <    register int  cm, i;
296 >    int  cm, i;
297  
298      lower = 0;
299      upper = cm = libsize;
# Line 378 | Line 318 | char  *fname;
318  
319  
320   static double
321 < libfunc(fname, vp)                      /* execute library function */
322 < char  *fname;
323 < VARDEF  *vp;
321 > libfunc(                                /* execute library function */
322 >        char  *fname,
323 >        VARDEF  *vp
324 > )
325   {
326 <    register LIBR  *lp;
326 >    LIBR  *lp;
327      double  d;
328      int  lasterrno;
329  
# Line 398 | Line 339 | VARDEF  *vp;
339      lasterrno = errno;
340      errno = 0;
341      d = (*lp->f)(lp->fname);
342 < #ifdef  IEEE
343 <    if (errno == 0)
342 > #ifdef  isnan
343 >    if (errno == 0) {
344          if (isnan(d))
345              errno = EDOM;
346          else if (isinf(d))
347              errno = ERANGE;
348 +    }
349   #endif
350 <    if (errno) {
350 >    if (errno == EDOM || errno == ERANGE) {
351          wputs(fname);
352          if (errno == EDOM)
353                  wputs(": domain error\n");
# Line 426 | Line 368 | VARDEF  *vp;
368  
369  
370   static double
371 < l_if()                  /* if(cond, then, else) conditional expression */
371 > l_if(char *nm)          /* if(cond, then, else) conditional expression */
372                          /* cond evaluates true if greater than zero */
373   {
374      if (argument(1) > 0.0)
# Line 437 | Line 379 | l_if()                 /* if(cond, then, else) conditional expressio
379  
380  
381   static double
382 < l_select()              /* return argument #(A1+1) */
382 > l_select(char *nm)      /* return argument #(A1+1) */
383   {
384 <        register int  n;
384 >        int  n;
385  
386 <        n = argument(1) + .5;
386 >        n = (int)(argument(1) + .5);
387          if (n == 0)
388                  return(nargum()-1);
389          if (n < 1 || n > nargum()-1) {
# Line 453 | Line 395 | l_select()             /* return argument #(A1+1) */
395  
396  
397   static double
398 < l_rand()                /* random function between 0 and 1 */
398 > l_rand(char *nm)                /* random function between 0 and 1 */
399   {
400      double  x;
401  
# Line 466 | Line 408 | l_rand()               /* random function between 0 and 1 */
408  
409  
410   static double
411 < l_floor()               /* return largest integer not greater than arg1 */
411 > l_floor(char *nm)               /* return largest integer not greater than arg1 */
412   {
413      return(floor(argument(1)));
414   }
415  
416  
417   static double
418 < l_ceil()                /* return smallest integer not less than arg1 */
418 > l_ceil(char *nm)                /* return smallest integer not less than arg1 */
419   {
420      return(ceil(argument(1)));
421   }
422  
423  
424   static double
425 < l_sqrt()
425 > l_sqrt(char *nm)
426   {
427      return(sqrt(argument(1)));
428   }
429  
430  
431   static double
432 < l_sin()
432 > l_sin(char *nm)
433   {
434      return(sin(argument(1)));
435   }
436  
437  
438   static double
439 < l_cos()
439 > l_cos(char *nm)
440   {
441      return(cos(argument(1)));
442   }
443  
444  
445   static double
446 < l_tan()
446 > l_tan(char *nm)
447   {
448      return(tan(argument(1)));
449   }
450  
451  
452   static double
453 < l_asin()
453 > l_asin(char *nm)
454   {
455      return(asin(argument(1)));
456   }
457  
458  
459   static double
460 < l_acos()
460 > l_acos(char *nm)
461   {
462      return(acos(argument(1)));
463   }
464  
465  
466   static double
467 < l_atan()
467 > l_atan(char *nm)
468   {
469      return(atan(argument(1)));
470   }
471  
472  
473   static double
474 < l_atan2()
474 > l_atan2(char *nm)
475   {
476      return(atan2(argument(1), argument(2)));
477   }
478  
479  
480   static double
481 < l_exp()
481 > l_exp(char *nm)
482   {
483      return(exp(argument(1)));
484   }
485  
486  
487   static double
488 < l_log()
488 > l_log(char *nm)
489   {
490      return(log(argument(1)));
491   }
492  
493  
494   static double
495 < l_log10()
495 > l_log10(char *nm)
496   {
497      return(log10(argument(1)));
498   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines