ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/common/caldefn.c
(Generate patch)

Comparing ray/src/common/caldefn.c (file contents):
Revision 2.18 by schorsch, Thu Jul 17 09:21:29 2003 UTC vs.
Revision 2.22 by schorsch, Sun Mar 28 20:33:12 2004 UTC

# Line 32 | Line 32 | static const char      RCSid[] = "$Id$";
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
# Line 259 | Line 261 | popcontext(void)                       /* pop off top context */
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   }
# Line 349 | Line 351 | dcleanup(              /* clear definitions (0->vars,1->output,2->
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);
# Line 571 | Line 574 | getstatement(void)                     /* get next statement */
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 == ':')
# Line 582 | Line 585 | getstatement(void)                     /* get next statement */
585                  wputs(qname);
586                  wputs(": definition hides library function\n");
587              }
588 +        }
589          if (ep->type == ':')
590              dremove(qname);
591          else
# Line 705 | Line 709 | dvalue(char  *name, EPNODE     *d)
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 */

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)