ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/calexpr.c
(Generate patch)

Comparing ray/src/common/calexpr.c (file contents):
Revision 1.12 by greg, Thu Aug 8 11:22:04 1991 UTC vs.
Revision 1.15 by greg, Wed Aug 14 08:18:14 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 323 | Line 323 | int  ln;
323   }
324  
325  
326 + getscanpos(fnp, lnp, spp, fpp)  /* return current scan position */
327 + char  **fnp;
328 + int  *lnp;
329 + char  **spp;
330 + FILE  **fpp;
331 + {
332 +    if (fnp != NULL) *fnp = infile;
333 +    if (lnp != NULL) *lnp = lineno;
334 +    if (spp != NULL) *spp = linbuf+linepos;
335 +    if (fpp != NULL) *fpp = infp;
336 + }
337 +
338 +
339   int
340   scan()                          /* scan next character, return literal next */
341   {
# Line 431 | Line 444 | getname()                      /* scan an identifier */
444      for (i = 0; i < MAXWORD && isid(lnext); i++, lnext = scan())
445          str[i] = lnext;
446      str[i] = '\0';
447 +    while (isid(lnext))         /* skip rest of name */
448 +        lnext = scan();
449  
450      return(str);
451   }
# Line 591 | Line 606 | getE5()                                /* E5 -> (E1) */
606                                  /*       ARG */
607   {
608      int  i;
609 +    char  *nam;
610      register EPNODE  *ep1, *ep2;
611  
612      if (nextc == '(') {
# Line 613 | Line 629 | getE5()                                /* E5 -> (E1) */
629   #endif
630  
631   #if  defined(VARIABLE) || defined(FUNCTION)
632 <    if (isalpha(nextc)) {
633 <        ep1 = newnode();
618 <        ep1->type = VAR;
619 <        ep1->v.ln = varinsert(getname());
620 <
632 >    if (isalpha(nextc) || nextc == CNTXMARK) {
633 >        nam = getname();
634   #if  defined(VARIABLE) && defined(FUNCTION)
635 +        ep1 = NULL;
636          if (curfunc != NULL)
637              for (i = 1, ep2 = curfunc->v.kid->sibling;
638                                  ep2 != NULL; i++, ep2 = ep2->sibling)
639 <                if (!strcmp(ep2->v.name, ep1->v.ln->name)) {
626 <                    epfree(ep1);
639 >                if (!strcmp(ep2->v.name, nam)) {
640                      ep1 = newnode();
641                      ep1->type = ARG;
642                      ep1->v.chan = i;
643                      break;
644                  }
645 +        if (ep1 == NULL)
646   #endif
647 +        {
648 +            ep1 = newnode();
649 +            ep1->type = VAR;
650 +            ep1->v.ln = varinsert(nam);
651 +        }
652   #ifdef  FUNCTION
653          if (nextc == '(') {
654              ep2 = newnode();

Diff Legend

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