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 1.2 by greg, Thu May 31 10:24:28 1990 UTC vs.
Revision 1.9 by greg, Wed Apr 24 08:17:22 1991 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1986 Regents of the University of California */
1 > /* Copyright (c) 1991 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 18 | Line 18 | static char SCCSid[] = "$SunId$ LBL";
18   *  11/16/88  Added VARDEF structure for hard linking.
19   *
20   *  5/31/90  Added conditional compile (REDEFW) for redefinition warning.
21 + *
22 + *  4/23/91  Added ':' defines for constant expressions (RCONST)
23   */
24  
25   #include  <stdio.h>
# Line 34 | Line 36 | static char SCCSid[] = "$SunId$ LBL";
36  
37   extern char  *ecalloc(), *savestr();
38  
39 < extern double  dvalue();
39 > static double  dvalue();
40  
41   long  eclock = -1;                      /* value storage timer */
42  
# Line 68 | Line 70 | char  *fname;
70          eputs(": cannot open\n");
71          quit(1);
72      }
73 <    initfile(fname, fp);
73 >    initfile(fp, fname, 0);
74      while (nextc != EOF)
75          loaddefn();
76      if (fname != NULL)
# Line 76 | Line 78 | char  *fname;
78   }
79  
80  
81 < scompile(file, str)             /* get definitions from a string */
80 < char  *file;
81 > scompile(str, fn, ln)           /* get definitions from a string */
82   char  *str;
83 + char  *fn;
84 + int  ln;
85   {
86 <    initstr(file, str);
86 >    initstr(str, fn, ln);
87      while (nextc != EOF)
88          loaddefn();
89   }
# Line 104 | Line 107 | EPNODE  *ep;
107   }
108  
109  
110 < varset(vname, val)              /* set a variable's value */
110 > varset(vname, assign, val)      /* set a variable's value */
111   char  *vname;
112 + int  assign;
113   double  val;
114   {
115      register EPNODE  *ep1, *ep2;
# Line 114 | Line 118 | double  val;
118          ep2 = ep1->v.kid->sibling;
119          if (ep2->type == NUM) {
120              ep2->v.num = val;
121 <            ep2->sibling->v.tick = -1;
121 >            ep1->type = assign;
122              return;
123          }
124      }
125                                          /* hand build definition */
126      ep1 = newnode();
127 <    ep1->type = '=';
127 >    ep1->type = assign;
128      ep2 = newnode();
129      ep2->type = SYM;
130      ep2->v.name = savestr(vname);
# Line 129 | Line 133 | double  val;
133      ep2->type = NUM;
134      ep2->v.num = val;
135      addekid(ep1, ep2);
136 <    ep2 = newnode();
133 <    ep2->type = TICK;
134 <    ep2->v.tick = -1;
135 <    addekid(ep1, ep2);
136 <    ep2 = newnode();
137 <    ep2->type = NUM;
138 <    addekid(ep1, ep2);
139 <    dclear(vname);
136 >    dremove(vname);
137      dpush(ep1);
138   }
139  
140  
141 < dclear(name)                    /* delete all definitions of name */
141 > dclear(name)                    /* delete variable definitions of name */
142   char  *name;
143   {
144      register EPNODE  *ep;
145  
146 +    while ((ep = dpop(name)) != NULL) {
147 +        if (ep->type == ':') {
148 +            dpush(ep);          /* don't clear constants */
149 +            return;
150 +        }
151 +        epfree(ep);
152 +    }
153 + }
154 +
155 +
156 + dremove(name)                   /* delete all definitions of name */
157 + char  *name;
158 + {
159 +    register EPNODE  *ep;
160 +
161      while ((ep = dpop(name)) != NULL)
162          epfree(ep);
163   }
# Line 161 | Line 173 | char  *name;
173  
174  
175   #ifdef  OUTCHAN
176 < chanout()                       /* set output channels */
176 > chanout(cs)                     /* set output channels */
177 > int  (*cs)();
178   {
179      register EPNODE  *ep;
180  
181      for (ep = outchan; ep != NULL; ep = ep->sibling)
182 <        chanset(ep->v.kid->v.chan, evalue(ep->v.kid->sibling));
182 >        (*cs)(ep->v.kid->v.chan, evalue(ep->v.kid->sibling));
183  
184   }
185   #endif
186  
187  
188 < dclearall()                     /* clear all definitions */
188 > dcleanup(cons, ochans)          /* clear definitions */
189 > int  cons, ochans;
190   {
191      register int  i;
192      register VARDEF  *vp;
# Line 180 | Line 194 | dclearall()                    /* clear all definitions */
194  
195      for (i = 0; i < NHASH; i++)
196          for (vp = hashtbl[i]; vp != NULL; vp = vp->next)
197 <            dclear(vp->name);
197 >            if (cons)
198 >                dremove(vp->name);
199 >            else
200 >                dclear(vp->name);
201   #ifdef  OUTCHAN
202 <    for (ep = outchan; ep != NULL; ep = ep->sibling)
203 <        epfree(ep);
204 <    outchan = NULL;
202 >    if (ochans) {
203 >        for (ep = outchan; ep != NULL; ep = ep->sibling)
204 >            epfree(ep);
205 >        outchan = NULL;
206 >    }
207   #endif
208   }
209  
# Line 374 | Line 393 | loaddefn()                     /* load next definition */
393          ep = getdefn();
394   #ifdef  REDEFW
395          if (dlookup(dname(ep)) != NULL) {
396 <                dclear(dname(ep));
397 <                wputs(dname(ep));
396 >            dclear(dname(ep));
397 >            wputs(dname(ep));
398 >            if (dlookup(dname(ep)) == NULL)
399                  wputs(": redefined\n");
400 +            else
401 +                wputs(": redefined constant expression\n");
402          }
403 + #ifdef  FUNCTION
404 +        else if (ep->v.kid->type == FUNC &&
405 +                        liblookup(ep->v.kid->v.kid->v.name) != NULL) {
406 +            wputs(ep->v.kid->v.kid->v.name);
407 +            wputs(": redefined library function\n");
408 +        }
409 + #endif
410   #else
411          dclear(dname(ep));
412   #endif
# Line 393 | Line 422 | loaddefn()                     /* load next definition */
422  
423   EPNODE *
424   getdefn()                       /* A -> SYM = E1 */
425 +                                /*      SYM : E1 */
426                                  /*      FUNC(SYM,..) = E1 */
427 +                                /*      FUNC(SYM,..) : E1 */
428   {
429      register EPNODE  *ep1, *ep2;
430  
# Line 427 | Line 458 | getdefn()                      /* A -> SYM = E1 */
458          curfunc = NULL;
459   #endif
460  
461 <    if (nextc != '=')
462 <        syntax("'=' expected");
432 <    scan();
461 >    if (nextc != '=' && nextc != ':')
462 >        syntax("'=' or ':' expected");
463  
464      ep2 = newnode();
465 <    ep2->type = '=';
465 >    ep2->type = nextc;
466 >    scan();
467      addekid(ep2, ep1);
468 + #ifdef  RCONST
469 +    if (
470 + #ifdef  FUNCTION
471 +            ep1->type == SYM &&
472 + #endif
473 +            ep2->type == ':')
474 +        addekid(ep2, rconst(getE1()));
475 +    else
476 + #endif
477      addekid(ep2, getE1());
478  
479 +    if (
480   #ifdef  FUNCTION
481 <    if (ep1->type == SYM)
481 >            ep1->type == SYM &&
482   #endif
483 <    {
483 >            ep1->sibling->type != NUM) {
484          ep1 = newnode();
485          ep1->type = TICK;
486          ep1->v.tick = -1;
# Line 500 | Line 541 | EPNODE  *d;
541          quit(1);
542      }
543      ep1 = d->v.kid->sibling;                    /* get expression */
544 +    if (ep1->type == NUM)
545 +        return(ep1->v.num);                     /* return if number */
546      ep2 = ep1->sibling;                         /* check time */
547      if (ep2->v.tick < 0 || ep2->v.tick < eclock) {
548 <        ep2->v.tick = eclock;
548 >        ep2->v.tick = d->type == ':' ? 1L<<30 : eclock;
549          ep2 = ep2->sibling;
550 <        ep2->v.num = evalue(ep1);               /* compute new value */
550 >        ep2->v.num = evalue(ep1);               /* needs new value */
551      } else
552 <        ep2 = ep2->sibling;                     /* reuse old value */
552 >        ep2 = ep2->sibling;                     /* else reuse old value */
553  
554      return(ep2->v.num);
555   }

Diff Legend

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