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

Comparing ray/src/common/calexpr.c (file contents):
Revision 1.14 by greg, Thu Aug 8 13:40:09 1991 UTC vs.
Revision 2.1 by greg, Tue Nov 12 16:55:21 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 444 | 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 584 | Line 586 | getE4()                                /* E4 -> ADDOP E5 */
586                  ep2->v.num = -ep2->v.num;
587                  return(ep2);
588          }
589 +        if (ep2->type == UMINUS) {      /* don't generate -(-E5) */
590 +            efree((char *)ep2);
591 +            return(ep2->v.kid);
592 +        }
593          ep1 = newnode();
594          ep1->type = UMINUS;
595          addekid(ep1, ep2);
# Line 627 | Line 633 | getE5()                                /* E5 -> (E1) */
633   #endif
634  
635   #if  defined(VARIABLE) || defined(FUNCTION)
636 <    if (isalpha(nextc)) {
636 >    if (isalpha(nextc) || nextc == CNTXMARK) {
637          nam = getname();
638   #if  defined(VARIABLE) && defined(FUNCTION)
639          ep1 = NULL;

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)