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

Comparing ray/src/common/calprnt.c (file contents):
Revision 1.2 by greg, Wed Aug 14 16:26:34 1991 UTC vs.
Revision 2.6 by greg, Wed Oct 24 00:39:09 2012 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1991 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   *  calprint.c - routines for printing calcomp expressions.
9 – *
10 – *     1/29/87
6   */
7  
8 + #include "copyright.h"
9 +
10   #include  <stdio.h>
11  
12 + #include  "rterror.h"
13   #include  "calcomp.h"
14  
15  
16 < eprint(ep, fp)                  /* print a parse tree */
17 < register EPNODE  *ep;
18 < FILE  *fp;
16 > void
17 > eprint(                         /* print a parse tree */
18 >        EPNODE  *ep,
19 >        FILE  *fp
20 > )
21   {
22      static EPNODE  *curdef = NULL;
23 <    register EPNODE  *ep1;
23 >    EPNODE  *ep1 = NULL;
24  
25      switch (ep->type) {
26  
# Line 34 | Line 34 | FILE  *fp;
34  
35          case FUNC:
36              eprint(ep->v.kid, fp);
37 <            fputs("(", fp);
37 >            fputc('(', fp);
38              ep1 = ep->v.kid->sibling;
39              while (ep1 != NULL) {
40                  eprint(ep1, fp);
41                  if ((ep1 = ep1->sibling) != NULL)
42                      fputs(", ", fp);
43              }
44 <            fputs(")", fp);
44 >            fputc(')', fp);
45              break;
46  
47          case ARG:
# Line 58 | Line 58 | FILE  *fp;
58              break;
59  
60          case UMINUS:
61 <            fputs("-", fp);
61 >            fputc('-', fp);
62              eprint(ep->v.kid, fp);
63              break;
64  
# Line 71 | Line 71 | FILE  *fp;
71              ep1 = curdef;
72              curdef = ep;
73              eprint(ep->v.kid, fp);
74 <            putc(' ', fp);
75 <            putc(ep->type, fp);
76 <            putc(' ', fp);
74 >            fputc(' ', fp);
75 >            fputc(ep->type, fp);
76 >            fputc(' ', fp);
77              eprint(ep->v.kid->sibling, fp);
78              curdef = ep1;
79              break;
# Line 83 | Line 83 | FILE  *fp;
83          case '*':
84          case '/':
85          case '^':
86 <            fputs("(", fp);
86 >            fputc('(', fp);
87              eprint(ep->v.kid, fp);
88 <            putc(' ', fp);
89 <            putc(ep->type, fp);
90 <            putc(' ', fp);
88 >            fputc(' ', fp);
89 >            fputc(ep->type, fp);
90 >            fputc(' ', fp);
91              eprint(ep->v.kid->sibling, fp);
92 <            fputs(")", fp);
92 >            fputc(')', fp);
93              break;
94  
95          default:
# Line 101 | Line 101 | FILE  *fp;
101   }
102  
103  
104 < dprint(name, fp)                /* print a definition (all if no name) */
105 < char  *name;
106 < FILE  *fp;
104 > void
105 > dprint(                 /* print a definition (all if no name) */
106 >        char  *name,
107 >        FILE  *fp
108 > )
109   {
110 <    register EPNODE  *ep;
110 >    EPNODE  *ep;
111      
112      if (name == NULL)
113          for (ep = dfirst(); ep != NULL; ep = dnext()) {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines