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.19 by schorsch, Mon Jul 21 22:30:17 2003 UTC vs.
Revision 2.24 by greg, Fri Mar 5 17:28:46 2010 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 622 | Line 624 | getdefn(void)
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());
# Line 645 | Line 647 | getdefn(void)
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();
# Line 707 | 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
> Changed lines