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 1.1 by greg, Thu Feb 2 10:34:28 1989 UTC vs.
Revision 2.6 by greg, Sun Nov 22 12:11:48 1992 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1986 Regents of the University of California */
1 > /* Copyright (c) 1992 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 20 | Line 20 | static char SCCSid[] = "$SunId$ LBL";
20  
21   #include  <errno.h>
22  
23 + #include  <math.h>
24 +
25   #include  "calcomp.h"
26  
27 <
27 >                                /* bits in argument flag (better be right!) */
28 > #define  AFLAGSIZ       (8*sizeof(unsigned long))
29   #define  ALISTSIZ       6       /* maximum saved argument list */
30  
31   typedef struct activation {
# Line 35 | Line 38 | typedef struct activation {
38  
39   static ACTIVATION  *curact = NULL;
40  
41 < extern double  libfunc();
41 > static double  libfunc();
42  
43   #define  MAXLIB         64      /* maximum number of library functions */
44  
45 < extern double  l_if(), l_select(), l_rand();
46 < extern double  l_floor(), l_ceil();
45 > static double  l_if(), l_select(), l_rand();
46 > static double  l_floor(), l_ceil();
47   #ifdef  BIGLIB
48 < extern double  l_sqrt();
49 < extern double  l_sin(), l_cos(), l_tan();
50 < extern double  l_asin(), l_acos(), l_atan(), l_atan2();
51 < extern double  l_exp(), l_log(), l_log10();
48 > static double  l_sqrt();
49 > static double  l_sin(), l_cos(), l_tan();
50 > static double  l_asin(), l_acos(), l_atan(), l_atan2();
51 > static double  l_exp(), l_log(), l_log10();
52   #endif
53  
54   #ifdef  BIGLIB
55                          /* functions must be listed alphabetically */
56   static LIBR  library[MAXLIB] = {
57 <    { "acos", 1, l_acos },
58 <    { "asin", 1, l_asin },
59 <    { "atan", 1, l_atan },
60 <    { "atan2", 2, l_atan2 },
61 <    { "ceil", 1, l_ceil },
62 <    { "cos", 1, l_cos },
63 <    { "exp", 1, l_exp },
64 <    { "floor", 1, l_floor },
65 <    { "if", 3, l_if },
66 <    { "log", 1, l_log },
67 <    { "log10", 1, l_log10 },
68 <    { "rand", 1, l_rand },
69 <    { "select", 1, l_select },
70 <    { "sin", 1, l_sin },
71 <    { "sqrt", 1, l_sqrt },
72 <    { "tan", 1, l_tan },
57 >    { "acos", 1, ':', l_acos },
58 >    { "asin", 1, ':', l_asin },
59 >    { "atan", 1, ':', l_atan },
60 >    { "atan2", 2, ':', l_atan2 },
61 >    { "ceil", 1, ':', l_ceil },
62 >    { "cos", 1, ':', l_cos },
63 >    { "exp", 1, ':', l_exp },
64 >    { "floor", 1, ':', l_floor },
65 >    { "if", 3, ':', l_if },
66 >    { "log", 1, ':', l_log },
67 >    { "log10", 1, ':', l_log10 },
68 >    { "rand", 1, ':', l_rand },
69 >    { "select", 1, ':', l_select },
70 >    { "sin", 1, ':', l_sin },
71 >    { "sqrt", 1, ':', l_sqrt },
72 >    { "tan", 1, ':', l_tan },
73   };
74  
75   static int  libsize = 16;
# Line 74 | Line 77 | static int  libsize = 16;
77   #else
78                          /* functions must be listed alphabetically */
79   static LIBR  library[MAXLIB] = {
80 <    { "ceil", 1, l_ceil },
81 <    { "floor", 1, l_floor },
82 <    { "if", 3, l_if },
83 <    { "rand", 1, l_rand },
84 <    { "select", 1, l_select },
80 >    { "ceil", 1, ':', l_ceil },
81 >    { "floor", 1, ':', l_floor },
82 >    { "if", 3, ':', l_if },
83 >    { "rand", 1, ':', l_rand },
84 >    { "select", 1, ':', l_select },
85   };
86  
87   static int  libsize = 5;
# Line 87 | Line 90 | static int  libsize = 5;
90  
91   extern char  *savestr(), *emalloc();
92  
90 – extern LIBR  *liblookup();
91 –
93   extern VARDEF  *argf();
94  
95   #ifdef  VARIABLE
# Line 130 | Line 131 | double  *a;
131      act.name = fname;
132      act.prev = curact;
133      act.ap = a;
134 <    act.an = (1L<<n)-1;
134 >    if (n >= AFLAGSIZ)
135 >        act.an = ~0;
136 >    else
137 >        act.an = (1L<<n)-1;
138      act.fun = NULL;
139      curact = &act;
140  
# Line 145 | Line 149 | double  *a;
149   }
150  
151  
152 < funset(fname, nargs, fptr)              /* set a library function */
152 > funset(fname, nargs, assign, fptr)      /* set a library function */
153   char  *fname;
154   int  nargs;
155 + int  assign;
156   double  (*fptr)();
157   {
158 +    int  oldlibsize = libsize;
159      register LIBR  *lp;
160  
161 <    if ((lp = liblookup(fname)) == NULL) {
161 >    if ((lp = liblookup(fname)) == NULL) {      /* insert */
162          if (libsize >= MAXLIB) {
163              eputs("Too many library functons!\n");
164              quit(1);
# Line 161 | Line 167 | double  (*fptr)();
167              if (strcmp(lp[-1].fname, fname) > 0) {
168                  lp[0].fname = lp[-1].fname;
169                  lp[0].nargs = lp[-1].nargs;
170 +                lp[0].atyp = lp[-1].atyp;
171                  lp[0].f = lp[-1].f;
172              } else
173                  break;
174          libsize++;
175      }
176 <    lp[0].fname = fname;                /* string must be static! */
177 <    lp[0].nargs = nargs;
178 <    lp[0].f = fptr;
176 >    if (fptr == NULL) {                         /* delete */
177 >        while (lp < &library[libsize-1]) {
178 >            lp[0].fname = lp[1].fname;
179 >            lp[0].nargs = lp[1].nargs;
180 >            lp[0].atyp = lp[1].atyp;
181 >            lp[0].f = lp[1].f;
182 >            lp++;
183 >        }
184 >        libsize--;
185 >    } else {                                    /* or assign */
186 >        lp[0].fname = fname;            /* string must be static! */
187 >        lp[0].nargs = nargs;
188 >        lp[0].atyp = assign;
189 >        lp[0].f = fptr;
190 >    }
191 >    if (libsize != oldlibsize)
192 >        libupdate(fname);                       /* relink library */
193   }
194  
195  
# Line 193 | Line 214 | argument(n)                    /* return nth argument for active functi
214   register int  n;
215   {
216      register ACTIVATION  *actp = curact;
217 <    EPNODE  *ep;
217 >    register EPNODE  *ep;
218      double  aval;
219  
220      if (actp == NULL || --n < 0) {
# Line 201 | Line 222 | register int  n;
222          quit(1);
223      }
224                                                  /* already computed? */
225 <    if (1L<<n & actp->an)
225 >    if (n < AFLAGSIZ && 1L<<n & actp->an)
226          return(actp->ap[n]);
227  
228      if (actp->fun == NULL || (ep = ekid(actp->fun, n+1)) == NULL) {
# Line 320 | Line 341 | char  *fname;
341  
342  
343   #ifndef  VARIABLE
344 + static VARDEF  *varlist = NULL;         /* our list of dummy variables */
345 +
346 +
347   VARDEF *
348   varinsert(vname)                /* dummy variable insert */
349   char  *vname;
# Line 330 | Line 354 | char  *vname;
354      vp->name = savestr(vname);
355      vp->nlinks = 1;
356      vp->def = NULL;
357 <    vp->lib = NULL;
358 <    vp->next = NULL;
357 >    vp->lib = liblookup(vname);
358 >    vp->next = varlist;
359 >    varlist = vp;
360      return(vp);
361   }
362  
# Line 339 | Line 364 | char  *vname;
364   varfree(vp)                     /* free dummy variable */
365   register VARDEF  *vp;
366   {
367 +    register VARDEF  *vp2;
368 +
369 +    if (vp == varlist)
370 +        varlist = vp->next;
371 +    else {
372 +        for (vp2 = varlist; vp2->next != vp; vp2 = vp2->next)
373 +                ;
374 +        vp2->next = vp->next;
375 +    }
376      freestr(vp->name);
377      efree((char *)vp);
378   }
379 +
380 +
381 + libupdate(nm)                   /* update library */
382 + char  *nm;
383 + {
384 +    register VARDEF  *vp;
385 +
386 +    for (vp = varlist; vp != NULL; vp = vp->next)
387 +        vp->lib = liblookup(vp->name);
388 + }
389   #endif
390  
391  
# Line 354 | Line 398 | register VARDEF  *vp;
398   static double
399   libfunc(fname, vp)                      /* execute library function */
400   char  *fname;
401 < register VARDEF  *vp;
401 > VARDEF  *vp;
402   {
403 <    VARDEF  dumdef;
403 >    register LIBR  *lp;
404      double  d;
405      int  lasterrno;
406  
407 <    if (vp == NULL) {
408 <        vp = &dumdef;
409 <        vp->lib = NULL;
410 <    }
411 <    if (((vp->lib == NULL || strcmp(fname, vp->lib->fname)) &&
368 <                                (vp->lib = liblookup(fname)) == NULL) ||
369 <                vp->lib->f == NULL) {
407 >    if (vp != NULL)
408 >        lp = vp->lib;
409 >    else
410 >        lp = liblookup(fname);
411 >    if (lp == NULL) {
412          eputs(fname);
413          eputs(": undefined function\n");
414          quit(1);
415      }
416      lasterrno = errno;
417      errno = 0;
418 <    d = (*vp->lib->f)();
418 >    d = (*lp->f)(lp->fname);
419   #ifdef  IEEE
420 <    if (!finite(d))
421 <        errno = EDOM;
420 >    if (errno == 0)
421 >        if (isnan(d))
422 >            errno = EDOM;
423 >        else if (isinf(d))
424 >            errno = ERANGE;
425   #endif
426      if (errno) {
427          wputs(fname);
428 <        wputs(": bad call\n");
428 >        if (errno == EDOM)
429 >                wputs(": domain error\n");
430 >        else if (errno == ERANGE)
431 >                wputs(": range error\n");
432 >        else
433 >                wputs(": error in call\n");
434          return(0.0);
435      }
436      errno = lasterrno;
# Line 423 | Line 473 | l_select()             /* return argument #(A1+1) */
473   static double
474   l_rand()                /* random function between 0 and 1 */
475   {
426 –    extern double  floor();
476      double  x;
477  
478      x = argument(1);
# Line 437 | Line 486 | l_rand()               /* random function between 0 and 1 */
486   static double
487   l_floor()               /* return largest integer not greater than arg1 */
488   {
440 –    extern double  floor();
441 –
489      return(floor(argument(1)));
490   }
491  
# Line 446 | Line 493 | l_floor()              /* return largest integer not greater than
493   static double
494   l_ceil()                /* return smallest integer not less than arg1 */
495   {
449 –    extern double  ceil();
450 –
496      return(ceil(argument(1)));
497   }
498  
# Line 456 | Line 501 | l_ceil()               /* return smallest integer not less than arg
501   static double
502   l_sqrt()
503   {
459 –    extern double  sqrt();
460 –
504      return(sqrt(argument(1)));
505   }
506  
# Line 465 | Line 508 | l_sqrt()
508   static double
509   l_sin()
510   {
468 –    extern double  sin();
469 –
511      return(sin(argument(1)));
512   }
513  
# Line 474 | Line 515 | l_sin()
515   static double
516   l_cos()
517   {
477 –    extern double  cos();
478 –
518      return(cos(argument(1)));
519   }
520  
# Line 483 | Line 522 | l_cos()
522   static double
523   l_tan()
524   {
486 –    extern double  tan();
487 –
525      return(tan(argument(1)));
526   }
527  
# Line 492 | Line 529 | l_tan()
529   static double
530   l_asin()
531   {
495 –    extern double  asin();
496 –
532      return(asin(argument(1)));
533   }
534  
# Line 501 | Line 536 | l_asin()
536   static double
537   l_acos()
538   {
504 –    extern double  acos();
505 –
539      return(acos(argument(1)));
540   }
541  
# Line 510 | Line 543 | l_acos()
543   static double
544   l_atan()
545   {
513 –    extern double  atan();
514 –
546      return(atan(argument(1)));
547   }
548  
# Line 519 | Line 550 | l_atan()
550   static double
551   l_atan2()
552   {
522 –    extern double  atan2();
523 –
553      return(atan2(argument(1), argument(2)));
554   }
555  
# Line 528 | Line 557 | l_atan2()
557   static double
558   l_exp()
559   {
531 –    extern double  exp();
532 –
560      return(exp(argument(1)));
561   }
562  
# Line 537 | Line 564 | l_exp()
564   static double
565   l_log()
566   {
540 –    extern double  log();
541 –
567      return(log(argument(1)));
568   }
569  
# Line 546 | Line 571 | l_log()
571   static double
572   l_log10()
573   {
549 –    extern double  log10();
550 –
574      return(log10(argument(1)));
575   }
576   #endif

Diff Legend

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