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 2.10 by greg, Tue Nov 10 10:29:19 1992 UTC vs.
Revision 2.15 by greg, Wed Sep 8 09:12:37 1993 UTC

# Line 34 | Line 34 | static char SCCSid[] = "$SunId$ LBL";
34  
35   #define  isdecimal(c)   (isdigit(c) || (c) == '.')
36  
37 < #ifndef atof
38 < extern double  atof();
39 < #endif
40 < extern char  *fgets(), *savestr();
37 > extern char  *savestr();
38   extern char  *emalloc(), *ecalloc();
39   extern EPNODE  *curfunc;
40   extern double  efunc(), evariable();
41 < static double  euminus(), echannel(), eargument(), enumber();
41 > static double  euminus(), eargument(), enumber();
42 > #ifdef  INCHAN
43 > static double  echannel();
44 > #endif
45   static double  eadd(), esubtr(), emult(), edivi(), epow();
46   static double  ebotch();
47  
48 + #ifdef  DCL_ATOF
49 + extern double  atof();
50 + #endif
51 +
52   int  nextc;                             /* lookahead character */
53  
54   double  (*eoper[])() = {                /* expression operations */
# Line 128 | Line 132 | char  *expr;
132   epfree(epar)                    /* free a parse tree */
133   register EPNODE  *epar;
134   {
135 <    register EPNODE  *ep, *epn;
135 >    register EPNODE  *ep;
136  
137      switch (epar->type) {
138  
# Line 149 | Line 153 | register EPNODE         *epar;
153              break;
154  
155          default:
156 <            for (ep = epar->v.kid; ep != NULL; ep = epn) {
157 <                epn = ep->sibling;
156 >            while ((ep = epar->v.kid) != NULL) {
157 >                epar->v.kid = ep->sibling;
158                  epfree(ep);
159              }
160              break;

Diff Legend

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