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.11 by greg, Wed Feb 12 17:38:03 1997 UTC vs.
Revision 2.13 by greg, Tue Feb 25 02:47:21 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1997 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   *  Store variable definitions.
6   *
# Line 22 | Line 19 | static char SCCSid[] = "$SunId$ LBL";
19   *  4/23/91  Added ':' assignment for constant expressions
20   *
21   *  8/7/91  Added optional context path to append to variable names
22 + *
23 + *  5/17/2001  Fixed clock counter wrapping behavior
24 + *
25 + *  2/19/03     Eliminated conditional compiles in favor of esupport extern.
26   */
27  
28 + #include "copyright.h"
29 +
30   #include  <stdio.h>
31  
32 + #include  <string.h>
33 +
34   #include  <ctype.h>
35  
36   #include  "calcomp.h"
# Line 38 | Line 43 | static char SCCSid[] = "$SunId$ LBL";
43  
44   #define  newnode()      (EPNODE *)ecalloc(1, sizeof(EPNODE))
45  
41 – extern char  *ecalloc(), *emalloc(), *savestr(), *strcpy();
42 –
46   static double  dvalue();
47  
48 + #define  MAXCLOCK       (1L<<31)        /* clock wrap value */
49 +
50   unsigned long  eclock = 0;              /* value storage timer */
51  
52   #define  MAXCNTX        1023            /* maximum context length */
# Line 51 | Line 56 | static char  context[MAXCNTX+1];       /* current context pa
56   static VARDEF  *hashtbl[NHASH];         /* definition list */
57   static int  htndx;                      /* index for */        
58   static VARDEF  *htpos;                  /* ...dfirst() and */
54 – #ifdef  OUTCHAN
59   static EPNODE  *ochpos;                 /* ...dnext */
60   static EPNODE  *outchan;
57 – #endif
61  
59 – #ifdef  FUNCTION
62   EPNODE  *curfunc = NULL;
63   #define  dname(ep)      ((ep)->v.kid->type == SYM ? \
64                          (ep)->v.kid->v.name : \
65                          (ep)->v.kid->v.kid->v.name)
64 – #else
65 – #define  dname(ep)      ((ep)->v.kid->v.name)
66 – #endif
66  
67  
68 + void
69   fcompile(fname)                 /* get definitions from a file */
70   char  *fname;
71   {
# Line 86 | Line 86 | char  *fname;
86   }
87  
88  
89 + void
90   scompile(str, fn, ln)           /* get definitions from a string */
91   char  *str;
92   char  *fn;
# Line 115 | Line 116 | EPNODE *ep;
116   }
117  
118  
119 + void
120   varset(vname, assign, val)      /* set a variable's value */
121   char  *vname;
122   int  assign;
# Line 149 | Line 151 | double val;
151   }
152  
153  
154 + void
155   dclear(name)                    /* delete variable definitions of name */
156   char  *name;
157   {
# Line 164 | Line 167 | char  *name;
167   }
168  
169  
170 + void
171   dremove(name)                   /* delete all definitions of name */
172   char  *name;
173   {
# Line 174 | Line 178 | char  *name;
178   }
179  
180  
181 + int
182   vardefined(name)        /* return non-zero if variable defined */
183   char  *name;
184   {
# Line 298 | Line 303 | toolong:
303   }
304  
305  
306 + int
307   incontext(qn)                   /* is qualified name in current context? */
308   register char  *qn;
309   {
# Line 309 | Line 315 | register char  *qn;
315   }
316  
317  
318 < #ifdef  OUTCHAN
318 > void
319   chanout(cs)                     /* set output channels */
320   int  (*cs)();
321   {
# Line 319 | Line 325 | int  (*cs)();
325          (*cs)(ep->v.kid->v.chan, evalue(ep->v.kid->sibling));
326  
327   }
322 – #endif
328  
329  
330 + void
331   dcleanup(lvl)           /* clear definitions (0->vars,1->output,2->consts) */
332   int  lvl;
333   {
# Line 336 | Line 342 | int  lvl;
342                      dremove(vp->name);
343                  else
344                      dclear(vp->name);
339 – #ifdef  OUTCHAN
345      if (lvl >= 1) {
346          for (ep = outchan; ep != NULL; ep = ep->sibling)
347              epfree(ep);
348          outchan = NULL;
349      }
345 – #endif
350   }
351  
352  
# Line 386 | Line 390 | char  *name;
390          return(vp);
391      }
392      vp = (VARDEF *)emalloc(sizeof(VARDEF));
389 – #ifdef  FUNCTION
393      vp->lib = liblookup(name);
391 – #else
392 –    vp->lib = NULL;
393 – #endif
394      if (vp->lib == NULL)                /* if name not in library */
395          name = qualname(name, 0);       /* use fully qualified version */
396      hv = hash(name);
# Line 403 | Line 403 | char  *name;
403   }
404  
405  
406 < #ifdef  FUNCTION
406 > void
407   libupdate(fn)                   /* update library links */
408   char  *fn;
409   {
# Line 415 | Line 415 | char  *fn;
415              if (vp->lib != NULL || fn == NULL || !strcmp(fn, vp->name))
416                  vp->lib = liblookup(vp->name);
417   }
418 – #endif
418  
419  
420 + void
421   varfree(ln)                             /* release link to variable */
422   register VARDEF  *ln;
423   {
# Line 446 | Line 446 | dfirst()                       /* return pointer to first definition */
446   {
447      htndx = 0;
448      htpos = NULL;
449 – #ifdef  OUTCHAN
449      ochpos = outchan;
451 – #endif
450      return(dnext());
451   }
452  
# Line 470 | Line 468 | dnext()                                /* return pointer to next definition */
468                  return(ep);
469          }
470      }
473 – #ifdef  OUTCHAN
471      if ((ep = ochpos) != NULL)
472          ochpos = ep->sibling;
473      return(ep);
477 – #else
478 –    return(NULL);
479 – #endif
474   }
475  
476  
# Line 496 | Line 490 | char  *name;
490   }
491  
492  
493 + void
494   dpush(nm, ep)                   /* push on a definition */
495   char  *nm;
496   register EPNODE  *ep;
# Line 508 | Line 503 | register EPNODE         *ep;
503   }
504  
505  
506 < #ifdef  OUTCHAN
506 > void
507   addchan(sp)                     /* add an output channel assignment */
508   EPNODE  *sp;
509   {
# Line 536 | Line 531 | EPNODE *sp;
531      sp->sibling = NULL;
532  
533   }
539 – #endif
534  
535  
536 + void
537   getstatement()                  /* get next statement */
538   {
539      register EPNODE  *ep;
# Line 549 | Line 544 | getstatement()                 /* get next statement */
544          scan();
545          return;
546      }
547 < #ifdef  OUTCHAN
548 <    if (nextc == '$') {         /* channel assignment */
547 >    if (esupport&E_OUTCHAN &&
548 >                nextc == '$') {         /* channel assignment */
549          ep = getchan();
550          addchan(ep);
551 <    } else
557 < #endif
558 <    {                           /* ordinary definition */
551 >    } else {                            /* ordinary definition */
552          ep = getdefn();
553          qname = qualname(dname(ep), 0);
554 < #ifdef  REDEFW
562 <        if ((vdef = varlookup(qname)) != NULL)
554 >        if (esupport&E_REDEFW && (vdef = varlookup(qname)) != NULL)
555              if (vdef->def != NULL && epcmp(ep, vdef->def)) {
556                  wputs(qname);
557                  if (vdef->def->type == ':')
558                      wputs(": redefined constant expression\n");
559                  else
560                      wputs(": redefined\n");
561 <            }
570 < #ifdef  FUNCTION
571 <            else if (ep->v.kid->type == FUNC && vdef->lib != NULL) {
561 >            } else if (ep->v.kid->type == FUNC && vdef->lib != NULL) {
562                  wputs(qname);
563                  wputs(": definition hides library function\n");
564              }
575 – #endif
576 – #endif
565          if (ep->type == ':')
566              dremove(qname);
567          else
# Line 603 | Line 591 | getdefn()                      /* A -> SYM = E1 */
591      ep1->type = SYM;
592      ep1->v.name = savestr(getname());
593  
594 < #ifdef  FUNCTION
607 <    if (nextc == '(') {
594 >    if (esupport&E_FUNCTION && nextc == '(') {
595          ep2 = newnode();
596          ep2->type = FUNC;
597          addekid(ep2, ep1);
# Line 623 | Line 610 | getdefn()                      /* A -> SYM = E1 */
610          scan();
611          curfunc = ep1;
612      }
626 – #endif
613  
614      if (nextc != '=' && nextc != ':')
615          syntax("'=' or ':' expected");
# Line 634 | Line 620 | getdefn()                      /* A -> SYM = E1 */
620      addekid(ep2, ep1);
621      addekid(ep2, getE1());
622  
623 <    if (
638 < #ifdef  FUNCTION
639 <            ep1->type == SYM &&
640 < #endif
641 <            ep1->sibling->type != NUM) {
623 >    if (ep1->type == SYM && ep1->sibling->type != NUM) {
624          ep1 = newnode();
625          ep1->type = TICK;
626          ep1->v.tick = 0;
# Line 647 | Line 629 | getdefn()                      /* A -> SYM = E1 */
629          ep1->type = NUM;
630          addekid(ep2, ep1);
631      }
650 –
651 – #ifdef  FUNCTION
632      curfunc = NULL;
653 – #endif
633  
634      return(ep2);
635   }
636  
637  
659 – #ifdef  OUTCHAN
638   EPNODE *
639   getchan()                       /* A -> $N = E1 */
640   {
# Line 681 | Line 659 | getchan()                      /* A -> $N = E1 */
659  
660      return(ep2);
661   }
684 – #endif
662  
663  
664  
# Line 706 | Line 683 | EPNODE *d;
683      if (ep1->type == NUM)
684          return(ep1->v.num);                     /* return if number */
685      ep2 = ep1->sibling;                         /* check time */
686 <    if (ep2->v.tick == 0 || ep2->v.tick < eclock) {
687 <        ep2->v.tick = d->type == ':' ? ~0L : eclock;
686 >    if (eclock >= MAXCLOCK)
687 >        eclock = 1;                             /* wrap clock counter */
688 >    if (ep2->v.tick < MAXCLOCK &&
689 >                ep2->v.tick == 0 | ep2->v.tick != eclock) {
690 >        ep2->v.tick = d->type == ':' ? MAXCLOCK : eclock;
691          ep2 = ep2->sibling;
692          ep2->v.num = evalue(ep1);               /* needs new value */
693      } else

Diff Legend

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