--- ray/src/cv/mgflib/parser.c	1995/03/10 15:16:07	1.14
+++ ray/src/cv/mgflib/parser.c	1997/03/18 11:17:24	1.24
@@ -1,4 +1,4 @@
-/* Copyright (c) 1994 Regents of the University of California */
+/* Copyright (c) 1996 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -27,6 +27,12 @@ char	mg_ename[MG_NENTITIES][MG_MAXELEN] = MG_NAMELIST;
 
 int	(*mg_ehand[MG_NENTITIES])();
 
+			/* Handler routine for unknown entities */
+
+int	(*mg_uhand)() = mg_defuhand;
+
+unsigned	mg_nunknown;	/* count of unknown entities */
+
 			/* error messages */
 
 char	*mg_err[MG_NERRS] = MG_ERRLIST;
@@ -57,16 +63,9 @@ int	mg_nqcdivs = MG_NQCD;	/* number of divisions per q
 
 static int	e_any_toss(),		/* discard unneeded entity */
 		e_ies(),		/* IES luminaire file */
-		e_include(),		/* include file */
-		e_sph(),		/* sphere */
 		e_cct(),		/* color temperature */
 		e_cmix(),		/* color mixtures */
-		e_cspec(),		/* color spectra */
-		e_cyl(),		/* cylinder */
-		e_cone(),		/* cone */
-		e_prism(),		/* prism */
-		e_ring(),		/* ring */
-		e_torus();		/* torus */
+		e_cspec();		/* color spectra */
 
 				/* alternate handler support functions */
 
@@ -89,82 +88,87 @@ mg_init()			/* initialize alternate entity handlers */
 		mg_ehand[MG_E_INCLUDE] = e_include;
 	if (mg_ehand[MG_E_SPH] == NULL) {
 		mg_ehand[MG_E_SPH] = e_sph;
-		ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
+		ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
 	} else
-		uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
+		uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
 	if (mg_ehand[MG_E_CYL] == NULL) {
 		mg_ehand[MG_E_CYL] = e_cyl;
-		ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
+		ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
 	} else
-		uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
+		uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
 	if (mg_ehand[MG_E_CONE] == NULL) {
 		mg_ehand[MG_E_CONE] = e_cone;
-		ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
+		ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
 	} else
-		uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
+		uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
 	if (mg_ehand[MG_E_RING] == NULL) {
 		mg_ehand[MG_E_RING] = e_ring;
-		ineed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX;
+		ineed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX;
 	} else
-		uneed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX|1<<MG_E_XF;
+		uneed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX|1L<<MG_E_XF;
 	if (mg_ehand[MG_E_PRISM] == NULL) {
 		mg_ehand[MG_E_PRISM] = e_prism;
-		ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
+		ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
 	} else
-		uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
+		uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
 	if (mg_ehand[MG_E_TORUS] == NULL) {
 		mg_ehand[MG_E_TORUS] = e_torus;
-		ineed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX;
+		ineed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX;
 	} else
-		uneed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX|1<<MG_E_XF;
+		uneed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX|1L<<MG_E_XF;
+	if (mg_ehand[MG_E_FACE] == NULL)
+		mg_ehand[MG_E_FACE] = mg_ehand[MG_E_FACEH];
+	else if (mg_ehand[MG_E_FACEH] == NULL)
+		mg_ehand[MG_E_FACEH] = e_faceh;
 	if (mg_ehand[MG_E_COLOR] != NULL) {
 		if (mg_ehand[MG_E_CMIX] == NULL) {
 			mg_ehand[MG_E_CMIX] = e_cmix;
-			ineed |= 1<<MG_E_COLOR|1<<MG_E_CXY|1<<MG_E_CSPEC|1<<MG_E_CMIX|1<<MG_E_CCT;
+			ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
 		}
 		if (mg_ehand[MG_E_CSPEC] == NULL) {
 			mg_ehand[MG_E_CSPEC] = e_cspec;
-			ineed |= 1<<MG_E_COLOR|1<<MG_E_CXY|1<<MG_E_CSPEC|1<<MG_E_CMIX|1<<MG_E_CCT;
+			ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
 		}
 		if (mg_ehand[MG_E_CCT] == NULL) {
 			mg_ehand[MG_E_CCT] = e_cct;
-			ineed |= 1<<MG_E_COLOR|1<<MG_E_CXY|1<<MG_E_CSPEC|1<<MG_E_CMIX|1<<MG_E_CCT;
+			ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
 		}
 	}
 					/* check for consistency */
 	if (mg_ehand[MG_E_FACE] != NULL)
