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.2 by greg, Sat Feb 22 02:07:21 2003 UTC vs.
Revision 2.7 by greg, Fri Jul 30 00:22:32 2021 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  calprint.c - routines for printing calcomp expressions.
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
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 < */
8 > #include "copyright.h"
9  
10   #include  <stdio.h>
11 + #include  <string.h>
12  
13 + #include  "rterror.h"
14   #include  "calcomp.h"
15  
16  
17 + /* is child binary operation lower precedence than parent? */
18 + static int
19 + lower_precedent_binop(int typ, EPNODE *ekid)
20 + {
21 +    if (ekid == NULL)
22 +        return(0);
23 +    switch (typ) {
24 +        case '+':
25 +                return(0);
26 +        case '-':
27 +                return(ekid->type == '+');
28 +        case '*':
29 +                return(strchr("+-", ekid->type) != NULL);
30 +        case '/':
31 +                return(strchr("+-*", ekid->type) != NULL);
32 +        case '^':
33 +                return(strchr("+-*/^", ekid->type) != NULL);
34 +        }
35 +    return(0);                  /* child not binary op */
36 + }
37 +
38   void
39 < eprint(ep, fp)                  /* print a parse tree */
40 < register EPNODE  *ep;
41 < FILE  *fp;
39 > eprint(                         /* print a parse tree */
40 >        EPNODE  *ep,
41 >        FILE  *fp
42 > )
43   {
44      static EPNODE  *curdef = NULL;
45 <    register EPNODE  *ep1;
45 >    EPNODE  *ep1 = NULL;
46  
47 <    switch (ep->type) {
47 >    switch (ep==NULL ? -1 : ep->type) {
48  
49          case VAR:
50              fputs(ep->v.ln->name, fp);
# Line 110 | Line 79 | FILE  *fp;
79              fprintf(fp, "%.9g", ep->v.num);
80              break;
81  
113 –        case UMINUS:
114 –            fputc('-', fp);
115 –            eprint(ep->v.kid, fp);
116 –            break;
117 –
82          case CHAN:
83              fprintf(fp, "$%d", ep->v.chan);
84              break;
# Line 130 | Line 94 | FILE  *fp;
94              eprint(ep->v.kid->sibling, fp);
95              curdef = ep1;
96              break;
97 <            
97 >
98 >        case UMINUS:
99 >            fputc('-', fp);
100 >            if (ep->v.kid != NULL && strchr("+-*/^", ep->v.kid->type)) {
101 >                fputc('(', fp);
102 >                eprint(ep->v.kid, fp);
103 >                fputc(')', fp);
104 >            } else
105 >                eprint(ep->v.kid, fp);
106 >            break;
107 >
108          case '+':
109          case '-':
110          case '*':
111          case '/':
112          case '^':
113 <            fputc('(', fp);
114 <            eprint(ep->v.kid, fp);
115 <            fputc(' ', fp);
116 <            fputc(ep->type, fp);
117 <            fputc(' ', fp);
118 <            eprint(ep->v.kid->sibling, fp);
119 <            fputc(')', fp);
113 >            if (lower_precedent_binop(ep->type, ep->v.kid)) {
114 >                fputc('(', fp);
115 >                eprint(ep->v.kid, fp);
116 >                fputc(')', fp);
117 >            } else
118 >                eprint(ep->v.kid, fp);
119 >            if (ep->type != '^') {
120 >                fputc(' ', fp);
121 >                fputc(ep->type, fp);
122 >                fputc(' ', fp);
123 >            } else
124 >                fputc(ep->type, fp);
125 >            if (lower_precedent_binop(ep->type, ep->v.kid->sibling)) {
126 >                fputc('(', fp);
127 >                eprint(ep->v.kid->sibling, fp);
128 >                fputc(')', fp);
129 >            } else
130 >                eprint(ep->v.kid->sibling, fp);
131              break;
132  
133          default:
# Line 150 | Line 135 | FILE  *fp;
135              quit(1);
136  
137      }
153 –
138   }
139  
140  
141   void
142 < dprint(name, fp)                /* print a definition (all if no name) */
143 < char  *name;
144 < FILE  *fp;
142 > dprint(                 /* print a definition (all if no name) */
143 >        char  *name,
144 >        FILE  *fp
145 > )
146   {
147 <    register EPNODE  *ep;
147 >    EPNODE  *ep;
148      
149      if (name == NULL)
150          for (ep = dfirst(); ep != NULL; ep = dnext()) {

Diff Legend

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