ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/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.19 by schorsch, Mon Jul 21 22:30:17 2003 UTC

# Line 349 | Line 349 | dcleanup(              /* clear definitions (0->vars,1->output,2->
349                                  /* if context is global, clear all */
350      for (i = 0; i < NHASH; i++)
351          for (vp = hashtbl[i]; vp != NULL; vp = vp->next)
352 <            if (incontext(vp->name))
352 >            if (incontext(vp->name)) {
353                  if (lvl >= 2)
354                      dremove(vp->name);
355                  else
356                      dclear(vp->name);
357 +            }
358      if (lvl >= 1) {
359          for (ep = outchan; ep != NULL; ep = ep->sibling)
360              epfree(ep);
# Line 571 | Line 572 | getstatement(void)                     /* get next statement */
572      } else {                            /* ordinary definition */
573          ep = getdefn();
574          qname = qualname(dname(ep), 0);
575 <        if (esupport&E_REDEFW && (vdef = varlookup(qname)) != NULL)
575 >        if (esupport&E_REDEFW && (vdef = varlookup(qname)) != NULL) {
576              if (vdef->def != NULL && epcmp(ep, vdef->def)) {
577                  wputs(qname);
578                  if (vdef->def->type == ':')
# Line 582 | Line 583 | getstatement(void)                     /* get next statement */
583                  wputs(qname);
584                  wputs(": definition hides library function\n");
585              }
586 +        }
587          if (ep->type == ':')
588              dremove(qname);
589          else

Diff Legend

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