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 */ |
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 |
|
|
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; |
152 |
< |
lp[0].atyp = lp[-1].atyp; |
153 |
< |
lp[0].f = lp[-1].f; |
154 |
< |
} 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; |
161 |
< |
lp[0].nargs = lp[1].nargs; |
162 |
< |
lp[0].atyp = lp[1].atyp; |
163 |
< |
lp[0].f = lp[1].f; |
160 |
> |
lp[0] = lp[1]; |
161 |
|
lp++; |
162 |
|
} |
163 |
|
libsize--; |
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? */ |
206 |
< |
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 |
|
} |
340 |
|
errno = 0; |
341 |
|
d = (*lp->f)(lp->fname); |
342 |
|
#ifdef isnan |
343 |
< |
if (errno == 0) |
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 == EDOM || errno == ERANGE) { |
351 |
|
wputs(fname); |