-		uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
+		uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
 	if (mg_ehand[MG_E_CXY] != NULL || mg_ehand[MG_E_CSPEC] != NULL ||
 			mg_ehand[MG_E_CMIX] != NULL)
-		uneed |= 1<<MG_E_COLOR;
+		uneed |= 1L<<MG_E_COLOR;
 	if (mg_ehand[MG_E_RD] != NULL || mg_ehand[MG_E_TD] != NULL ||
+			mg_ehand[MG_E_IR] != NULL ||
 			mg_ehand[MG_E_ED] != NULL || 
 			mg_ehand[MG_E_RS] != NULL ||
 			mg_ehand[MG_E_TS] != NULL ||
 			mg_ehand[MG_E_SIDES] != NULL)
-		uneed |= 1<<MG_E_MATERIAL;
+		uneed |= 1L<<MG_E_MATERIAL;
 	for (i = 0; i < MG_NENTITIES; i++)
-		if (uneed & 1<<i && mg_ehand[i] == NULL) {
+		if (uneed & 1L<<i && mg_ehand[i] == NULL) {
 			fprintf(stderr, "Missing support for \"%s\" entity\n",
 					mg_ename[i]);
 			exit(1);
 		}
 					/* add support as needed */
-	if (ineed & 1<<MG_E_VERTEX && mg_ehand[MG_E_VERTEX] != c_hvertex)
+	if (ineed & 1L<<MG_E_VERTEX && mg_ehand[MG_E_VERTEX] != c_hvertex)
 		e_supp[MG_E_VERTEX] = c_hvertex;
-	if (ineed & 1<<MG_E_POINT && mg_ehand[MG_E_POINT] != c_hvertex)
+	if (ineed & 1L<<MG_E_POINT && mg_ehand[MG_E_POINT] != c_hvertex)
 		e_supp[MG_E_POINT] = c_hvertex;
-	if (ineed & 1<<MG_E_NORMAL && mg_ehand[MG_E_NORMAL] != c_hvertex)
+	if (ineed & 1L<<MG_E_NORMAL && mg_ehand[MG_E_NORMAL] != c_hvertex)
 		e_supp[MG_E_NORMAL] = c_hvertex;
-	if (ineed & 1<<MG_E_COLOR && mg_ehand[MG_E_COLOR] != c_hcolor)
+	if (ineed & 1L<<MG_E_COLOR && mg_ehand[MG_E_COLOR] != c_hcolor)
 		e_supp[MG_E_COLOR] = c_hcolor;
-	if (ineed & 1<<MG_E_CXY && mg_ehand[MG_E_CXY] != c_hcolor)
+	if (ineed & 1L<<MG_E_CXY && mg_ehand[MG_E_CXY] != c_hcolor)
 		e_supp[MG_E_CXY] = c_hcolor;
-	if (ineed & 1<<MG_E_CSPEC && mg_ehand[MG_E_CSPEC] != c_hcolor)
+	if (ineed & 1L<<MG_E_CSPEC && mg_ehand[MG_E_CSPEC] != c_hcolor)
 		e_supp[MG_E_CSPEC] = c_hcolor;
-	if (ineed & 1<<MG_E_CMIX && mg_ehand[MG_E_CMIX] != c_hcolor)
+	if (ineed & 1L<<MG_E_CMIX && mg_ehand[MG_E_CMIX] != c_hcolor)
 		e_supp[MG_E_CMIX] = c_hcolor;
-	if (ineed & 1<<MG_E_CCT && mg_ehand[MG_E_CCT] != c_hcolor)
+	if (ineed & 1L<<MG_E_CCT && mg_ehand[MG_E_CCT] != c_hcolor)
 		e_supp[MG_E_CCT] = c_hcolor;
 					/* discard remaining entities */
 	for (i = 0; i < MG_NENTITIES; i++)
@@ -202,13 +206,16 @@ char	**av;
 {
 	int	rv;
 
-	if (en < 0 && (en = mg_entity(av[0])) < 0)
+	if (en < 0 && (en = mg_entity(av[0])) < 0) {	/* unknown entity */
+		if (mg_uhand != NULL)
+			return((*mg_uhand)(ac, av));
 		return(MG_EUNK);
-	if (e_supp[en] != NULL) {
+	}
+	if (e_supp[en] != NULL) {			/* support handler */
 		if ((rv = (*e_supp[en])(ac, av)) != MG_OK)
 			return(rv);
 	}
-	return((*mg_ehand[en])(ac, av));
+	return((*mg_ehand[en])(ac, av));		/* assigned handler */
 }
 
 
@@ -218,7 +225,6 @@ register MG_FCTXT	*ctx;
 char	*fn;
 {
 	static int	nfids;
-	int	olen;
 	register char	*cp;
 
 	ctx->fid = ++nfids;
@@ -231,14 +237,11 @@ char	*fn;
 		return(MG_OK);
 	}
 					/* get name relative to this context */
-	if (mg_file != NULL &&
-			(cp = strrchr(mg_file->fname, '/')) != NULL)
-		olen = cp - mg_file->fname + 1;
-	else
-		olen = 0;
-	if (olen)
+	if (mg_file != NULL && (cp = strrchr(mg_file->fname, '/')) != NULL) {
 		strcpy(ctx->fname, mg_file->fname);
-	strcpy(ctx->fname+olen, fn);
+		strcpy(ctx->fname+(cp-mg_file->fname+1), fn);
+	} else
+		strcpy(ctx->fname, fn);
 	ctx->fp = fopen(ctx->fname, "r");
 	if (ctx->fp == NULL)
 		return(MG_ENOFILE);
@@ -254,9 +257,8 @@ mg_close()			/* close input file */
 	register MG_FCTXT	*ctx = mg_file;
 
 	mg_file = ctx->prev;		/* restore enclosing context */
-	if (ctx->fp == stdin)
-		return;			/* don't close standard input */
-	fclose(ctx->fp);
+	if (ctx->fp != stdin)		/* close file if it's a file */
+		fclose(ctx->fp);
 }
 
 
@@ -298,11 +300,11 @@ mg_read()			/* read next line from file */
 		if (fgets(mg_file->inpline+len,
 				MG_MAXLINE-len, mg_file->fp) == NULL)
 			return(len);
-		mg_file->lineno++;
 		len += strlen(mg_file->inpline+len);
-		if (len > 1 && mg_file->inpline[len-2] == '\\')
-			mg_file->inpline[--len-1] = ' ';
-	} while (mg_file->inpline[len]);
+		if (len >= MG_MAXLINE-1)
+			return(len);
+		mg_file->lineno++;
+	} while (len > 1 && mg_file->inpline[len-2] == '\\');
 
 	return(len);
 }
