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 2.24 by schorsch, Thu Jul 17 09:21:29 2003 UTC vs.
Revision 2.27 by greg, Mon Aug 4 19:20:26 2003 UTC

# Line 47 | Line 47 | unsigned int  esupport =               /* what to support */
47  
48   int  nextc;                             /* lookahead character */
49  
50 < double  (*eoper[])() = {                /* expression operations */
50 > double  (*eoper[])(EPNODE *) = {        /* expression operations */
51          ebotch,
52          evariable,
53          enumber,
# Line 128 | Line 128 | register EPNODE  *ep1, *ep2;
128                  if (ep2->v.num == 0)
129                          return(ep1->v.num != 0);
130                  d = ep1->v.num / ep2->v.num;
131 <                return(d > 1.000000000001 | d < 0.999999999999);
131 >                return((d > 1.000000000001) | (d < 0.999999999999));
132  
133          case CHAN:
134          case ARG:
# Line 527 | Line 527 | getnum()                       /* scan a positive float */
527              lnext = scan();
528          }
529      }
530 <    if ((lnext == 'e' | lnext == 'E') && i < RMAXWORD) {
530 >    if ((lnext == 'e') | (lnext == 'E') && i < RMAXWORD) {
531          str[i++] = lnext;
532          lnext = scan();
533 <        if ((lnext == '-' | lnext == '+') && i < RMAXWORD) {
533 >        if ((lnext == '-') | (lnext == '+') && i < RMAXWORD) {
534              str[i++] = lnext;
535              lnext = scan();
536          }
# Line 771 | Line 771 | register EPNODE         *ep;
771  
772      if (ep->type != VAR)
773          return(0);
774 <    if ((dp = ep->v.ln->def) != NULL)
774 >    if ((dp = ep->v.ln->def) != NULL) {
775          if (dp->v.kid->type == FUNC)
776              return(dp->type == ':');
777          else
778              return(0);          /* don't identify masked library functions */
779 +    }
780      if ((lp = ep->v.ln->lib) != NULL)
781          return(lp->atyp == ':');
782      return(0);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines