--- ray/src/common/caldefn.c	1989/02/02 10:34:26	1.1
+++ ray/src/common/caldefn.c	1990/07/19 13:09:22	1.6
@@ -16,6 +16,8 @@ static char SCCSid[] = "$SunId$ LBL";
  *  1/15/88  Added clock for caching of variable values.
  *
  *  11/16/88  Added VARDEF structure for hard linking.
+ *
+ *  5/31/90  Added conditional compile (REDEFW) for redefinition warning.
  */
 
 #include  <stdio.h>
@@ -32,7 +34,7 @@ static char SCCSid[] = "$SunId$ LBL";
 
 extern char  *ecalloc(), *savestr();
 
-extern double  dvalue();
+static double  dvalue();
 
 long  eclock = -1;			/* value storage timer */
 
@@ -66,7 +68,7 @@ char  *fname;
 	eputs(": cannot open\n");
 	quit(1);
     }
-    initfile(fname, fp);
+    initfile(fp, fname, 0);
     while (nextc != EOF)
 	loaddefn();
     if (fname != NULL)
@@ -74,11 +76,12 @@ char  *fname;
 }
 
 
-scompile(file, str)		/* get definitions from a string */
-char  *file;
+scompile(str, fn, ln)		/* get definitions from a string */
 char  *str;
+char  *fn;
+int  ln;
 {
-    initstr(file, str);
+    initstr(str, fn, ln);
     while (nextc != EOF)
 	loaddefn();
 }
@@ -112,7 +115,6 @@ double  val;
 	ep2 = ep1->v.kid->sibling;
 	if (ep2->type == NUM) {
 	    ep2->v.num = val;
-	    ep2->sibling->v.tick = -1;
 	    return;
 	}
     }
@@ -127,13 +129,6 @@ double  val;
     ep2->type = NUM;
     ep2->v.num = val;
     addekid(ep1, ep2);
-    ep2 = newnode();
-    ep2->type = TICK;
-    ep2->v.tick = -1;
-    addekid(ep1, ep2);
-    ep2 = newnode();
-    ep2->type = NUM;
-    addekid(ep1, ep2);
     dclear(vname);
     dpush(ep1);
 }
@@ -159,12 +154,13 @@ char  *name;
 
 
 #ifdef  OUTCHAN
-chanout()			/* set output channels */
+chanout(cs)			/* set output channels */
+int  (*cs)();
 {
     register EPNODE  *ep;
 
     for (ep = outchan; ep != NULL; ep = ep->sibling)
-	chanset(ep->v.kid->v.chan, evalue(ep->v.kid->sibling));
+	(*cs)(ep->v.kid->v.chan, evalue(ep->v.kid->sibling));
 
 }
 #endif
@@ -370,7 +366,15 @@ loaddefn()			/* load next definition */
 #endif
     {				/* ordinary definition */
 	ep = getdefn();
+#ifdef  REDEFW
+	if (dlookup(dname(ep)) != NULL) {
+		dclear(dname(ep));
+		wputs(dname(ep));
+		wputs(": redefined\n");
+	}
+#else
 	dclear(dname(ep));
+#endif
 	dpush(ep);
     }
     if (nextc != EOF) {
@@ -490,13 +494,15 @@ EPNODE  *d;
 	quit(1);
     }
     ep1 = d->v.kid->sibling;			/* get expression */
+    if (ep1->type == NUM)
+	return(ep1->v.num);			/* return if number */
     ep2 = ep1->sibling;				/* check time */
     if (ep2->v.tick < 0 || ep2->v.tick < eclock) {
 	ep2->v.tick = eclock;
 	ep2 = ep2->sibling;
-	ep2->v.num = evalue(ep1);		/* compute new value */
+	ep2->v.num = evalue(ep1);		/* needs new value */
     } else
-	ep2 = ep2->sibling;			/* reuse old value */
+	ep2 = ep2->sibling;			/* else reuse old value */
 
     return(ep2->v.num);
 }