@@ -314,10 +316,13 @@ mg_parse()			/* parse current input line */
 	char	abuf[MG_MAXLINE];
 	char	*argv[MG_MAXARGC];
 	int	en;
-	register char	*cp, **ap;
-
-	strcpy(cp=abuf, mg_file->inpline);
-	ap = argv;			/* break into words */
+	register char	*cp, *cp2, **ap;
+					/* copy line, removing escape chars */
+	cp = abuf; cp2 = mg_file->inpline;
+	while ((*cp++ = *cp2++))
+		if (cp2[0] == '\n' && cp2[-1] == '\\')
+			cp--;
+	cp = abuf; ap = argv;		/* break into words */
 	for ( ; ; ) {
 		while (isspace(*cp))
 			*cp++ = '\0';
@@ -343,28 +348,48 @@ char	*fn;
 {
 	MG_FCTXT	cntxt;
 	int	rval;
+	register int	nbr;
 
 	if ((rval = mg_open(&cntxt, fn)) != MG_OK) {
 		fprintf(stderr, "%s: %s\n", fn, mg_err[rval]);
 		return(rval);
 	}
-	while (mg_read())		/* parse each line */
+	while ((nbr = mg_read()) > 0) {	/* parse each line */
+		if (nbr >= MG_MAXLINE-1) {
+			fprintf(stderr, "%s: %d: %s\n", cntxt.fname,
+					cntxt.lineno, mg_err[rval=MG_ELINE]);
+			break;
+		}
 		if ((rval = mg_parse()) != MG_OK) {
 			fprintf(stderr, "%s: %d: %s:\n%s", cntxt.fname,
 					cntxt.lineno, mg_err[rval],
 					cntxt.inpline);
 			break;
 		}
+	}
 	mg_close();
 	return(rval);
 }
 
 
+int
+mg_defuhand(ac, av)		/* default handler for unknown entities */
+int	ac;
+char	**av;
+{
+	if (mg_nunknown++ == 0)		/* report first incident */
+		fprintf(stderr, "%s: %d: %s: %s\n", mg_file->fname,
+				mg_file->lineno, mg_err[MG_EUNK], av[0]);
+	return(MG_OK);
+}
+
+
 void
 mg_clear()			/* clear parser history */
 {
 	c_clearall();			/* clear context tables */
-	mg_file = NULL;			/* reset our context */
+	while (mg_file != NULL)		/* reset our file context */
+		mg_close();
 }
 
 
@@ -382,14 +407,15 @@ char	**av;
 }
 
 
