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.17 by greg, Fri Aug 9 08:27:56 1991 UTC vs.
Revision 2.1 by greg, Tue Nov 12 16:55:27 1991 UTC

# Line 38 | Line 38 | static char SCCSid[] = "$SunId$ LBL";
38  
39   extern char  *ecalloc(), *savestr(), *strcpy();
40  
41 + static int  hash();
42 +
43   static double  dvalue();
44  
45   long  eclock = -1;                      /* value storage timer */
46  
47 < static char  context[MAXWORD];          /* current context path */
47 > static char  context[MAXWORD+1];        /* current context path */
48  
49   static VARDEF  *hashtbl[NHASH];         /* definition list */
50   static int  htndx;                      /* index for */        
# Line 195 | Line 197 | register char  *ctx;
197      if (*ctx != CNTXMARK)
198          *cpp++ = CNTXMARK;              /* make sure there's a mark */
199      do {
200 <        if (cpp >= context+MAXWORD-1) {
201 <            *cpp = '\0';
200 <            wputs(context);
201 <            wputs(": context path too long\n");
202 <            return(NULL);
203 <        }
200 >        if (cpp >= context+MAXWORD)
201 >            break;                      /* just copy what we can */
202          if (isid(*ctx))
203              *cpp++ = *ctx++;
204          else {
# Line 217 | Line 215 | qualname(nam, lvl)             /* get qualified name */
215   register char  *nam;
216   int  lvl;
217   {
218 <    static char  nambuf[MAXWORD];
218 >    static char  nambuf[MAXWORD+1];
219      register char  *cp = nambuf, *cpp;
220                                  /* check for explicit local */
221      if (*nam == CNTXMARK)
# Line 229 | Line 227 | int  lvl;
227          return(lvl > 0 ? NULL : nam);
228                                  /* copy name to static buffer */
229      while (*nam) {
230 <        if (cp >= nambuf+MAXWORD-1)
230 >        if (cp >= nambuf+MAXWORD)
231                  goto toolong;
232          *cp++ = *nam++;
233      }
# Line 248 | Line 246 | int  lvl;
246              ;
247      }
248      while (*cpp) {              /* copy context to static buffer */
249 <        if (cp >= nambuf+MAXWORD-1)
249 >        if (cp >= nambuf+MAXWORD)
250              goto toolong;
251          *cp++ = *cpp++;
252      }
255 –    *cp = '\0';
256 –    return(nambuf);             /* return qualified name */
253   toolong:
254      *cp = '\0';
255 <    eputs(nambuf);
260 <    eputs(": name too long\n");
261 <    quit(1);
255 >    return(nambuf);             /* return qualified name */
256   }
257  
258  
# Line 266 | Line 260 | incontext(qn)                  /* is qualified name in current contex
260   register char  *qn;
261   {
262      while (*qn && *qn != CNTXMARK)      /* find context mark */
263 <        ;
263 >        qn++;
264      return(!strcmp(qn, context));
265   }
266  
# Line 406 | Line 400 | EPNODE *
400   dnext()                         /* return pointer to next definition */
401   {
402      register EPNODE  *ep;
403 +    register char  *nm;
404  
405      while (htndx < NHASH) {
406          if (htpos == NULL)
407                  htpos = hashtbl[htndx++];
408          while (htpos != NULL) {
409              ep = htpos->def;
410 +            nm = htpos->name;
411              htpos = htpos->next;
412 <            if (ep != NULL)
412 >            if (ep != NULL && incontext(nm))
413                  return(ep);
414          }
415      }
# Line 543 | Line 539 | getdefn()                      /* A -> SYM = E1 */
539   {
540      register EPNODE  *ep1, *ep2;
541  
542 <    if (!isalpha(nextc))
542 >    if (!isalpha(nextc) && nextc != CNTXMARK)
543          syntax("illegal variable name");
544  
545      ep1 = newnode();

Diff Legend

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