--- ray/src/common/modobject.c	2003/03/10 17:13:29	2.9
+++ ray/src/common/modobject.c	2013/12/08 19:25:36	2.15
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: modobject.c,v 2.9 2003/03/10 17:13:29 greg Exp $";
+static const char RCSid[] = "$Id: modobject.c,v 2.15 2013/12/08 19:25:36 greg Exp $";
 #endif
 /*
  *  Routines for tracking object modifiers
@@ -21,18 +21,19 @@ static struct ohtab {
 	OBJECT  *htab;			/* table, if allocated */
 }  modtab = {100, NULL}, objtab = {1000, NULL};	/* modifiers and objects */
 
-static int  otndx();
+static int  otndx(char *, struct ohtab *);
 
 
 OBJECT
-objndx(op)			/* get object number from pointer */
-register OBJREC  *op;
+objndx(				/* get object number from pointer */
+	OBJREC  *op
+)
 {
-	register int  i, j;
+	int  i, j;
 
 	for (i = nobjects>>OBJBLKSHFT; i >= 0; i--) {
 		j = op - objblock[i];
-		if (j >= 0 && j < OBJBLKSIZ)
+		if ((j >= 0) & (j < OBJBLKSIZ))
 			return((i<<OBJBLKSHFT) + j);
 	}
 	return(OVOID);
@@ -40,19 +41,21 @@ register OBJREC  *op;
 
 
 OBJECT
-lastmod(obj, mname)		/* find modifier definition before obj */
-OBJECT  obj;
-char  *mname;
+lastmod(			/* find modifier definition before obj */
+	OBJECT  obj,
+	char  *mname
+)
 {
-	register OBJREC  *op;
-	register int  i;
+	OBJREC  *op;
+	int  i;
 
 	i = modifier(mname);		/* try hash table first */
-	if (i < obj)
+	if ((obj == OVOID) | (i < obj))
 		return(i);
 	for (i = obj; i-- > 0; ) {	/* need to search */
 		op = objptr(i);
-		if (ismodifier(op->otype) && !strcmp(op->oname, mname))
+		if (ismodifier(op->otype) && op->oname[0] == mname[0] &&
+					!strcmp(op->oname, mname))
 			return(i);
 	}
 	return(OVOID);
@@ -60,10 +63,11 @@ char  *mname;
 
 
 OBJECT
-modifier(mname)			/* get a modifier number from its name */
-char  *mname;
+modifier(			/* get a modifier number from its name */
+	char  *mname
+)
 {
-	register int  ndx;
+	int  ndx;
 
 	ndx = otndx(mname, &modtab);
 	return(modtab.htab[ndx]);
@@ -72,10 +76,11 @@ char  *mname;
 
 #ifdef  GETOBJ
 OBJECT
-object(oname)			/* get an object number from its name */
-char  *oname;
+object(				/* get an object number from its name */
+	char  *oname
+)
 {
-	register int  ndx;
+	int  ndx;
 
 	ndx = otndx(oname, &objtab);
 	return(objtab.htab[ndx]);
@@ -83,14 +88,71 @@ char  *oname;
 #endif
 
 
+int
+eqreal(				/* are two real values close enough to equal? */
+	double	d1,
+	double	d2
+)
+{
+	if (d2 != 0.0)
+		d1 = d1/d2 - 1.0;
+	return((-FTINY <= d1) & (d1 <= FTINY));
+}
+
+
+int
+eqobjects(			/* check if two objects are equal */
+	OBJECT	obj1,
+	OBJECT	obj2
+)
+{
+	OBJREC	*op1, *op2;
+	int	i;
+
+	while (obj1 != obj2) {
+		if (obj1 == OVOID)
+			return(0);
+		if (obj2 == OVOID)
+			return(0);
+		op1 = objptr(obj1);
+		op2 = objptr(obj2);
+		if (op1->otype != op2->otype)
+			return(0);
+		if (op1->oargs.nsargs != op2->oargs.nsargs)
+			return(0);
+		if (op1->oargs.nfargs != op2->oargs.nfargs)
+			return(0);
+#ifdef IARGS
+		if (op1->oargs.niargs != op2->oargs.niargs)
+			return(0);
+		for (i = op1->oargs.niargs; i-- > 0; )
+			if (op1->oargs.iarg[i] != op2->oargs.iarg[i])
+				return(0);
+#endif
+		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; )
+			if (strcmp(op1->oargs.sarg[i], op2->oargs.sarg[i]))
+				return(0);
+		obj1 = op1->omod;
+		obj2 = op2->omod;
+	}
+	return(1);
+}
+
+
 void
-insertobject(obj)		/* insert new object into our list */
-register OBJECT  obj;
+insertobject(			/* insert new object into our list */
+	OBJECT  obj
+)
 {
-	register int  i;
+	int  i;
 
 	if (ismodifier(objptr(obj)->otype)) {
 		i = otndx(objptr(obj)->oname, &modtab);
+		if (eqobjects(obj, modtab.htab[i]))
+			return;
 		modtab.htab[i] = obj;
 	}
 #ifdef  GETOBJ
@@ -105,7 +167,7 @@ register OBJECT  obj;
 
 
 void
-clearobjndx()			/* clear object hash tables */
+clearobjndx(void)		/* clear object hash tables */
 {
 	if (modtab.htab != NULL) {
 		free((void *)modtab.htab);
@@ -121,13 +183,14 @@ clearobjndx()			/* clear object hash tables */
 
 
 static int
-nexthsiz(oldsiz)		/* return next hash table size */
-int  oldsiz;
+nexthsiz(			/* return next hash table size */
+	int  oldsiz
+)
 {
 	static int  hsiztab[] = {
 		251, 509, 1021, 2039, 4093, 8191, 16381, 0
 	};
-	register int  *hsp;
+	int  *hsp;
 
 	for (hsp = hsiztab; *hsp; hsp++)
 		if (*hsp > oldsiz)
@@ -137,13 +200,14 @@ int  oldsiz;
 
 
 static int
-otndx(name, tab)		/* get object table index for name */
-char  *name;
-register struct ohtab  *tab;
+otndx(				/* get object table index for name */
+	char  *name,
+	struct ohtab  *tab
+)
 {
 	OBJECT  *oldhtab;
 	int  hval, i;
-	register int  ndx;
+	int  ndx;
 
 	if (tab->htab == NULL) {		/* new table */
 		tab->hsiz = nexthsiz(tab->hsiz);
@@ -158,7 +222,7 @@ register struct ohtab  *tab;
 	hval = shash(name);
 tryagain:
 	for (i = 0; i < tab->hsiz; i++) {
-		ndx = (hval + i*i) % tab->hsiz;
+		ndx = (hval + (unsigned long)i*i) % tab->hsiz;
 		if (tab->htab[ndx] == OVOID ||
 				!strcmp(objptr(tab->htab[ndx])->oname, name))
 			return(ndx);