-static int
+int
 e_include(ac, av)		/* include file */
 int	ac;
 char	**av;
 {
 	char	*xfarg[MG_MAXARGC];
 	MG_FCTXT	ictx;
-	int	rv;
+	XF_SPEC	*xf_orig = xf_context;
+	register int	rv;
 
 	if (ac < 2)
 		return(MG_EARGC);
@@ -402,11 +428,19 @@ char	**av;
 		for (i = 1; i < ac-1; i++)
 			xfarg[i] = av[i+1];
 		xfarg[ac-1] = NULL;
-		if ((rv = mg_handle(MG_E_XF, ac-1, xfarg)) != MG_OK)
+		if ((rv = mg_handle(MG_E_XF, ac-1, xfarg)) != MG_OK) {
+			mg_close();
 			return(rv);
+		}
 	}
-	while (!feof(mg_file->fp)) {
-		while (mg_read())
+	do {
+		while ((rv = mg_read()) > 0) {
+			if (rv >= MG_MAXLINE-1) {
+				fprintf(stderr, "%s: %d: %s\n", ictx.fname,
+						ictx.lineno, mg_err[MG_ELINE]);
+				mg_close();
+				return(MG_EINCL);
+			}
 			if ((rv = mg_parse()) != MG_OK) {
 				fprintf(stderr, "%s: %d: %s:\n%s", ictx.fname,
 						ictx.lineno, mg_err[rv],
@@ -414,15 +448,50 @@ char	**av;
 				mg_close();
 				return(MG_EINCL);
 			}
+		}
 		if (ac > 2)
-			if ((rv = mg_handle(MG_E_XF, 1, xfarg)) != MG_OK)
+			if ((rv = mg_handle(MG_E_XF, 1, xfarg)) != MG_OK) {
+				mg_close();
 				return(rv);
-	}
+			}
+	} while (xf_context != xf_orig);
 	mg_close();
 	return(MG_OK);
 }
 
 
