--- ray/src/common/modobject.c	2013/12/08 19:25:36	2.15
+++ ray/src/common/modobject.c	2024/12/06 20:54:23	2.22
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: modobject.c,v 2.15 2013/12/08 19:25:36 greg Exp $";
+static const char RCSid[] = "$Id: modobject.c,v 2.22 2024/12/06 20:54:23 greg Exp $";
 #endif
 /*
  *  Routines for tracking object modifiers
@@ -17,8 +17,8 @@ static const char RCSid[] = "$Id: modobject.c,v 2.15 2
 
 
 static struct ohtab {
-	int  hsiz;			/* current table size */
-	OBJECT  *htab;			/* table, if allocated */
+	int	hsiz;			/* current table size */
+	OBJECT	*htab;			/* table, if allocated */
 }  modtab = {100, NULL}, objtab = {1000, NULL};	/* modifiers and objects */
 
 static int  otndx(char *, struct ohtab *);
@@ -29,14 +29,15 @@ objndx(				/* get object number from pointer */
 	OBJREC  *op
 )
 {
-	int  i, j;
+	int	i;
+	ssize_t	j;
 
-	for (i = nobjects>>OBJBLKSHFT; i >= 0; i--) {
+	for (i = (nobjects-1)>>OBJBLKSHFT; i >= 0; i--) {
 		j = op - objblock[i];
-		if ((j >= 0) & (j < OBJBLKSIZ))
-			return((i<<OBJBLKSHFT) + j);
+		if ((0 <= j) & (j < OBJBLKSIZ))
+			return(((OBJECT)i<<OBJBLKSHFT) + (OBJECT)j);
 	}
-	return(OVOID);
+	return(OVOID);		/* not in our array -- may still be valid */
 }
 
 
@@ -47,15 +48,15 @@ lastmod(			/* find modifier definition before obj */
 )
 {
 	OBJREC  *op;
-	int  i;
+	OBJECT  i;
 
 	i = modifier(mname);		/* try hash table first */
 	if ((obj == OVOID) | (i < obj))
 		return(i);
 	for (i = obj; i-- > 0; ) {	/* need to search */
 		op = objptr(i);
-		if (ismodifier(op->otype) && op->oname[0] == mname[0] &&
-					!strcmp(op->oname, mname))
+		if ((ismodifier(op->otype) != 0) & (op->oname[0] == mname[0])
+				&& !strcmp(op->oname, mname))
 			return(i);
 	}
 	return(OVOID);
@@ -107,7 +108,7 @@ eqobjects(			/* check if two objects are equal */
 )
 {
 	OBJREC	*op1, *op2;
-	int	i;
+	int	i, n;
 
 	while (obj1 != obj2) {
 		if (obj1 == OVOID)
@@ -132,9 +133,31 @@ eqobjects(			/* check if two objects are equal */
 		for (i = op1->oargs.nfargs; i-- > 0; )
 			if (!eqreal(op1->oargs.farg[i], op2->oargs.farg[i]))
 				return(0);
-		for (i = op1->oargs.nsargs; i-- > 0; )
+		n = 0;
+		switch (op1->otype) {	/* special cases (KEEP CONSISTENT!) */
+		case MOD_ALIAS:
+		case MAT_ILLUM:
+		case MAT_MIRROR:
+			n = (op1->oargs.nsargs > 0);
+			break;
+		case MIX_FUNC:
+		case MIX_DATA:
+		case MIX_TEXT:
+		case MIX_PICT:
+			n = 2*(op1->oargs.nsargs >= 2);
+			break;
+		case MAT_CLIP:
+			n = op1->oargs.nsargs;
+			break;
+		}
+					/* check other string arguments */
+		for (i = op1->oargs.nsargs; i-- > n; )
 			if (strcmp(op1->oargs.sarg[i], op2->oargs.sarg[i]))
 				return(0);
+		while (n-- > 0)		/* check modifier references */
+			if (!eqobjects( lastmod(obj1, op1->oargs.sarg[n]),
+					lastmod(obj2, op2->oargs.sarg[n]) ))
+				return(0);
 		obj1 = op1->omod;
 		obj2 = op2->omod;
 	}
@@ -152,7 +175,7 @@ insertobject(			/* insert new object into our list */
 	if (ismodifier(objptr(obj)->otype)) {
 		i = otndx(objptr(obj)->oname, &modtab);
 		if (eqobjects(obj, modtab.htab[i]))
-			return;
+			return;	/* don't index if same as earlier def. */
 		modtab.htab[i] = obj;
 	}
 #ifdef  GETOBJ
@@ -167,18 +190,30 @@ insertobject(			/* insert new object into our list */
 
 
 void
-clearobjndx(void)		/* clear object hash tables */
+truncobjndx(void)		/* remove bogus table entries past end */
 {
-	if (modtab.htab != NULL) {
-		free((void *)modtab.htab);
-		modtab.htab = NULL;
-		modtab.hsiz = 100;
+	int	ndx;
+
+	if (nobjects <= 0) {
+		if (modtab.htab != NULL) {
+			free(modtab.htab);
+			modtab.htab = NULL;
+			modtab.hsiz = 100;
+		}
+		if (objtab.htab != NULL) {
+			free(objtab.htab);
+			objtab.htab = NULL;
+			objtab.hsiz = 100;
+		}
+		return;
 	}
-	if (objtab.htab != NULL) {
-		free((void *)objtab.htab);
-		objtab.htab = NULL;
-		objtab.hsiz = 100;
-	}
+	for (ndx = modtab.hsiz*(modtab.htab != NULL); ndx--; )
+		if (modtab.htab[ndx] >= nobjects)
+			modtab.htab[ndx] = OVOID;
+
+	for (ndx = objtab.hsiz*(objtab.htab != NULL); ndx--; )
+		if (objtab.htab[ndx] >= nobjects)
+			objtab.htab[ndx] = OVOID;
 }
 
 
@@ -188,7 +223,8 @@ nexthsiz(			/* return next hash table size */
 )
 {
 	static int  hsiztab[] = {
-		251, 509, 1021, 2039, 4093, 8191, 16381, 0
+		251, 509, 1021, 2039, 4093, 8191, 16381,
+		32749, 65521, 131071, 262139, 0
 	};
 	int  *hsp;
 
@@ -205,6 +241,7 @@ otndx(				/* get object table index for name */
 	struct ohtab  *tab
 )
 {
+	char	*onm;
 	OBJECT  *oldhtab;
 	int  hval, i;
 	int  ndx;
@@ -223,9 +260,11 @@ otndx(				/* get object table index for name */
 tryagain:
 	for (i = 0; i < tab->hsiz; i++) {
 		ndx = (hval + (unsigned long)i*i) % tab->hsiz;
-		if (tab->htab[ndx] == OVOID ||
-				!strcmp(objptr(tab->htab[ndx])->oname, name))
+		if (tab->htab[ndx] == OVOID)
 			return(ndx);
+		onm = objptr(tab->htab[ndx])->oname;
+		if (onm != NULL && !strcmp(onm, name))
+			return(ndx);
 	}
 					/* table is full, reallocate */
 	oldhtab = tab->htab;
@@ -233,9 +272,12 @@ tryagain:
 	tab->htab = NULL;
 	while (ndx--)
 		if (oldhtab[ndx] != OVOID) {
-			i = otndx(objptr(oldhtab[ndx])->oname, tab);
+			onm = objptr(oldhtab[ndx])->oname;
+			if (onm == NULL)
+				continue;
+			i = otndx(onm, tab);
 			tab->htab[i] = oldhtab[ndx];
 		}
-	free((void *)oldhtab);
+	free(oldhtab);
 	goto tryagain;			/* should happen only once! */
 }