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.2 by greg, Fri May 15 16:38:47 1992 UTC vs.
Revision 2.12 by schorsch, Thu Jul 17 09:21:29 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1991 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   *  calfunc.c - routines for calcomp using functions.
6   *
7 < *      The define BIGLIB pulls in a large number of the
11 < *  available math routines.
12 < *
13 < *      If VARIABLE is not defined, only library functions
7 > *      If VARIABLE is not set, only library functions
8   *  can be accessed.
9   *
10 < *     4/2/86
10 > *  2/19/03     Eliminated conditional compiles in favor of esupport extern.
11   */
12  
13 < #include  <stdio.h>
13 > #include "copyright.h"
14  
15 + #include  <stdio.h>
16 + #include  <string.h>
17   #include  <errno.h>
18 + #include  <math.h>
19  
20 + #include  "rterror.h"
21   #include  "calcomp.h"
22  
23                                  /* bits in argument flag (better be right!) */
# Line 36 | 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 – #ifdef  BIGLIB
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();
50 – #endif
49  
52 – #ifdef  BIGLIB
50                          /* functions must be listed alphabetically */
51   static LIBR  library[MAXLIB] = {
52      { "acos", 1, ':', l_acos },
# Line 72 | Line 69 | static LIBR  library[MAXLIB] = {
69  
70   static int  libsize = 16;
71  
75 – #else
76 –                        /* functions must be listed alphabetically */
77 – static LIBR  library[MAXLIB] = {
78 –    { "ceil", 1, ':', l_ceil },
79 –    { "floor", 1, ':', l_floor },
80 –    { "if", 3, ':', l_if },
81 –    { "rand", 1, ':', l_rand },
82 –    { "select", 1, ':', l_select },
83 – };
84 –
85 – static int  libsize = 5;
86 –
87 – #endif
88 –
89 – extern char  *savestr(), *emalloc();
90 –
91 – extern VARDEF  *argf();
92 –
93 – #ifdef  VARIABLE
72   #define  resolve(ep)    ((ep)->type==VAR?(ep)->v.ln:argf((ep)->v.chan))
95 – #else
96 – #define  resolve(ep)    ((ep)->v.ln)
97 – #define varlookup(name) NULL
98 – #endif
73  
74  
75   int
76   fundefined(fname)               /* return # of arguments for function */
77   char  *fname;
78   {
79 <    LIBR  *lp;
79 >    register LIBR  *lp;
80      register VARDEF  *vp;
81  
82 <    if ((vp = varlookup(fname)) == NULL || vp->def == NULL
83 <                || vp->def->v.kid->type != FUNC)
110 <        if ((lp = liblookup(fname)) == NULL)
111 <            return(0);
112 <        else
113 <            return(lp->nargs);
114 <    else
82 >    if ((vp = varlookup(fname)) != NULL && vp->def != NULL
83 >                && vp->def->v.kid->type == FUNC)
84          return(nekids(vp->def->v.kid) - 1);
85 +    lp = vp != NULL ? vp->lib : liblookup(fname);
86 +    if (lp == NULL)
87 +        return(0);
88 +    return(lp->nargs);
89   }
90  
91  
# Line 147 | Line 120 | double  *a;
120   }
121  
122  
123 + void
124   funset(fname, nargs, assign, fptr)      /* set a library function */
125   char  *fname;
126   int  nargs;
127   int  assign;
128   double  (*fptr)();
129   {
130 +    int  oldlibsize = libsize;
131 +    char *cp;
132      register LIBR  *lp;
133 <
133 >                                                /* check for context */
134 >    for (cp = fname; *cp; cp++)
135 >        ;
136 >    if (cp == fname)
137 >        return;
138 >    if (cp[-1] == CNTXMARK)
139 >        *--cp = '\0';
140      if ((lp = liblookup(fname)) == NULL) {      /* insert */
141          if (libsize >= MAXLIB) {
142              eputs("Too many library functons!\n");
# Line 185 | Line 167 | double  (*fptr)();
167          lp[0].atyp = assign;
168          lp[0].f = fptr;
169      }
170 <    libupdate(fname);                   /* relink library */
170 >    if (libsize != oldlibsize)
171 >        libupdate(fname);                       /* relink library */
172   }
173  
174  
# Line 237 | Line 220 | register int  n;
220   }
221  
222  
240 – #ifdef  VARIABLE
223   VARDEF *
224   argf(n)                         /* return function def for nth argument */
225   int  n;
# Line 273 | Line 255 | badarg:
255      eputs(actp->name);
256      eputs(": argument not a function\n");
257      quit(1);
258 +        return NULL; /* pro forma return */
259   }
260  
261  
# Line 282 | Line 265 | int  n;
265   {
266      return(argf(n)->name);
267   }
285 – #endif
268  
269  
270   double
# Line 336 | Line 318 | char  *fname;
318   }
319  
320  
339 – #ifndef  VARIABLE
340 – VARDEF *
341 – varinsert(vname)                /* dummy variable insert */
342 – char  *vname;
343 – {
344 –    register VARDEF  *vp;
345 –
346 –    vp = (VARDEF *)emalloc(sizeof(VARDEF));
347 –    vp->name = savestr(vname);
348 –    vp->nlinks = 1;
349 –    vp->def = NULL;
350 –    vp->lib = NULL;
351 –    vp->next = NULL;
352 –    return(vp);
353 – }
354 –
355 –
356 – varfree(vp)                     /* free dummy variable */
357 – register VARDEF  *vp;
358 – {
359 –    freestr(vp->name);
360 –    efree((char *)vp);
361 – }
362 – #endif
363 –
364 –
365 –
321   /*
322   *  The following routines are for internal use:
323   */
# Line 371 | Line 326 | register VARDEF  *vp;
326   static double
327   libfunc(fname, vp)                      /* execute library function */
328   char  *fname;
329 < register VARDEF  *vp;
329 > VARDEF  *vp;
330   {
331 <    VARDEF  dumdef;
331 >    register LIBR  *lp;
332      double  d;
333      int  lasterrno;
334  
335 <    if (vp == NULL) {
336 <        vp = &dumdef;
337 <        vp->lib = liblookup(fname);
338 <    }
339 <    if (vp->lib == NULL) {
335 >    if (vp != NULL)
336 >        lp = vp->lib;
337 >    else
338 >        lp = liblookup(fname);
339 >    if (lp == NULL) {
340          eputs(fname);
341          eputs(": undefined function\n");
342          quit(1);
343      }
344      lasterrno = errno;
345      errno = 0;
346 <    d = (*vp->lib->f)(vp->lib->fname);
346 >    d = (*lp->f)(lp->fname);
347   #ifdef  IEEE
348      if (errno == 0)
349          if (isnan(d))
# Line 396 | Line 351 | register VARDEF  *vp;
351          else if (isinf(d))
352              errno = ERANGE;
353   #endif
354 <    if (errno) {
354 >    if (errno == EDOM || errno == ERANGE) {
355          wputs(fname);
356          if (errno == EDOM)
357                  wputs(": domain error\n");
# Line 432 | Line 387 | l_select()             /* return argument #(A1+1) */
387   {
388          register int  n;
389  
390 <        n = argument(1) + .5;
390 >        n = (int)(argument(1) + .5);
391          if (n == 0)
392                  return(nargum()-1);
393          if (n < 1 || n > nargum()-1) {
# Line 446 | Line 401 | l_select()             /* return argument #(A1+1) */
401   static double
402   l_rand()                /* random function between 0 and 1 */
403   {
449 –    extern double  floor();
404      double  x;
405  
406      x = argument(1);
# Line 460 | Line 414 | l_rand()               /* random function between 0 and 1 */
414   static double
415   l_floor()               /* return largest integer not greater than arg1 */
416   {
463 –    extern double  floor();
464 –
417      return(floor(argument(1)));
418   }
419  
# Line 469 | Line 421 | l_floor()              /* return largest integer not greater than
421   static double
422   l_ceil()                /* return smallest integer not less than arg1 */
423   {
472 –    extern double  ceil();
473 –
424      return(ceil(argument(1)));
425   }
426  
427  
478 – #ifdef  BIGLIB
428   static double
429   l_sqrt()
430   {
482 –    extern double  sqrt();
483 –
431      return(sqrt(argument(1)));
432   }
433  
# Line 488 | Line 435 | l_sqrt()
435   static double
436   l_sin()
437   {
491 –    extern double  sin();
492 –
438      return(sin(argument(1)));
439   }
440  
# Line 497 | Line 442 | l_sin()
442   static double
443   l_cos()
444   {
500 –    extern double  cos();
501 –
445      return(cos(argument(1)));
446   }
447  
# Line 506 | Line 449 | l_cos()
449   static double
450   l_tan()
451   {
509 –    extern double  tan();
510 –
452      return(tan(argument(1)));
453   }
454  
# Line 515 | Line 456 | l_tan()
456   static double
457   l_asin()
458   {
518 –    extern double  asin();
519 –
459      return(asin(argument(1)));
460   }
461  
# Line 524 | Line 463 | l_asin()
463   static double
464   l_acos()
465   {
527 –    extern double  acos();
528 –
466      return(acos(argument(1)));
467   }
468  
# Line 533 | Line 470 | l_acos()
470   static double
471   l_atan()
472   {
536 –    extern double  atan();
537 –
473      return(atan(argument(1)));
474   }
475  
# Line 542 | Line 477 | l_atan()
477   static double
478   l_atan2()
479   {
545 –    extern double  atan2();
546 –
480      return(atan2(argument(1), argument(2)));
481   }
482  
# Line 551 | Line 484 | l_atan2()
484   static double
485   l_exp()
486   {
554 –    extern double  exp();
555 –
487      return(exp(argument(1)));
488   }
489  
# Line 560 | Line 491 | l_exp()
491   static double
492   l_log()
493   {
563 –    extern double  log();
564 –
494      return(log(argument(1)));
495   }
496  
# Line 569 | Line 498 | l_log()
498   static double
499   l_log10()
500   {
572 –    extern double  log10();
573 –
501      return(log10(argument(1)));
502   }
576 – #endif

Diff Legend

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