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.23 by schorsch, Thu Jul 3 22:41:44 2003 UTC vs.
Revision 2.26 by schorsch, Sun Jul 27 22:12:01 2003 UTC

# Line 26 | Line 26 | static const char      RCSid[] = "$Id$";
26   #include  <math.h>
27   #include  <stdlib.h>
28  
29 + #include  "rterror.h"
30   #include  "calcomp.h"
31  
32   #define  MAXLINE        256             /* maximum line length */
# Line 34 | Line 35 | static const char      RCSid[] = "$Id$";
35  
36   #define  isdecimal(c)   (isdigit(c) || (c) == '.')
37  
38 < static double  euminus(), eargument(), enumber();
39 < static double  echannel();
40 < static double  eadd(), esubtr(), emult(), edivi(), epow();
41 < static double  ebotch();
38 > static double  euminus(EPNODE *), eargument(EPNODE *), enumber(EPNODE *);
39 > static double  echannel(EPNODE *);
40 > static double  eadd(EPNODE *), esubtr(EPNODE *),
41 >               emult(EPNODE *), edivi(EPNODE *),
42 >               epow(EPNODE *);
43 > static double  ebotch(EPNODE *);
44  
45   unsigned int  esupport =                /* what to support */
46                  E_VARIABLE | E_FUNCTION ;
# Line 125 | 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 524 | 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 768 | 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