+int
+e_faceh(ac, av)			/* replace face+holes with single contour */
+int	ac;
+char	**av;
+{
+	char	*newav[MG_MAXARGC];
+	int	lastp = 0;
+	register int	i, j;
+
+	newav[0] = mg_ename[MG_E_FACE];
+	for (i = 1; i < ac; i++)
+		if (av[i][0] == '-') {
+			if (i < 4)
+				return(MG_EARGC);
+			if (i >= ac-1)
+				break;
+			if (!lastp)
+				lastp = i-1;
+			for (j = i+1; j < ac-1 && av[j+1][0] != '-'; j++)
+				;
+			if (j - i < 3)
+				return(MG_EARGC);
+			newav[i] = av[j];	/* connect hole loop */
+		} else
+			newav[i] = av[i];	/* hole or perimeter vertex */
+	if (lastp)
+		newav[i++] = av[lastp];		/* finish seam to outside */
+	newav[i] = NULL;
+	return(mg_handle(MG_E_FACE, i, newav));
+}
+
+
 static void
 make_axes(u, v, w)		/* compute u and v given w (normalized) */
 FVECT	u, v, w;
@@ -440,7 +509,7 @@ FVECT	u, v, w;
 }
 
 
-static int
+int
 e_sph(ac, av)			/* expand a sphere into cones */
 int	ac;
 char	**av;
@@ -492,7 +561,7 @@ char	**av;
 }
 
 
-static int
+int
 e_torus(ac, av)			/* expand a torus into cones */
 int	ac;
 char	**av;
@@ -584,7 +653,7 @@ char	**av;
 }
 
 
-static int
+int
 e_cyl(ac, av)			/* replace a cylinder with equivalent cone */
 int	ac;
 char	**av;
@@ -601,7 +670,7 @@ char	**av;
 }
 
 
-static int
+int
 e_ring(ac, av)			/* turn a ring into polygons */
 int	ac;
 char	**av;
@@ -699,7 +768,7 @@ char	**av;
 }
 
 
-static int
+int
 e_cone(ac, av)			/* turn a cone into polygons */
 int	ac;
 char	**av;
@@ -714,6 +783,7 @@ char	**av;
 	static char	*p4ent[5] = {mg_ename[MG_E_POINT],p4[0],p4[1],p4[2]};
 	static char	*n4ent[5] = {mg_ename[MG_E_NORMAL],n4[0],n4[1],n4[2]};
 	static char	*fent[6] = {mg_ename[MG_E_FACE],"_cv1","_cv2","_cv3","_cv4"};
+	char	*v1n;
 	register C_VERTEX	*cv1, *cv2;
 	register int	i, j;
 	FVECT	u, v, w;
@@ -729,6 +799,7 @@ char	**av;
 	if ((cv1 = c_getvert(av[1])) == NULL ||
 			(cv2 = c_getvert(av[3])) == NULL)
 		return(MG_EUNDEF);
+	v1n = av[1];
 	if (!isflt(av[2]) || !isflt(av[4]))
 		return(MG_ETYPE);
 	rad1 = atof(av[2]);
@@ -747,6 +818,7 @@ char	**av;
 		cv = cv1;
 		cv1 = cv2;
 		cv2 = cv;
+		v1n = av[3];
 		d = rad1;
 		rad1 = rad2;
 		rad2 = d;
@@ -780,7 +852,7 @@ char	**av;
 	if ((rv = mg_handle(MG_E_NORMAL, 4, n3ent)) != MG_OK)
 		return(rv);
 	if (rad1 == 0.) {		/* triangles */
-		v1ent[3] = av[1];
+		v1ent[3] = v1n;
 		if ((rv = mg_handle(MG_E_VERTEX, 4, v1ent)) != MG_OK)
 			return(rv);
 		for (j = 0; j < 3; j++)
@@ -866,7 +938,7 @@ char	**av;
 }
 
 
-static int
+int
 e_prism(ac, av)			/* turn a prism into polygons */
 int	ac;
 char	**av;
@@ -978,13 +1050,10 @@ put_cxy()			/* put out current xy chromaticities */
 {
 	static char	xbuf[24], ybuf[24];
 	static char	*ccom[4] = {mg_ename[MG_E_CXY], xbuf, ybuf};
-	int	rv;
 
 	sprintf(xbuf, "%.4f", c_ccolor->cx);
 	sprintf(ybuf, "%.4f", c_ccolor->cy);
-	if ((rv = mg_handle(MG_E_CXY, 3, ccom)) != MG_OK)
-		return(rv);
-	return(MG_OK);
+	return(mg_handle(MG_E_CXY, 3, ccom));
 }