32 |
|
#include <ctype.h> |
33 |
|
|
34 |
|
#include "rterror.h" |
35 |
+ |
#include "rtio.h" |
36 |
+ |
#include "rtmisc.h" |
37 |
|
#include "calcomp.h" |
38 |
|
|
39 |
|
#ifndef NHASH |
261 |
|
while (*++cp2 && *cp2 != CNTXMARK) |
262 |
|
; |
263 |
|
cp1 = context; /* copy tail to front */ |
264 |
< |
while (*cp1++ = *cp2++) |
264 |
> |
while ( (*cp1++ = *cp2++) ) |
265 |
|
; |
266 |
|
return(context); |
267 |
|
} |
351 |
|
/* if context is global, clear all */ |
352 |
|
for (i = 0; i < NHASH; i++) |
353 |
|
for (vp = hashtbl[i]; vp != NULL; vp = vp->next) |
354 |
< |
if (incontext(vp->name)) |
354 |
> |
if (incontext(vp->name)) { |
355 |
|
if (lvl >= 2) |
356 |
|
dremove(vp->name); |
357 |
|
else |
358 |
|
dclear(vp->name); |
359 |
+ |
} |
360 |
|
if (lvl >= 1) { |
361 |
|
for (ep = outchan; ep != NULL; ep = ep->sibling) |
362 |
|
epfree(ep); |
574 |
|
} else { /* ordinary definition */ |
575 |
|
ep = getdefn(); |
576 |
|
qname = qualname(dname(ep), 0); |
577 |
< |
if (esupport&E_REDEFW && (vdef = varlookup(qname)) != NULL) |
577 |
> |
if (esupport&E_REDEFW && (vdef = varlookup(qname)) != NULL) { |
578 |
|
if (vdef->def != NULL && epcmp(ep, vdef->def)) { |
579 |
|
wputs(qname); |
580 |
|
if (vdef->def->type == ':') |
585 |
|
wputs(qname); |
586 |
|
wputs(": definition hides library function\n"); |
587 |
|
} |
588 |
+ |
} |
589 |
|
if (ep->type == ':') |
590 |
|
dremove(qname); |
591 |
|
else |
624 |
|
do { |
625 |
|
scan(); |
626 |
|
if (!isalpha(nextc)) |
627 |
< |
syntax("illegal variable name"); |
627 |
> |
syntax("illegal parameter name"); |
628 |
|
ep2 = newnode(); |
629 |
|
ep2->type = SYM; |
630 |
|
ep2->v.name = savestr(getname()); |
647 |
|
|
648 |
|
if (ep1->type == SYM && ep1->sibling->type != NUM) { |
649 |
|
ep1 = newnode(); |
650 |
< |
ep1->type = TICK; |
650 |
> |
ep1->type = CLKT; |
651 |
|
ep1->v.tick = 0; |
652 |
|
addekid(ep2, ep1); |
653 |
|
ep1 = newnode(); |
709 |
|
if (eclock >= MAXCLOCK) |
710 |
|
eclock = 1; /* wrap clock counter */ |
711 |
|
if (ep2->v.tick < MAXCLOCK && |
712 |
< |
ep2->v.tick == 0 | ep2->v.tick != eclock) { |
712 |
> |
(ep2->v.tick == 0) | (ep2->v.tick != eclock)) { |
713 |
|
ep2->v.tick = d->type == ':' ? MAXCLOCK : eclock; |
714 |
|
ep2 = ep2->sibling; |
715 |
|
ep2->v.num = evalue(ep1); /* needs new value */ |