39 |
|
|
40 |
|
FUN ofun[NUMTYPES] = INIT_OTYPE; /* default types and actions */ |
41 |
|
|
42 |
< |
extern char *malloc(); |
42 |
> |
extern char *malloc(), *fgetword(); |
43 |
|
|
44 |
|
#define progname (xav[0]) |
45 |
|
|
228 |
|
char typ[16], nam[MAXSTR]; |
229 |
|
int fn; |
230 |
|
/* modifier and type */ |
231 |
< |
fscanf(fin, "%s %s", nam, typ); |
231 |
> |
strcpy(typ, "EOF"); |
232 |
> |
fgetword(nam, sizeof(nam), fin); |
233 |
> |
fgetword(typ, sizeof(typ), fin); |
234 |
|
if ((fn = otype(typ)) < 0) { |
235 |
|
fprintf(stderr, "%s: (%s): unknown object type \"%s\"\n", |
236 |
|
progname, fname, typ); |
238 |
|
} |
239 |
|
printf("\n%s %s ", newmod!=NULL && issurface(fn) ? newmod : nam, typ); |
240 |
|
/* object name */ |
241 |
< |
fscanf(fin, "%s", nam); |
241 |
> |
fgetword(nam, sizeof(nam), fin); |
242 |
|
if (idprefix != NULL && issurface(fn)) |
243 |
|
printf("%s.%s\n", idprefix, nam); |
244 |
|
else |
258 |
|
register int i; |
259 |
|
FUNARGS fa; |
260 |
|
|
261 |
< |
if (readfargs(&fa, fin) <= 0) |
261 |
> |
if (readfargs(&fa, fin) != 1) |
262 |
|
return(-1); |
263 |
|
/* string arguments */ |
264 |
|
printf("%d", fa.nsargs); |
271 |
|
for (i = 0; i < fa.niargs; i++) |
272 |
|
printf(" %d", fa.iarg[i]); |
273 |
|
printf("\n"); |
274 |
+ |
#else |
275 |
+ |
printf("0\n"); |
276 |
|
#endif |
277 |
|
/* float arguments */ |
278 |
|
printf("%d", fa.nfargs); |
290 |
|
register int i; |
291 |
|
FUNARGS fa; |
292 |
|
|
293 |
< |
if (readfargs(&fa, fin) <= 0) |
293 |
> |
if (readfargs(&fa, fin) != 1) |
294 |
|
return(-1); |
295 |
|
/* string arguments */ |
296 |
|
printf("%d", fa.nsargs + xac-xfa); |
305 |
|
for (i = 0; i < fa.niargs; i++) |
306 |
|
printf(" %d", fa.iarg[i]); |
307 |
|
printf("\n"); |
308 |
+ |
#else |
309 |
+ |
printf("0\n"); |
310 |
|
#endif |
311 |
|
/* float arguments */ |
312 |
|
printf("%d", fa.nfargs); |
337 |
|
{ |
338 |
|
char aliasnm[MAXSTR]; |
339 |
|
|
340 |
< |
if (fscanf(fin, "%s", aliasnm) != 1) |
340 |
> |
if (fgetword(aliasnm, MAXSTR, fin) == NULL) |
341 |
|
return(-1); |
342 |
|
printf("\t%s\n", aliasnm); |
343 |
|
return(0); |
349 |
|
{ |
350 |
|
FUNARGS fa; |
351 |
|
|
352 |
< |
if (readfargs(&fa, fin) <= 0) |
352 |
> |
if (readfargs(&fa, fin) != 1) |
353 |
|
return(-1); |
354 |
|
if (fa.nsargs != 0 || fa.nfargs != 4) |
355 |
|
return(-1); |
368 |
|
double v[3]; |
369 |
|
FUNARGS fa; |
370 |
|
|
371 |
< |
if (readfargs(&fa, fin) <= 0) |
371 |
> |
if (readfargs(&fa, fin) != 1) |
372 |
|
return(-1); |
373 |
|
if (fa.nsargs != 0 || fa.nfargs != 7) |
374 |
|
return(-1); |
388 |
|
double pow(); |
389 |
|
FUNARGS fa; |
390 |
|
|
391 |
< |
if (readfargs(&fa, fin) <= 0) |
391 |
> |
if (readfargs(&fa, fin) != 1) |
392 |
|
return(-1); |
393 |
|
if (fa.nsargs != 0 || fa.nfargs != 5) |
394 |
|
return(-1); |
409 |
|
double pow(); |
410 |
|
FUNARGS fa; |
411 |
|
|
412 |
< |
if (readfargs(&fa, fin) <= 0) |
412 |
> |
if (readfargs(&fa, fin) != 1) |
413 |
|
return(-1); |
414 |
|
if (fa.nsargs != 0 || fa.nfargs != 8) |
415 |
|
return(-1); |
436 |
|
double v[3]; |
437 |
|
FUNARGS fa; |
438 |
|
|
439 |
< |
if (readfargs(&fa, fin) <= 0) |
439 |
> |
if (readfargs(&fa, fin) != 1) |
440 |
|
return(-1); |
441 |
|
if (fa.nfargs != 9 && fa.nfargs != 11 && fa.nfargs != 15) |
442 |
|
return(-1); |
474 |
|
double dv[3]; |
475 |
|
FUNARGS fa; |
476 |
|
|
477 |
< |
if (readfargs(&fa, fin) <= 0) |
477 |
> |
if (readfargs(&fa, fin) != 1) |
478 |
|
return(-1); |
479 |
|
if (fa.nsargs != 0 || fa.nfargs != 4) |
480 |
|
return(-1); |
495 |
|
double cent[3], rad; |
496 |
|
FUNARGS fa; |
497 |
|
|
498 |
< |
if (readfargs(&fa, fin) <= 0) |
498 |
> |
if (readfargs(&fa, fin) != 1) |
499 |
|
return(-1); |
500 |
|
if (fa.nsargs != 0 || fa.nfargs != 4) |
501 |
|
return(-1); |
519 |
|
register int i; |
520 |
|
FUNARGS fa; |
521 |
|
|
522 |
< |
if (readfargs(&fa, fin) <= 0) |
522 |
> |
if (readfargs(&fa, fin) != 1) |
523 |
|
return(-1); |
524 |
|
if (fa.nsargs != 0 || fa.nfargs % 3) |
525 |
|
return(-1); |
544 |
|
double p0[3], p1[3], r0, r1; |
545 |
|
FUNARGS fa; |
546 |
|
|
547 |
< |
if (readfargs(&fa, fin) <= 0) |
547 |
> |
if (readfargs(&fa, fin) != 1) |
548 |
|
return(-1); |
549 |
|
if (fa.nsargs != 0 || fa.nfargs != 8) |
550 |
|
return(-1); |
570 |
|
double p0[3], p1[3], rad; |
571 |
|
FUNARGS fa; |
572 |
|
|
573 |
< |
if (readfargs(&fa, fin) <= 0) |
573 |
> |
if (readfargs(&fa, fin) != 1) |
574 |
|
return(-1); |
575 |
|
if (fa.nsargs != 0 || fa.nfargs != 7) |
576 |
|
return(-1); |
594 |
|
double p0[3], pd[3], r0, r1; |
595 |
|
FUNARGS fa; |
596 |
|
|
597 |
< |
if (readfargs(&fa, fin) <= 0) |
597 |
> |
if (readfargs(&fa, fin) != 1) |
598 |
|
return(-1); |
599 |
|
if (fa.nsargs != 0 || fa.nfargs != 8) |
600 |
|
return(-1); |