38 |
|
|
39 |
|
extern char *ecalloc(), *savestr(), *strcpy(); |
40 |
|
|
41 |
+ |
static int hash(); |
42 |
+ |
|
43 |
|
static double dvalue(); |
44 |
|
|
45 |
|
long eclock = -1; /* value storage timer */ |
46 |
|
|
47 |
< |
static char context[MAXWORD]; /* current context path */ |
47 |
> |
static char context[MAXWORD+1]; /* current context path */ |
48 |
|
|
49 |
|
static VARDEF *hashtbl[NHASH]; /* definition list */ |
50 |
|
static int htndx; /* index for */ |
197 |
|
if (*ctx != CNTXMARK) |
198 |
|
*cpp++ = CNTXMARK; /* make sure there's a mark */ |
199 |
|
do { |
200 |
< |
if (cpp >= context+MAXWORD-1) { |
201 |
< |
*cpp = '\0'; |
200 |
< |
wputs(context); |
201 |
< |
wputs(": context path too long\n"); |
202 |
< |
return(NULL); |
203 |
< |
} |
200 |
> |
if (cpp >= context+MAXWORD) |
201 |
> |
break; /* just copy what we can */ |
202 |
|
if (isid(*ctx)) |
203 |
|
*cpp++ = *ctx++; |
204 |
|
else { |
215 |
|
register char *nam; |
216 |
|
int lvl; |
217 |
|
{ |
218 |
< |
static char nambuf[MAXWORD]; |
219 |
< |
register char *cp = nambuf, *cpp = context; |
220 |
< |
/* check for explicit global */ |
218 |
> |
static char nambuf[MAXWORD+1]; |
219 |
> |
register char *cp = nambuf, *cpp; |
220 |
> |
/* check for explicit local */ |
221 |
|
if (*nam == CNTXMARK) |
222 |
< |
return(lvl > 0 ? NULL : nam+1); |
223 |
< |
/* check for repeat call */ |
224 |
< |
if (nam == nambuf) |
225 |
< |
return(lvl > 0 ? NULL : nambuf); |
222 |
> |
if (lvl > 0) /* only action is to refuse search */ |
223 |
> |
return(NULL); |
224 |
> |
else |
225 |
> |
nam++; |
226 |
> |
else if (nam == nambuf) /* check for repeat call */ |
227 |
> |
return(lvl > 0 ? NULL : nam); |
228 |
|
/* copy name to static buffer */ |
229 |
|
while (*nam) { |
230 |
< |
if (cp >= nambuf+MAXWORD-1) |
230 |
> |
if (cp >= nambuf+MAXWORD) |
231 |
|
goto toolong; |
232 |
< |
if ((*cp++ = *nam++) == CNTXMARK) |
233 |
< |
cpp = NULL; /* flag a qualified name */ |
232 |
> |
*cp++ = *nam++; |
233 |
|
} |
234 |
< |
if (cpp == NULL) { |
234 |
> |
/* check for explicit global */ |
235 |
> |
if (cp > nambuf && cp[-1] == CNTXMARK) { |
236 |
|
if (lvl > 0) |
237 |
< |
return(NULL); /* no higher level */ |
238 |
< |
if (cp[-1] == CNTXMARK) { |
239 |
< |
cp--; cpp = context; /* current context explicitly */ |
240 |
< |
} else |
241 |
< |
cpp = ""; /* else fully qualified */ |
242 |
< |
} else /* else skip the requested levels */ |
243 |
< |
while (lvl-- > 0) { |
244 |
< |
if (!*cpp) |
245 |
< |
return(NULL); /* return NULL if past global level */ |
246 |
< |
while (*++cpp && *cpp != CNTXMARK) |
247 |
< |
; |
248 |
< |
} |
237 |
> |
return(NULL); |
238 |
> |
*--cp = '\0'; |
239 |
> |
return(nambuf); /* already qualified */ |
240 |
> |
} |
241 |
> |
cpp = context; /* else skip the requested levels */ |
242 |
> |
while (lvl-- > 0) { |
243 |
> |
if (!*cpp) |
244 |
> |
return(NULL); /* return NULL if past global level */ |
245 |
> |
while (*++cpp && *cpp != CNTXMARK) |
246 |
> |
; |
247 |
> |
} |
248 |
|
while (*cpp) { /* copy context to static buffer */ |
249 |
< |
if (cp >= nambuf+MAXWORD-1) |
249 |
> |
if (cp >= nambuf+MAXWORD) |
250 |
|
goto toolong; |
251 |
|
*cp++ = *cpp++; |
252 |
|
} |
254 |
– |
*cp = '\0'; |
255 |
– |
return(nambuf); /* return qualified name */ |
253 |
|
toolong: |
254 |
|
*cp = '\0'; |
255 |
< |
eputs(nambuf); |
259 |
< |
eputs(": name too long\n"); |
260 |
< |
quit(1); |
255 |
> |
return(nambuf); /* return qualified name */ |
256 |
|
} |
257 |
|
|
258 |
|
|
260 |
|
register char *qn; |
261 |
|
{ |
262 |
|
while (*qn && *qn != CNTXMARK) /* find context mark */ |
263 |
< |
; |
263 |
> |
qn++; |
264 |
|
return(!strcmp(qn, context)); |
265 |
|
} |
266 |
|
|
335 |
|
char *name; |
336 |
|
{ |
337 |
|
register VARDEF *vp; |
338 |
+ |
LIBR *libp; |
339 |
|
int hv; |
340 |
|
|
341 |
|
if ((vp = varlookup(name)) != NULL) { |
342 |
|
vp->nlinks++; |
343 |
|
return(vp); |
344 |
|
} |
345 |
< |
name = qualname(name, 0); /* use fully qualified name */ |
345 |
> |
#ifdef FUNCTION |
346 |
> |
libp = liblookup(name); |
347 |
> |
#else |
348 |
> |
libp = NULL; |
349 |
> |
#endif |
350 |
> |
if (libp == NULL) /* if name not in library */ |
351 |
> |
name = qualname(name, 0); /* use fully qualified version */ |
352 |
|
hv = hash(name); |
353 |
|
vp = (VARDEF *)emalloc(sizeof(VARDEF)); |
354 |
|
vp->name = savestr(name); |
355 |
|
vp->nlinks = 1; |
356 |
|
vp->def = NULL; |
357 |
< |
vp->lib = NULL; |
357 |
> |
vp->lib = libp; |
358 |
|
vp->next = hashtbl[hv]; |
359 |
|
hashtbl[hv] = vp; |
360 |
|
return(vp); |
400 |
|
dnext() /* return pointer to next definition */ |
401 |
|
{ |
402 |
|
register EPNODE *ep; |
403 |
+ |
register char *nm; |
404 |
|
|
405 |
|
while (htndx < NHASH) { |
406 |
|
if (htpos == NULL) |
407 |
|
htpos = hashtbl[htndx++]; |
408 |
|
while (htpos != NULL) { |
409 |
|
ep = htpos->def; |
410 |
+ |
nm = htpos->name; |
411 |
|
htpos = htpos->next; |
412 |
< |
if (ep != NULL) |
412 |
> |
if (ep != NULL && incontext(nm)) |
413 |
|
return(ep); |
414 |
|
} |
415 |
|
} |
486 |
|
{ |
487 |
|
register EPNODE *ep; |
488 |
|
char *qname; |
489 |
< |
EPNODE *lastdef; |
489 |
> |
register VARDEF *vdef; |
490 |
|
|
491 |
|
if (nextc == ';') { /* empty statement */ |
492 |
|
scan(); |
502 |
|
ep = getdefn(); |
503 |
|
qname = qualname(dname(ep), 0); |
504 |
|
#ifdef REDEFW |
505 |
< |
if ((lastdef = dlookup(qname)) != NULL) { |
506 |
< |
wputs(qname); |
507 |
< |
if (lastdef->type == ':') |
508 |
< |
wputs(": redefined constant expression\n"); |
509 |
< |
else |
510 |
< |
wputs(": redefined\n"); |
511 |
< |
} |
505 |
> |
if ((vdef = varlookup(qname)) != NULL) |
506 |
> |
if (vdef->def != NULL) { |
507 |
> |
wputs(qname); |
508 |
> |
if (vdef->def->type == ':') |
509 |
> |
wputs(": redefined constant expression\n"); |
510 |
> |
else |
511 |
> |
wputs(": redefined\n"); |
512 |
> |
} |
513 |
|
#ifdef FUNCTION |
514 |
< |
else if (ep->v.kid->type == FUNC && liblookup(qname) != NULL) { |
515 |
< |
wputs(qname); |
516 |
< |
wputs(": definition hides library function\n"); |
517 |
< |
} |
514 |
> |
else if (ep->v.kid->type == FUNC && vdef->lib != NULL) { |
515 |
> |
wputs(qname); |
516 |
> |
wputs(": definition hides library function\n"); |
517 |
> |
} |
518 |
|
#endif |
519 |
|
#endif |
520 |
|
if (ep->type == ':') |
539 |
|
{ |
540 |
|
register EPNODE *ep1, *ep2; |
541 |
|
|
542 |
< |
if (!isalpha(nextc)) |
542 |
> |
if (!isalpha(nextc) && nextc != CNTXMARK) |
543 |
|
syntax("illegal variable name"); |
544 |
|
|
545 |
|
ep1 = newnode(); |