| 248 |
|
progname, fname, typ); |
| 249 |
|
exit(1); |
| 250 |
|
} |
| 251 |
< |
if (issurface(fn)) |
| 251 |
> |
if (ismodifier(fn)) |
| 252 |
> |
printf("\n%s %s ", nam, typ); |
| 253 |
> |
else |
| 254 |
|
printf("\n%s %s ", newmod != NULL ? newmod : nam, |
| 255 |
|
invert ? ofun[tinvers[fn]].funame : typ); |
| 254 |
– |
else |
| 255 |
– |
printf("\n%s %s ", nam, typ); |
| 256 |
|
/* object name */ |
| 257 |
|
fgetword(nam, sizeof(nam), fin); |
| 258 |
< |
if (idprefix != NULL && issurface(fn)) |
| 259 |
< |
printf("%s.%s\n", idprefix, nam); |
| 260 |
< |
else |
| 258 |
> |
if (idprefix == NULL || ismodifier(fn)) |
| 259 |
|
printf("%s\n", nam); |
| 260 |
+ |
else |
| 261 |
+ |
printf("%s.%s\n", idprefix, nam); |
| 262 |
|
/* transform arguments */ |
| 263 |
|
if ((*ofun[fn].funp)(fin) < 0) { |
| 264 |
|
fprintf(stderr, "%s: (%s): bad %s \"%s\"\n", |
| 304 |
|
FILE *fin; |
| 305 |
|
{ |
| 306 |
|
register int i; |
| 307 |
+ |
int resetarr = 0; |
| 308 |
|
FUNARGS fa; |
| 309 |
|
|
| 310 |
|
if (readfargs(&fa, fin) != 1) |
| 311 |
|
return(-1); |
| 312 |
|
/* string arguments */ |
| 313 |
< |
printf("%d", fa.nsargs + xac-xfa); |
| 313 |
> |
if (xac > xfa && strcmp(xav[xfa], "-i")) |
| 314 |
> |
resetarr = 2; |
| 315 |
> |
printf("%d", fa.nsargs + resetarr + xac-xfa); |
| 316 |
|
for (i = 0; i < fa.nsargs; i++) |
| 317 |
|
printf(" %s", fa.sarg[i]); |
| 318 |
+ |
if (resetarr) |
| 319 |
+ |
printf(" -i 1"); |
| 320 |
|
for (i = xfa; i < xac; i++) /* add xf arguments */ |
| 321 |
|
printf(" %s", xav[i]); |
| 322 |
|
printf("\n"); |
