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 2.1 by greg, Tue Nov 12 16:55:57 1991 UTC vs.
Revision 2.2 by greg, Sat Feb 22 02:07:21 2003 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.
6 + */
7 +
8 + /* ====================================================================
9 + * The Radiance Software License, Version 1.0
10   *
11 < *     1/29/87
11 > * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 > * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 > *
14 > * Redistribution and use in source and binary forms, with or without
15 > * modification, are permitted provided that the following conditions
16 > * are met:
17 > *
18 > * 1. Redistributions of source code must retain the above copyright
19 > *         notice, this list of conditions and the following disclaimer.
20 > *
21 > * 2. Redistributions in binary form must reproduce the above copyright
22 > *       notice, this list of conditions and the following disclaimer in
23 > *       the documentation and/or other materials provided with the
24 > *       distribution.
25 > *
26 > * 3. The end-user documentation included with the redistribution,
27 > *           if any, must include the following acknowledgment:
28 > *             "This product includes Radiance software
29 > *                 (http://radsite.lbl.gov/)
30 > *                 developed by the Lawrence Berkeley National Laboratory
31 > *               (http://www.lbl.gov/)."
32 > *       Alternately, this acknowledgment may appear in the software itself,
33 > *       if and wherever such third-party acknowledgments normally appear.
34 > *
35 > * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 > *       and "The Regents of the University of California" must
37 > *       not be used to endorse or promote products derived from this
38 > *       software without prior written permission. For written
39 > *       permission, please contact [email protected].
40 > *
41 > * 5. Products derived from this software may not be called "Radiance",
42 > *       nor may "Radiance" appear in their name, without prior written
43 > *       permission of Lawrence Berkeley National Laboratory.
44 > *
45 > * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 > * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 > * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 > * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 > * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 > * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 > * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 > * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 > * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 > * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 > * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 > * SUCH DAMAGE.
57 > * ====================================================================
58 > *
59 > * This software consists of voluntary contributions made by many
60 > * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 > * information on Lawrence Berkeley National Laboratory, please see
62 > * <http://www.lbl.gov/>.
63   */
64  
65   #include  <stdio.h>
# Line 15 | Line 67 | static char SCCSid[] = "$SunId$ LBL";
67   #include  "calcomp.h"
68  
69  
70 + void
71   eprint(ep, fp)                  /* print a parse tree */
72   register EPNODE  *ep;
73   FILE  *fp;
# Line 34 | Line 87 | FILE  *fp;
87  
88          case FUNC:
89              eprint(ep->v.kid, fp);
90 <            fputs("(", fp);
90 >            fputc('(', fp);
91              ep1 = ep->v.kid->sibling;
92              while (ep1 != NULL) {
93                  eprint(ep1, fp);
94                  if ((ep1 = ep1->sibling) != NULL)
95                      fputs(", ", fp);
96              }
97 <            fputs(")", fp);
97 >            fputc(')', fp);
98              break;
99  
100          case ARG:
# Line 58 | Line 111 | FILE  *fp;
111              break;
112  
113          case UMINUS:
114 <            fputs("-", fp);
114 >            fputc('-', fp);
115              eprint(ep->v.kid, fp);
116              break;
117  
# Line 71 | Line 124 | FILE  *fp;
124              ep1 = curdef;
125              curdef = ep;
126              eprint(ep->v.kid, fp);
127 <            putc(' ', fp);
128 <            putc(ep->type, fp);
129 <            putc(' ', fp);
127 >            fputc(' ', fp);
128 >            fputc(ep->type, fp);
129 >            fputc(' ', fp);
130              eprint(ep->v.kid->sibling, fp);
131              curdef = ep1;
132              break;
# Line 83 | Line 136 | FILE  *fp;
136          case '*':
137          case '/':
138          case '^':
139 <            fputs("(", fp);
139 >            fputc('(', fp);
140              eprint(ep->v.kid, fp);
141 <            putc(' ', fp);
142 <            putc(ep->type, fp);
143 <            putc(' ', fp);
141 >            fputc(' ', fp);
142 >            fputc(ep->type, fp);
143 >            fputc(' ', fp);
144              eprint(ep->v.kid->sibling, fp);
145 <            fputs(")", fp);
145 >            fputc(')', fp);
146              break;
147  
148          default:
# Line 101 | Line 154 | FILE  *fp;
154   }
155  
156  
157 + void
158   dprint(name, fp)                /* print a definition (all if no name) */
159   char  *name;
160   FILE  *fp;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines