--- ray/src/common/readobj.c	2003/02/22 02:07:22	2.8
+++ ray/src/common/readobj.c	2003/03/11 19:29:04	2.11
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: readobj.c,v 2.8 2003/02/22 02:07:22 greg Exp $";
+static const char RCSid[] = "$Id: readobj.c,v 2.11 2003/03/11 19:29:04 greg Exp $";
 #endif
 /*
  *  readobj.c - routines for reading in object descriptions.
@@ -7,62 +7,7 @@ static const char	RCSid[] = "$Id: readobj.c,v 2.8 2003
  *  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
- * <http://www.lbl.gov/>.
- */
+#include "copyright.h"
 
 #include  "standard.h"
 
@@ -128,6 +73,7 @@ getobject(name, fp)			/* read the next object */
 char  *name;
 FILE  *fp;
 {
+#define	OALIAS	-2
 	OBJECT  obj;
 	char  sbuf[MAXSTR];
 	int  rval;
@@ -141,6 +87,8 @@ FILE  *fp;
 	fgetword(sbuf, MAXSTR, fp);
 	if (!strcmp(sbuf, VOIDID))
 		objp->omod = OVOID;
+	else if (!strcmp(sbuf, ALIASMOD))
+		objp->omod = OALIAS;
 	else if ((objp->omod = modifier(sbuf)) == OVOID) {
 		sprintf(errmsg, "(%s): undefined modifier \"%s\"", name, sbuf);
 		error(USER, errmsg);
@@ -148,9 +96,7 @@ FILE  *fp;
 					/* get type */
 	strcpy(sbuf, "EOF");
 	fgetword(sbuf, MAXSTR, fp);
-	if (!strcmp(sbuf, ALIASID))
-		objp->otype = -1;
-	else if ((objp->otype = otype(sbuf)) < 0) {
+	if ((objp->otype = otype(sbuf)) < 0) {
 		sprintf(errmsg, "(%s): unknown type \"%s\"", name, sbuf);
 		error(USER, errmsg);
 	}
@@ -159,18 +105,25 @@ FILE  *fp;
 	fgetword(sbuf, MAXSTR, fp);
 	objp->oname = savqstr(sbuf);
 					/* get arguments */
-	if (objp->otype == -1) {
+	if (objp->otype == MOD_ALIAS) {
 		register OBJECT  alias;
 		strcpy(sbuf, "EOF");
 		fgetword(sbuf, MAXSTR, fp);
 		if ((alias = modifier(sbuf)) == OVOID) {
-			sprintf(errmsg,
-			"(%s): bad reference \"%s\" for %s \"%s\"",
-					name, sbuf, ALIASID, objp->oname);
-			error(USER, errmsg);
+			sprintf(errmsg, "(%s): bad reference \"%s\"",
+					name, sbuf);
+			objerror(objp, USER, errmsg);
 		}
-		objp->otype = objptr(alias)->otype;
-		copystruct(&objp->oargs, &objptr(alias)->oargs);
+		if (objp->omod == OALIAS || 
+				objp->omod == objptr(alias)->omod) {
+			objp->omod = alias;
+		} else {
+			objp->oargs.sarg = (char **)malloc(sizeof(char *));
+			if (objp->oargs.sarg == NULL)
+				error(SYSTEM, "out of memory in getobject");
+			objp->oargs.nsargs = 1;
+			objp->oargs.sarg[0] = savestr(sbuf);
+		}
 	} else if ((rval = readfargs(&objp->oargs, fp)) == 0) {
 		sprintf(errmsg, "(%s): bad arguments", name);
 		objerror(objp, USER, errmsg);
@@ -178,14 +131,20 @@ FILE  *fp;
 		sprintf(errmsg, "(%s): error reading scene", name);
 		error(SYSTEM, errmsg);
 	}
+	if (objp->omod == OALIAS) {
+		sprintf(errmsg, "(%s): inappropriate use of '%s' modifier",
+				name, ALIASMOD);
+		objerror(objp, USER, errmsg);
+	}
 					/* initialize */
 	objp->os = NULL;
 
 	insertobject(obj);		/* add to global structure */
+#undef OALIAS
 }
 
 
-int
+OBJECT
 newobject()				/* get a new object */
 {
 	register int  i;