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.8 by greg, Fri Oct 2 15:57:29 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 149 | Line 153 | register EPNODE         *epar;
153              break;
154  
155          default:
156 <            for (ep = epar->v.kid; ep != NULL; ep = ep->sibling)
156 >            while ((ep = epar->v.kid) != NULL) {
157 >                epar->v.kid = ep->sibling;
158                  epfree(ep);
159 +            }
160              break;
161  
162      }
# Line 372 | Line 378 | scan()                         /* scan next character, return literal next
378  
379  
380   char *
381 < ltoa(l)                         /* convert long to ascii */
381 > long2ascii(l)                         /* convert long to ascii */
382   long  l;
383   {
384      static char  buf[16];
# Line 406 | Line 412 | char  *err;
412          if (infile != NULL) eputs(infile);
413          if (lineno != 0) {
414              eputs(infile != NULL ? ", line " : "line ");
415 <            eputs(ltoa((long)lineno));
415 >            eputs(long2ascii((long)lineno));
416          }
417          eputs(":\n");
418      }

Diff Legend

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