--- ray/src/common/modobject.c	1991/11/12 16:56:08	2.1
+++ ray/src/common/modobject.c	2013/12/08 18:59:53	2.14
@@ -1,13 +1,14 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: modobject.c,v 2.14 2013/12/08 18:59:53 greg Exp $";
 #endif
-
 /*
  *  Routines for tracking object modifiers
+ *
+ *  External symbols declared in object.h
  */
 
+#include "copyright.h"
+
 #include  "standard.h"
 
 #include  "object.h"
@@ -15,22 +16,71 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  "otypes.h"
 
 
-extern int  (*addobjnotify[])();	/* people to notify of new objects */
-
 static struct ohtab {
 	int  hsiz;			/* current table size */
 	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(				/* get object number from pointer */
+	OBJREC  *op
+)
+{
+	int  i, j;
+
+	for (i = nobjects>>OBJBLKSHFT; i >= 0; i--) {
+		j = op - objblock[i];
+		if ((j >= 0) & (j < OBJBLKSIZ))
+			return((i<<OBJBLKSHFT) + j);
+	}
+	return(OVOID);
+}
+
+
+OBJECT
+lastmod(			/* find modifier definition before obj */
+	OBJECT  obj,
+	char  *mname
+)
+{
+	OBJREC  *op;
+	int  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))
+			return(i);
+	}
+	return(OVOID);
+}
+
+
+OBJECT
+modifier(			/* get a modifier number from its name */
+	char  *mname
+)
+{
+	int  ndx;
+
+	ndx = otndx(mname, &modtab);
+	return(modtab.htab[ndx]);
+}
+
+
 #ifdef  GETOBJ
-int
-object(oname)			/* get an object number from its name */
-char  *oname;
+OBJECT
+object(				/* get an object number from its name */
+	char  *oname
+)
 {
-	register int  ndx;
+	int  ndx;
 
 	ndx = otndx(oname, &objtab);
 	return(objtab.htab[ndx]);
@@ -38,43 +88,109 @@ char  *oname;
 #endif
 
 
+static 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
-modifier(mname)			/* get a modifier number from its name */
-char  *mname;
+eqobjects(			/* check if two objects are equal */
+	OBJECT	obj1,
+	OBJECT	obj2
+)
 {
-	register int  ndx;
+	OBJREC	*op1, *op2;
+	int	i;
 
-	ndx = otndx(mname, &modtab);
-	return(modtab.htab[ndx]);
+	if (obj1 == OVOID)
+		return(obj2 == OVOID);
+	if (obj2 == OVOID)
+		return(0);
+	op1 = objptr(obj1);
+	op2 = objptr(obj2);
+	if (op1->omod != op2->omod)
+		return(0);
+	if (op1->otype != op2->otype)
+		return(0);
+	if (strcmp(op1->oname, op2->oname))
+		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);
+	return(1);
 }
 
 
-insertobject(obj)		/* insert new object into our list */
-register OBJECT  obj;
+void
+insertobject(			/* insert new object into our list */
+	OBJECT  obj
+)
 {
-	register int  i;
+	int  i;
 
-#ifdef  GETOBJ
-	i = otndx(objptr(obj)->oname, &objtab);
-	objtab.htab[i] = obj;
-#endif
 	if (ismodifier(objptr(obj)->otype)) {
 		i = otndx(objptr(obj)->oname, &modtab);
+		if (eqobjects(obj, modtab.htab[i]))
+			return;
 		modtab.htab[i] = obj;
 	}
+#ifdef  GETOBJ
+	else {
+		i = otndx(objptr(obj)->oname, &objtab);
+		objtab.htab[i] = obj;
+	}
+#endif
 	for (i = 0; addobjnotify[i] != NULL; i++)
 		(*addobjnotify[i])(obj);
 }
 
 
+void
+clearobjndx(void)		/* clear object hash tables */
+{
+	if (modtab.htab != NULL) {
+		free((void *)modtab.htab);
+		modtab.htab = NULL;
+		modtab.hsiz = 100;
+	}
+	if (objtab.htab != NULL) {
+		free((void *)objtab.htab);
+		objtab.htab = NULL;
+		objtab.hsiz = 100;
+	}
+}
+
+
 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)
@@ -84,25 +200,14 @@ int  oldsiz;
 
 
 static int
-shash(s)			/* hash a string */
-register char  *s;
+otndx(				/* get object table index for name */
+	char  *name,
+	struct ohtab  *tab
+)
 {
-	register int  h = 0;
-
-	while (*s)
-		h = (h<<1 & 0x7fff) ^ *s++;
-	return(h);
-}
-
-
-static int
-otndx(name, tab)		/* get object table index for name */
-char  *name;
-register struct ohtab  *tab;
-{
 	OBJECT  *oldhtab;
 	int  hval, i;
-	register int  ndx;
+	int  ndx;
 
 	if (tab->htab == NULL) {		/* new table */
 		tab->hsiz = nexthsiz(tab->hsiz);
@@ -117,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);
@@ -131,6 +236,6 @@ tryagain:
 			i = otndx(objptr(oldhtab[ndx])->oname, tab);
 			tab->htab[i] = oldhtab[ndx];
 		}
-	free((char *)oldhtab);
+	free((void *)oldhtab);
 	goto tryagain;			/* should happen only once! */
 }