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.12 by greg, Sat Feb 22 02:07:21 2003 UTC vs.
Revision 2.34 by greg, Tue Feb 7 20:28:16 2023 UTC

# Line 25 | Line 25 | static const char      RCSid[] = "$Id$";
25   *  2/19/03     Eliminated conditional compiles in favor of esupport extern.
26   */
27  
28 < /* ====================================================================
29 < * The Radiance Software License, Version 1.0
30 < *
31 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
32 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
33 < *
34 < * Redistribution and use in source and binary forms, with or without
35 < * modification, are permitted provided that the following conditions
36 < * are met:
37 < *
38 < * 1. Redistributions of source code must retain the above copyright
39 < *         notice, this list of conditions and the following disclaimer.
40 < *
41 < * 2. Redistributions in binary form must reproduce the above copyright
42 < *       notice, this list of conditions and the following disclaimer in
43 < *       the documentation and/or other materials provided with the
44 < *       distribution.
45 < *
46 < * 3. The end-user documentation included with the redistribution,
47 < *           if any, must include the following acknowledgment:
48 < *             "This product includes Radiance software
49 < *                 (http://radsite.lbl.gov/)
50 < *                 developed by the Lawrence Berkeley National Laboratory
51 < *               (http://www.lbl.gov/)."
52 < *       Alternately, this acknowledgment may appear in the software itself,
53 < *       if and wherever such third-party acknowledgments normally appear.
54 < *
55 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
56 < *       and "The Regents of the University of California" must
57 < *       not be used to endorse or promote products derived from this
58 < *       software without prior written permission. For written
59 < *       permission, please contact [email protected].
60 < *
61 < * 5. Products derived from this software may not be called "Radiance",
62 < *       nor may "Radiance" appear in their name, without prior written
63 < *       permission of Lawrence Berkeley National Laboratory.
64 < *
65 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
66 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
67 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
68 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
69 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
70 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
71 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
72 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
73 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
74 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
75 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
76 < * SUCH DAMAGE.
77 < * ====================================================================
78 < *
79 < * This software consists of voluntary contributions made by many
80 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
81 < * information on Lawrence Berkeley National Laboratory, please see
82 < * <http://www.lbl.gov/>.
83 < */
28 > #include "copyright.h"
29  
85 – #include  <stdio.h>
86 –
87 – #include  <string.h>
88 –
30   #include  <ctype.h>
31  
32 + #include  "rterror.h"
33 + #include  "rtio.h"
34 + #include  "rtmisc.h"
35   #include  "calcomp.h"
36  
37   #ifndef  NHASH
# Line 98 | Line 42 | static const char      RCSid[] = "$Id$";
42  
43   #define  newnode()      (EPNODE *)ecalloc(1, sizeof(EPNODE))
44  
45 < static double  dvalue();
45 > static double  dvalue(char  *name, EPNODE *d);
46  
47   #define  MAXCLOCK       (1L<<31)        /* clock wrap value */
48  
# Line 121 | Line 65 | EPNODE *curfunc = NULL;
65  
66  
67   void
68 < fcompile(fname)                 /* get definitions from a file */
69 < char  *fname;
68 > fcompile(                       /* get definitions from a file */
69 >        char  *fname
70 > )
71   {
72      FILE  *fp;
73  
# Line 133 | Line 78 | char  *fname;
78          eputs(": cannot open\n");
79          quit(1);
80      }
81 <    initfile(fp, fname, 0);
81 > #ifdef getc_unlocked                    /* avoid stupid semaphores */
82 >    flockfile(fp);
83 > #endif
84 >   initfile(fp, fname, 0);
85      while (nextc != EOF)
86          getstatement();
87      if (fname != NULL)
88          fclose(fp);
89 + #ifdef getc_unlocked
90 +    else
91 +        funlockfile(fp);
92 + #endif
93   }
94  
95  
96   void
97 < scompile(str, fn, ln)           /* get definitions from a string */
98 < char  *str;
99 < char  *fn;
100 < int  ln;
97 > scompile(               /* get definitions from a string */
98 >        char  *str,
99 >        char  *fn,
100 >        int  ln
101 > )
102   {
103      initstr(str, fn, ln);
104      while (nextc != EOF)
# Line 154 | Line 107 | int  ln;
107  
108  
109   double
110 < varvalue(vname)                 /* return a variable's value */
111 < char  *vname;
110 > varvalue(                       /* return a variable's value */
111 >        char  *vname
112 > )
113   {
114      return(dvalue(vname, dlookup(vname)));
115   }
116  
117  
118   double
119 < evariable(ep)                   /* evaluate a variable */
120 < EPNODE  *ep;
119 > evariable(                      /* evaluate a variable */
120 >        EPNODE  *ep
121 > )
122   {
123 <    register VARDEF  *dp = ep->v.ln;
123 >    VARDEF  *dp = ep->v.ln;
124  
125      return(dvalue(dp->name, dp->def));
126   }
127  
128  
129   void
130 < varset(vname, assign, val)      /* set a variable's value */
131 < char  *vname;
132 < int  assign;
133 < double  val;
130 > varset(         /* set a variable's value */
131 >        char  *vname,
132 >        int  assign,
133 >        double  val
134 > )
135   {
136      char  *qname;
137 <    register EPNODE  *ep1, *ep2;
137 >    EPNODE  *ep1, *ep2;
138                                          /* get qualified name */
139      qname = qualname(vname, 0);
140                                          /* check for quick set */
141 <    if ((ep1 = dlookup(qname)) != NULL && ep1->v.kid->type == SYM) {
141 >    if ((ep1 = dlookup(qname)) != NULL && ep1->v.kid->type == SYM &&
142 >                (ep1->type == ':') <= (assign == ':')) {
143          ep2 = ep1->v.kid->sibling;
144          if (ep2->type == NUM) {
145              ep2->v.num = val;
# Line 190 | Line 147 | double val;
147              return;
148          }
149      }
150 +    if (ep1 != NULL && esupport&E_REDEFW) {
151 +        wputs(qname);
152 +        if (ep1->type == ':')
153 +            wputs(": reset constant expression\n");
154 +        else
155 +            wputs(": reset expression\n");
156 +    }
157                                          /* hand build definition */
158      ep1 = newnode();
159      ep1->type = assign;
# Line 201 | Line 165 | double val;
165      ep2->type = NUM;
166      ep2->v.num = val;
167      addekid(ep1, ep2);
168 <    dremove(qname);
168 >    if (assign == ':')
169 >        dremove(qname);
170 >    else
171 >        dclear(qname);
172      dpush(qname, ep1);
173   }
174  
175  
176   void
177 < dclear(name)                    /* delete variable definitions of name */
178 < char  *name;
177 > dclear(                 /* delete variable definitions of name */
178 >        char  *name
179 > )
180   {
181 <    register EPNODE  *ep;
181 >    EPNODE  *ep;
182  
183      while ((ep = dpop(name)) != NULL) {
184          if (ep->type == ':') {
# Line 223 | Line 191 | char  *name;
191  
192  
193   void
194 < dremove(name)                   /* delete all definitions of name */
195 < char  *name;
194 > dremove(                        /* delete all definitions of name */
195 >        char  *name
196 > )
197   {
198 <    register EPNODE  *ep;
198 >    EPNODE  *ep;
199  
200      while ((ep = dpop(name)) != NULL)
201          epfree(ep);
# Line 234 | Line 203 | char  *name;
203  
204  
205   int
206 < vardefined(name)        /* return non-zero if variable defined */
207 < char  *name;
206 > vardefined(     /* return '=' or ':' if variable/constant defined */
207 >        char  *name
208 > )
209   {
210 <    register EPNODE  *dp;
210 >    EPNODE  *dp = dlookup(name);
211  
212 <    return((dp = dlookup(name)) != NULL && dp->v.kid->type == SYM);
212 >    if (dp == NULL || dp->v.kid->type != SYM)
213 >        return(0);
214 >
215 >    return(dp->type);
216   }
217  
218  
219   char *
220 < setcontext(ctx)                 /* set a new context path */
221 < register char  *ctx;
220 > calcontext(                     /* set a new context path */
221 >        char  *ctx
222 > )
223   {
224 <    register char  *cpp;
224 >    char  *cpp;
225  
226      if (ctx == NULL)
227          return(context);                /* just asking */
# Line 276 | Line 250 | register char  *ctx;
250  
251  
252   char *
253 < pushcontext(ctx)                /* push on another context */
254 < char  *ctx;
253 > pushcontext(            /* push on another context */
254 >        char  *ctx
255 > )
256   {
282 –    extern char  *strncpy(), *strcpy();
257      char  oldcontext[MAXCNTX+1];
258 <    register int  n;
258 >    int  n;
259  
260      strcpy(oldcontext, context);        /* save old context */
261 <    setcontext(ctx);                    /* set new context */
261 >    calcontext(ctx);                    /* set new context */
262      n = strlen(context);                /* tack on old */
263      if (n+strlen(oldcontext) > MAXCNTX) {
264          strncpy(context+n, oldcontext, MAXCNTX-n);
# Line 296 | Line 270 | char  *ctx;
270  
271  
272   char *
273 < popcontext()                    /* pop off top context */
273 > popcontext(void)                        /* pop off top context */
274   {
275 <    register char  *cp1, *cp2;
275 >    char  *cp1, *cp2;
276  
277      if (!context[0])                    /* nothing left to pop */
278          return(context);
# Line 306 | Line 280 | popcontext()                   /* pop off top context */
280      while (*++cp2 && *cp2 != CNTXMARK)
281          ;
282      cp1 = context;                      /* copy tail to front */
283 <    while (*cp1++ = *cp2++)
283 >    while ( (*cp1++ = *cp2++) )
284          ;
285      return(context);
286   }
287  
288  
289   char *
290 < qualname(nam, lvl)              /* get qualified name */
291 < register char  *nam;
292 < int  lvl;
290 > qualname(               /* get qualified name */
291 >        char  *nam,
292 >        int  lvl
293 > )
294   {
295 <    static char  nambuf[MAXWORD+1];
296 <    register char  *cp = nambuf, *cpp;
295 >    static char  nambuf[RMAXWORD+1];
296 >    char  *cp = nambuf, *cpp;
297                                  /* check for explicit local */
298      if (*nam == CNTXMARK)
299          if (lvl > 0)            /* only action is to refuse search */
# Line 329 | Line 304 | int  lvl;
304          return(lvl > 0 ? NULL : nam);
305                                  /* copy name to static buffer */
306      while (*nam) {
307 <        if (cp >= nambuf+MAXWORD)
307 >        if (cp >= nambuf+RMAXWORD)
308                  goto toolong;
309          *cp++ = *nam++;
310      }
# Line 348 | Line 323 | int  lvl;
323              ;
324      }
325      while (*cpp) {              /* copy context to static buffer */
326 <        if (cp >= nambuf+MAXWORD)
326 >        if (cp >= nambuf+RMAXWORD)
327              goto toolong;
328          *cp++ = *cpp++;
329      }
# Line 359 | Line 334 | toolong:
334  
335  
336   int
337 < incontext(qn)                   /* is qualified name in current context? */
338 < register char  *qn;
337 > incontext(                      /* is qualified name in current context? */
338 >        char  *qn
339 > )
340   {
341      if (!context[0])                    /* global context accepts all */
342          return(1);
# Line 371 | Line 347 | register char  *qn;
347  
348  
349   void
350 < chanout(cs)                     /* set output channels */
351 < int  (*cs)();
350 > chanout(                        /* set output channels */
351 >        void  (*cs)(int n, double v)
352 > )
353   {
354 <    register EPNODE  *ep;
354 >    EPNODE  *ep;
355  
356      for (ep = outchan; ep != NULL; ep = ep->sibling)
357          (*cs)(ep->v.kid->v.chan, evalue(ep->v.kid->sibling));
# Line 383 | Line 360 | int  (*cs)();
360  
361  
362   void
363 < dcleanup(lvl)           /* clear definitions (0->vars,1->output,2->consts) */
364 < int  lvl;
363 > dcleanup(               /* clear definitions (0->vars,1->output,2->consts) */
364 >        int  lvl
365 > )
366   {
367 <    register int  i;
368 <    register VARDEF  *vp;
369 <    register EPNODE  *ep;
367 >    int  i;
368 >    VARDEF  *vp;
369 >    EPNODE  *ep;
370                                  /* if context is global, clear all */
371      for (i = 0; i < NHASH; i++)
372          for (vp = hashtbl[i]; vp != NULL; vp = vp->next)
373 <            if (incontext(vp->name))
373 >            if (incontext(vp->name)) {
374                  if (lvl >= 2)
375                      dremove(vp->name);
376                  else
377                      dclear(vp->name);
378 +            }
379      if (lvl >= 1) {
380          for (ep = outchan; ep != NULL; ep = ep->sibling)
381              epfree(ep);
# Line 406 | Line 385 | int  lvl;
385  
386  
387   EPNODE *
388 < dlookup(name)                   /* look up a definition */
389 < char  *name;
388 > dlookup(                        /* look up a definition */
389 >        char  *name
390 > )
391   {
392 <    register VARDEF  *vp;
392 >    VARDEF  *vp;
393      
394      if ((vp = varlookup(name)) == NULL)
395          return(NULL);
# Line 418 | Line 398 | char  *name;
398  
399  
400   VARDEF *
401 < varlookup(name)                 /* look up a variable */
402 < char  *name;
401 > varlookup(                      /* look up a variable */
402 >        char  *name
403 > )
404   {
405      int  lvl = 0;
406 <    register char  *qname;
407 <    register VARDEF  *vp;
406 >    char  *qname;
407 >    VARDEF  *vp;
408                                  /* find most qualified match */
409      while ((qname = qualname(name, lvl++)) != NULL)
410          for (vp = hashtbl[hash(qname)]; vp != NULL; vp = vp->next)
# Line 434 | Line 415 | char  *name;
415  
416  
417   VARDEF *
418 < varinsert(name)                 /* get a link to a variable */
419 < char  *name;
418 > varinsert(                      /* get a link to a variable */
419 >        char  *name
420 > )
421   {
422 <    register VARDEF  *vp;
422 >    VARDEF  *vp;
423      int  hv;
424      
425      if ((vp = varlookup(name)) != NULL) {
# Line 459 | Line 441 | char  *name;
441  
442  
443   void
444 < libupdate(fn)                   /* update library links */
445 < char  *fn;
444 > libupdate(                      /* update library links */
445 >        char  *fn
446 > )
447   {
448 <    register int  i;
449 <    register VARDEF  *vp;
448 >    int  i;
449 >    VARDEF  *vp;
450                                          /* if fn is NULL then relink all */
451      for (i = 0; i < NHASH; i++)
452          for (vp = hashtbl[i]; vp != NULL; vp = vp->next)
453 <            if (vp->lib != NULL || fn == NULL || !strcmp(fn, vp->name))
453 >            if ((vp->lib != NULL) | (fn == NULL) || !strcmp(fn, vp->name))
454                  vp->lib = liblookup(vp->name);
455   }
456  
457  
458   void
459 < varfree(ln)                             /* release link to variable */
460 < register VARDEF  *ln;
459 > varfree(                                /* release link to variable */
460 >        VARDEF   *ln
461 > )
462   {
463 <    register VARDEF  *vp;
463 >    VARDEF  *vp;
464      int  hv;
465  
466      if (--ln->nlinks > 0)
# Line 497 | Line 481 | register VARDEF         *ln;
481  
482  
483   EPNODE *
484 < dfirst()                        /* return pointer to first definition */
484 > dfirst(void)                    /* return pointer to first definition */
485   {
486      htndx = 0;
487      htpos = NULL;
# Line 507 | Line 491 | dfirst()                       /* return pointer to first definition */
491  
492  
493   EPNODE *
494 < dnext()                         /* return pointer to next definition */
494 > dnext(void)                             /* return pointer to next definition */
495   {
496 <    register EPNODE  *ep;
497 <    register char  *nm;
496 >    EPNODE  *ep;
497 >    char  *nm;
498  
499      while (htndx < NHASH) {
500          if (htpos == NULL)
# Line 530 | Line 514 | dnext()                                /* return pointer to next definition */
514  
515  
516   EPNODE *
517 < dpop(name)                      /* pop a definition */
518 < char  *name;
517 > dpop(                   /* pop a definition */
518 >        char  *name
519 > )
520   {
521 <    register VARDEF  *vp;
522 <    register EPNODE  *dp;
521 >    VARDEF  *vp;
522 >    EPNODE  *dp;
523      
524      if ((vp = varlookup(name)) == NULL || vp->def == NULL)
525          return(NULL);
# Line 546 | Line 531 | char  *name;
531  
532  
533   void
534 < dpush(nm, ep)                   /* push on a definition */
535 < char  *nm;
536 < register EPNODE  *ep;
534 > dpush(                  /* push on a definition */
535 >        char  *nm,
536 >        EPNODE   *ep
537 > )
538   {
539 <    register VARDEF  *vp;
539 >    VARDEF  *vp;
540  
541      vp = varinsert(nm);
542      ep->sibling = vp->def;
# Line 559 | Line 545 | register EPNODE         *ep;
545  
546  
547   void
548 < addchan(sp)                     /* add an output channel assignment */
549 < EPNODE  *sp;
548 > addchan(                        /* add an output channel assignment */
549 >        EPNODE  *sp
550 > )
551   {
552      int  ch = sp->v.kid->v.chan;
553 <    register EPNODE  *ep, *epl;
553 >    EPNODE  *ep, *epl;
554  
555      for (epl = NULL, ep = outchan; ep != NULL; epl = ep, ep = ep->sibling)
556          if (ep->v.kid->v.chan >= ch) {
# Line 589 | Line 576 | EPNODE *sp;
576  
577  
578   void
579 < getstatement()                  /* get next statement */
579 > getstatement(void)                      /* get next statement */
580   {
581 <    register EPNODE  *ep;
581 >    EPNODE  *ep;
582      char  *qname;
583 <    register VARDEF  *vdef;
583 >    VARDEF  *vdef;
584  
585      if (nextc == ';') {         /* empty statement */
586          scan();
# Line 606 | Line 593 | getstatement()                 /* get next statement */
593      } else {                            /* ordinary definition */
594          ep = getdefn();
595          qname = qualname(dname(ep), 0);
596 <        if (esupport&E_REDEFW && (vdef = varlookup(qname)) != NULL)
596 >        if (esupport&E_REDEFW && (vdef = varlookup(qname)) != NULL) {
597              if (vdef->def != NULL && epcmp(ep, vdef->def)) {
598                  wputs(qname);
599                  if (vdef->def->type == ':')
# Line 617 | Line 604 | getstatement()                 /* get next statement */
604                  wputs(qname);
605                  wputs(": definition hides library function\n");
606              }
607 +        }
608          if (ep->type == ':')
609              dremove(qname);
610          else
# Line 632 | Line 620 | getstatement()                 /* get next statement */
620  
621  
622   EPNODE *
623 < getdefn()                       /* A -> SYM = E1 */
624 <                                /*      SYM : E1 */
625 <                                /*      FUNC(SYM,..) = E1 */
626 <                                /*      FUNC(SYM,..) : E1 */
623 > getdefn(void)
624 >        /* A -> SYM = E1 */
625 >        /*      SYM : E1 */
626 >        /*      FUNC(SYM,..) = E1 */
627 >        /*      FUNC(SYM,..) : E1 */
628   {
629 <    register EPNODE  *ep1, *ep2;
629 >    EPNODE  *ep1, *ep2;
630  
631 <    if (!isalpha(nextc) && nextc != CNTXMARK)
631 >    if (!isalpha(nextc) & (nextc != CNTXMARK))
632          syntax("illegal variable name");
633  
634      ep1 = newnode();
# Line 654 | Line 643 | getdefn()                      /* A -> SYM = E1 */
643          do {
644              scan();
645              if (!isalpha(nextc))
646 <                syntax("illegal variable name");
646 >                syntax("illegal parameter name");
647              ep2 = newnode();
648              ep2->type = SYM;
649              ep2->v.name = savestr(getname());
650 +            if (strchr(ep2->v.name, CNTXMARK) != NULL)
651 +                syntax("illegal parameter name");
652              addekid(ep1, ep2);
653          } while (nextc == ',');
654          if (nextc != ')')
# Line 666 | Line 657 | getdefn()                      /* A -> SYM = E1 */
657          curfunc = ep1;
658      }
659  
660 <    if (nextc != '=' && nextc != ':')
660 >    if ((nextc != '=') & (nextc != ':'))
661          syntax("'=' or ':' expected");
662  
663      ep2 = newnode();
# Line 677 | Line 668 | getdefn()                      /* A -> SYM = E1 */
668  
669      if (ep1->type == SYM && ep1->sibling->type != NUM) {
670          ep1 = newnode();
671 <        ep1->type = TICK;
671 >        ep1->type = CLKT;
672          ep1->v.tick = 0;
673          addekid(ep2, ep1);
674          ep1 = newnode();
# Line 691 | Line 682 | getdefn()                      /* A -> SYM = E1 */
682  
683  
684   EPNODE *
685 < getchan()                       /* A -> $N = E1 */
685 > getchan(void)                   /* A -> $N = E1 */
686   {
687 <    register EPNODE  *ep1, *ep2;
687 >    EPNODE  *ep1, *ep2;
688  
689      if (nextc != '$')
690          syntax("missing '$'");
# Line 722 | Line 713 | getchan()                      /* A -> $N = E1 */
713   */
714  
715  
716 < static double
717 < dvalue(name, d)                 /* evaluate a variable */
727 < char  *name;
728 < EPNODE  *d;
716 > static double                   /* evaluate a variable */
717 > dvalue(char *name, EPNODE *d)
718   {
719 <    register EPNODE  *ep1, *ep2;
719 >    EPNODE  *ep1, *ep2;
720      
721      if (d == NULL || d->v.kid->type != SYM) {
722          eputs(name);
# Line 737 | Line 726 | EPNODE *d;
726      ep1 = d->v.kid->sibling;                    /* get expression */
727      if (ep1->type == NUM)
728          return(ep1->v.num);                     /* return if number */
729 +    if (esupport&E_RCONST && d->type == ':') {
730 +        wputs(name);
731 +        wputs(": assigned non-constant value\n");
732 +    }
733      ep2 = ep1->sibling;                         /* check time */
734      if (eclock >= MAXCLOCK)
735          eclock = 1;                             /* wrap clock counter */
736      if (ep2->v.tick < MAXCLOCK &&
737 <                ep2->v.tick == 0 | ep2->v.tick != eclock) {
737 >                (ep2->v.tick == 0) | (ep2->v.tick != eclock)) {
738          ep2->v.tick = d->type == ':' ? MAXCLOCK : eclock;
739          ep2 = ep2->sibling;
740          ep2->v.num = evalue(ep1);               /* needs new value */

Diff Legend

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