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.18 by greg, Sat Aug 1 23:27:04 2015 UTC vs.
Revision 2.19 by greg, Mon Mar 4 18:16:18 2019 UTC

# Line 22 | Line 22 | static const char      RCSid[] = "$Id$";
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 104 | Line 104 | funvalue(                      /* return a function value to the user */
104      act.name = fname;
105      act.prev = curact;
106      act.ap = a;
107 <    if (n >= AFLAGSIZ)
108 <        act.an = ~0;
109 <    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 192 | Line 195 | argument(int n)                        /* return nth argument for active fu
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? */
200 <    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;                              /* push back context */
213 >    if (n < ALISTSIZ) {                         /* save value if we can */
214          actp->ap[n] = aval;
215          actp->an |= 1L<<n;
216      }

Diff Legend

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