--- ray/src/common/otypes.c 1990/01/05 09:16:40 1.3 +++ ray/src/common/otypes.c 2003/02/22 02:07:22 2.2 @@ -1,15 +1,69 @@ -/* Copyright (c) 1986 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: otypes.c,v 2.2 2003/02/22 02:07:22 greg Exp $"; #endif - /* - * otypes.c - object lookup functions. + * Object type lookup and error reporting * - * 7/29/85 + * External symbols declared in object.h */ +/* ==================================================================== + * The Radiance Software License, Version 1.0 + * + * Copyright (c) 1990 - 2002 The Regents of the University of California, + * through Lawrence Berkeley National Laboratory. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes Radiance software + * (http://radsite.lbl.gov/) + * developed by the Lawrence Berkeley National Laboratory + * (http://www.lbl.gov/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Radiance," "Lawrence Berkeley National Laboratory" + * and "The Regents of the University of California" must + * not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact radiance@radsite.lbl.gov. + * + * 5. Products derived from this software may not be called "Radiance", + * nor may "Radiance" appear in their name, without prior written + * permission of Lawrence Berkeley National Laboratory. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of Lawrence Berkeley National Laboratory. For more + * information on Lawrence Berkeley National Laboratory, please see + * . + */ + #include "standard.h" #include "object.h" @@ -17,14 +71,6 @@ static char SCCSid[] = "$SunId$ LBL"; #include "otypes.h" -FUN ofun[NUMOTYPE] = INIT_OTYPE; /* our object function table */ - -static struct ohtab { - int hsiz; /* current table size */ - OBJECT *htab; /* table, if allocated */ -} modtab = {100, NULL}, objtab = {1000, NULL}; /* modifiers and objects */ - - int otype(ofname) /* get object function number from its name */ register char *ofname; @@ -39,46 +85,7 @@ register char *ofname; } -#ifdef GETOBJ -int -object(oname) /* get an object number from its name */ -char *oname; -{ - register int ndx; - - ndx = otndx(oname, &objtab); - return(objtab.htab[ndx]); -} -#endif - - -int -modifier(mname) /* get a modifier number from its name */ -char *mname; -{ - register int ndx; - - ndx = otndx(mname, &modtab); - return(modtab.htab[ndx]); -} - - -insertobject(obj) /* insert new object into our list */ -register OBJECT obj; -{ - register int ndx; - -#ifdef GETOBJ - ndx = otndx(objptr(obj)->oname, &objtab); - objtab.htab[ndx] = obj; -#endif - if (ismodifier(objptr(obj)->otype)) { - ndx = otndx(objptr(obj)->oname, &modtab); - modtab.htab[ndx] = obj; - } -} - - +void objerror(o, etyp, msg) /* report error related to object */ OBJREC *o; int etyp; @@ -89,73 +96,4 @@ char *msg; sprintf(msgbuf, "%s for %s \"%s\"", msg, ofun[o->otype].funame, o->oname); error(etyp, msgbuf); -} - - -static int -nexthsiz(oldsiz) /* return next hash table size */ -int oldsiz; -{ - static int hsiztab[] = { - 251, 509, 1021, 2039, 4093, 8191, 16381, 0 - }; - register int *hsp; - - for (hsp = hsiztab; *hsp; hsp++) - if (*hsp > oldsiz) - return(*hsp); - return(oldsiz*2 + 1); /* not always prime */ -} - - -static int -shash(s) /* hash a string */ -register char *s; -{ - 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; - - if (tab->htab == NULL) { /* new table */ - tab->hsiz = nexthsiz(tab->hsiz); - tab->htab = (OBJECT *)malloc(tab->hsiz*sizeof(OBJECT)); - if (tab->htab == NULL) - error(SYSTEM, "out of memory in otndx"); - ndx = tab->hsiz; - while (ndx--) /* empty it */ - tab->htab[ndx] = OVOID; - } - /* look up object */ - hval = shash(name); -tryagain: - for (i = 0; i < tab->hsiz; i++) { - ndx = (hval + i*i) % tab->hsiz; - if (tab->htab[ndx] == OVOID || - !strcmp(objptr(tab->htab[ndx])->oname, name)) - return(ndx); - } - /* table is full, reallocate */ - oldhtab = tab->htab; - ndx = tab->hsiz; - tab->htab = NULL; - while (ndx--) - if (oldhtab[ndx] != OVOID) { - i = otndx(objptr(oldhtab[ndx])->oname, tab); - tab->htab[i] = oldhtab[ndx]; - } - free((char *)oldhtab); - goto tryagain; /* should happen only once! */ }