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

Comparing ray/src/cv/mgflib/parser.c (file contents):
Revision 1.16 by greg, Tue Apr 18 15:53:26 1995 UTC vs.
Revision 1.18 by greg, Thu May 11 20:17:33 1995 UTC

# Line 27 | Line 27 | char   mg_ename[MG_NENTITIES][MG_MAXELEN] = MG_NAMELIST;
27  
28   int     (*mg_ehand[MG_NENTITIES])();
29  
30 +                        /* Handler routine for unknown entities */
31 +
32 + int     (*mg_uhand)() = mg_defuhand;
33 +
34 + unsigned        mg_nunknown;    /* count of unknown entities */
35 +
36                          /* error messages */
37  
38   char    *mg_err[MG_NERRS] = MG_ERRLIST;
# Line 89 | Line 95 | mg_init()                      /* initialize alternate entity handlers */
95                  mg_ehand[MG_E_INCLUDE] = e_include;
96          if (mg_ehand[MG_E_SPH] == NULL) {
97                  mg_ehand[MG_E_SPH] = e_sph;
98 <                ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
98 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
99          } else
100 <                uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
100 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
101          if (mg_ehand[MG_E_CYL] == NULL) {
102                  mg_ehand[MG_E_CYL] = e_cyl;
103 <                ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
103 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
104          } else
105 <                uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
105 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
106          if (mg_ehand[MG_E_CONE] == NULL) {
107                  mg_ehand[MG_E_CONE] = e_cone;
108 <                ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
108 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
109          } else
110 <                uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
110 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
111          if (mg_ehand[MG_E_RING] == NULL) {
112                  mg_ehand[MG_E_RING] = e_ring;
113 <                ineed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX;
113 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX;
114          } else
115 <                uneed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX|1<<MG_E_XF;
115 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX|1L<<MG_E_XF;
116          if (mg_ehand[MG_E_PRISM] == NULL) {
117                  mg_ehand[MG_E_PRISM] = e_prism;
118 <                ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
118 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
119          } else
120 <                uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
120 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
121          if (mg_ehand[MG_E_TORUS] == NULL) {
122                  mg_ehand[MG_E_TORUS] = e_torus;
123 <                ineed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX;
123 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX;
124          } else
125 <                uneed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX|1<<MG_E_XF;
125 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX|1L<<MG_E_XF;
126          if (mg_ehand[MG_E_COLOR] != NULL) {
127                  if (mg_ehand[MG_E_CMIX] == NULL) {
128                          mg_ehand[MG_E_CMIX] = e_cmix;
129 <                        ineed |= 1<<MG_E_COLOR|1<<MG_E_CXY|1<<MG_E_CSPEC|1<<MG_E_CMIX|1<<MG_E_CCT;
129 >                        ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
130                  }
131                  if (mg_ehand[MG_E_CSPEC] == NULL) {
132                          mg_ehand[MG_E_CSPEC] = e_cspec;
133 <                        ineed |= 1<<MG_E_COLOR|1<<MG_E_CXY|1<<MG_E_CSPEC|1<<MG_E_CMIX|1<<MG_E_CCT;
133 >                        ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
134                  }
135                  if (mg_ehand[MG_E_CCT] == NULL) {
136                          mg_ehand[MG_E_CCT] = e_cct;
137 <                        ineed |= 1<<MG_E_COLOR|1<<MG_E_CXY|1<<MG_E_CSPEC|1<<MG_E_CMIX|1<<MG_E_CCT;
137 >                        ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
138                  }
139          }
140                                          /* check for consistency */
141          if (mg_ehand[MG_E_FACE] != NULL)
142 <                uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
142 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
143          if (mg_ehand[MG_E_CXY] != NULL || mg_ehand[MG_E_CSPEC] != NULL ||
144                          mg_ehand[MG_E_CMIX] != NULL)
145 <                uneed |= 1<<MG_E_COLOR;
145 >                uneed |= 1L<<MG_E_COLOR;
146          if (mg_ehand[MG_E_RD] != NULL || mg_ehand[MG_E_TD] != NULL ||
147                          mg_ehand[MG_E_IR] != NULL ||
148                          mg_ehand[MG_E_ED] != NULL ||
149                          mg_ehand[MG_E_RS] != NULL ||
150                          mg_ehand[MG_E_TS] != NULL ||
151                          mg_ehand[MG_E_SIDES] != NULL)
152 <                uneed |= 1<<MG_E_MATERIAL;
152 >                uneed |= 1L<<MG_E_MATERIAL;
153          for (i = 0; i < MG_NENTITIES; i++)
154 <                if (uneed & 1<<i && mg_ehand[i] == NULL) {
154 >                if (uneed & 1L<<i && mg_ehand[i] == NULL) {
155                          fprintf(stderr, "Missing support for \"%s\" entity\n",
156                                          mg_ename[i]);
157                          exit(1);
158                  }
159                                          /* add support as needed */
160 <        if (ineed & 1<<MG_E_VERTEX && mg_ehand[MG_E_VERTEX] != c_hvertex)
160 >        if (ineed & 1L<<MG_E_VERTEX && mg_ehand[MG_E_VERTEX] != c_hvertex)
161                  e_supp[MG_E_VERTEX] = c_hvertex;
162 <        if (ineed & 1<<MG_E_POINT && mg_ehand[MG_E_POINT] != c_hvertex)
162 >        if (ineed & 1L<<MG_E_POINT && mg_ehand[MG_E_POINT] != c_hvertex)
163                  e_supp[MG_E_POINT] = c_hvertex;
164 <        if (ineed & 1<<MG_E_NORMAL && mg_ehand[MG_E_NORMAL] != c_hvertex)
164 >        if (ineed & 1L<<MG_E_NORMAL && mg_ehand[MG_E_NORMAL] != c_hvertex)
165                  e_supp[MG_E_NORMAL] = c_hvertex;
166 <        if (ineed & 1<<MG_E_COLOR && mg_ehand[MG_E_COLOR] != c_hcolor)
166 >        if (ineed & 1L<<MG_E_COLOR && mg_ehand[MG_E_COLOR] != c_hcolor)
167                  e_supp[MG_E_COLOR] = c_hcolor;
168 <        if (ineed & 1<<MG_E_CXY && mg_ehand[MG_E_CXY] != c_hcolor)
168 >        if (ineed & 1L<<MG_E_CXY && mg_ehand[MG_E_CXY] != c_hcolor)
169                  e_supp[MG_E_CXY] = c_hcolor;
170 <        if (ineed & 1<<MG_E_CSPEC && mg_ehand[MG_E_CSPEC] != c_hcolor)
170 >        if (ineed & 1L<<MG_E_CSPEC && mg_ehand[MG_E_CSPEC] != c_hcolor)
171                  e_supp[MG_E_CSPEC] = c_hcolor;
172 <        if (ineed & 1<<MG_E_CMIX && mg_ehand[MG_E_CMIX] != c_hcolor)
172 >        if (ineed & 1L<<MG_E_CMIX && mg_ehand[MG_E_CMIX] != c_hcolor)
173                  e_supp[MG_E_CMIX] = c_hcolor;
174 <        if (ineed & 1<<MG_E_CCT && mg_ehand[MG_E_CCT] != c_hcolor)
174 >        if (ineed & 1L<<MG_E_CCT && mg_ehand[MG_E_CCT] != c_hcolor)
175                  e_supp[MG_E_CCT] = c_hcolor;
176                                          /* discard remaining entities */
177          for (i = 0; i < MG_NENTITIES; i++)
# Line 203 | Line 209 | char   **av;
209   {
210          int     rv;
211  
212 <        if (en < 0 && (en = mg_entity(av[0])) < 0)
212 >        if (en < 0 && (en = mg_entity(av[0])) < 0) {    /* unknown entity */
213 >                if (mg_uhand != NULL)
214 >                        return((*mg_uhand)(ac, av));
215                  return(MG_EUNK);
216 <        if (e_supp[en] != NULL) {
216 >        }
217 >        if (e_supp[en] != NULL) {                       /* support handler */
218                  if ((rv = (*e_supp[en])(ac, av)) != MG_OK)
219                          return(rv);
220          }
221 <        return((*mg_ehand[en])(ac, av));
221 >        return((*mg_ehand[en])(ac, av));                /* assigned handler */
222   }
223  
224  
# Line 354 | Line 363 | char   *fn;
363                  }
364          mg_close();
365          return(rval);
366 + }
367 +
368 +
369 + int
370 + mg_defuhand(ac, av)             /* default handler for unknown entities */
371 + int     ac;
372 + char    **av;
373 + {
374 +        if (mg_nunknown++ == 0)         /* report first incident */
375 +                fprintf(stderr, "%s: %d: %s: %s\n", mg_file->fname,
376 +                                mg_file->lineno, mg_err[MG_EUNK], av[0]);
377 +        return(MG_OK);
378   }
379  
380  

Diff Legend

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