--- ray/src/common/caldefn.c	1993/04/08 16:41:21	2.6
+++ ray/src/common/caldefn.c	2003/07/21 22:30:17	2.19
@@ -1,9 +1,6 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: caldefn.c,v 2.19 2003/07/21 22:30:17 schorsch Exp $";
 #endif
-
 /*
  *  Store variable definitions.
  *
@@ -22,12 +19,19 @@ static char SCCSid[] = "$SunId$ LBL";
  *  4/23/91  Added ':' assignment for constant expressions
  *
  *  8/7/91  Added optional context path to append to variable names
+ *
+ *  5/17/2001  Fixed clock counter wrapping behavior
+ *
+ *  2/19/03	Eliminated conditional compiles in favor of esupport extern.
  */
 
-#include  <stdio.h>
+#include "copyright.h"
 
+#include  <stdio.h>
+#include  <string.h>
 #include  <ctype.h>
 
+#include  "rterror.h"
 #include  "calcomp.h"
 
 #ifndef	 NHASH
@@ -38,34 +42,32 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #define	 newnode()	(EPNODE *)ecalloc(1, sizeof(EPNODE))
 
-extern char  *ecalloc(), *emalloc(), *savestr(), *strcpy();
+static double  dvalue(char  *name, EPNODE *d);
 
-static double  dvalue();
+#define  MAXCLOCK	(1L<<31)	/* clock wrap value */
 
-long  eclock = -1;			/* value storage timer */
+unsigned long  eclock = 0;		/* value storage timer */
 
-static char  context[MAXWORD+1];	/* current context path */
+#define  MAXCNTX	1023		/* maximum context length */
 
+static char  context[MAXCNTX+1];	/* current context path */
+
 static VARDEF  *hashtbl[NHASH];		/* definition list */
 static int  htndx;			/* index for */		
 static VARDEF  *htpos;			/* ...dfirst() and */
-#ifdef	OUTCHAN
 static EPNODE  *ochpos;			/* ...dnext */
 static EPNODE  *outchan;
-#endif
 
-#ifdef	FUNCTION
-EPNODE	*curfunc;
+EPNODE	*curfunc = NULL;
 #define	 dname(ep)	((ep)->v.kid->type == SYM ? \
 			(ep)->v.kid->v.name : \
 			(ep)->v.kid->v.kid->v.name)
-#else
-#define	 dname(ep)	((ep)->v.kid->v.name)
-#endif
 
 
-fcompile(fname)			/* get definitions from a file */
-char  *fname;
+void
+fcompile(			/* get definitions from a file */
+	char  *fname
+)
 {
     FILE  *fp;
 
@@ -84,10 +86,12 @@ char  *fname;
 }
 
 
-scompile(str, fn, ln)		/* get definitions from a string */
-char  *str;
-char  *fn;
-int  ln;
+void
+scompile(		/* get definitions from a string */
+	char  *str,
+	char  *fn,
+	int  ln
+)
 {
     initstr(str, fn, ln);
     while (nextc != EOF)
@@ -96,16 +100,18 @@ int  ln;
 
 
 double
-varvalue(vname)			/* return a variable's value */
-char  *vname;
+varvalue(			/* return a variable's value */
+	char  *vname
+)
 {
     return(dvalue(vname, dlookup(vname)));
 }
 
 
 double
-evariable(ep)			/* evaluate a variable */
-EPNODE	*ep;
+evariable(			/* evaluate a variable */
+	EPNODE	*ep
+)
 {
     register VARDEF  *dp = ep->v.ln;
 
@@ -113,10 +119,12 @@ EPNODE	*ep;
 }
 
 
-varset(vname, assign, val)	/* set a variable's value */
-char  *vname;
-int  assign;
-double	val;
+void
+varset(		/* set a variable's value */
+	char  *vname,
+	int  assign,
+	double	val
+)
 {
     char  *qname;
     register EPNODE  *ep1, *ep2;
@@ -147,8 +155,10 @@ double	val;
 }
 
 
-dclear(name)			/* delete variable definitions of name */
-char  *name;
+void
+dclear(			/* delete variable definitions of name */
+	char  *name
+)
 {
     register EPNODE  *ep;
 
@@ -162,8 +172,10 @@ char  *name;
 }
 
 
-dremove(name)			/* delete all definitions of name */
-char  *name;
+void
+dremove(			/* delete all definitions of name */
+	char  *name
+)
 {
     register EPNODE  *ep;
 
@@ -172,8 +184,10 @@ char  *name;
 }
 
 
-vardefined(name)	/* return non-zero if variable defined */
-char  *name;
+int
+vardefined(	/* return non-zero if variable defined */
+	char  *name
+)
 {
     register EPNODE  *dp;
 
@@ -182,8 +196,9 @@ char  *name;
 
 
 char *
-setcontext(ctx)			/* set a new context path */
-register char  *ctx;
+setcontext(			/* set a new context path */
+	register char  *ctx
+)
 {
     register char  *cpp;
 
@@ -198,7 +213,7 @@ register char  *ctx;
     cpp = context;			/* start context with mark */
     *cpp++ = CNTXMARK;
     do {				/* carefully copy new context */
-	if (cpp >= context+MAXWORD)
+	if (cpp >= context+MAXCNTX)
 	    break;			/* just copy what we can */
 	if (isid(*ctx))
 	    *cpp++ = *ctx++;
@@ -214,19 +229,19 @@ register char  *ctx;
 
 
 char *
-pushcontext(ctx)		/* push on another context */
-char  *ctx;
+pushcontext(		/* push on another context */
+	char  *ctx
+)
 {
-    extern char  *strncpy(), *strcpy();
-    char  oldcontext[MAXWORD+1];
+    char  oldcontext[MAXCNTX+1];
     register int  n;
 
     strcpy(oldcontext, context);	/* save old context */
     setcontext(ctx);			/* set new context */
     n = strlen(context);		/* tack on old */
-    if (n+strlen(oldcontext) > MAXWORD) {
-	strncpy(context+n, oldcontext, MAXWORD-n);
-	context[MAXWORD] = '\0';
+    if (n+strlen(oldcontext) > MAXCNTX) {
+	strncpy(context+n, oldcontext, MAXCNTX-n);
+	context[MAXCNTX] = '\0';
     } else
 	strcpy(context+n, oldcontext);
     return(context);
@@ -234,7 +249,7 @@ char  *ctx;
 
 
 char *
-popcontext()			/* pop off top context */
+popcontext(void)			/* pop off top context */
 {
     register char  *cp1, *cp2;
 
@@ -251,11 +266,12 @@ popcontext()			/* pop off top context */
 
 
 char *
-qualname(nam, lvl)		/* get qualified name */
-register char  *nam;
-int  lvl;
+qualname(		/* get qualified name */
+	register char  *nam,
+	int  lvl
+)
 {
-    static char	 nambuf[MAXWORD+1];
+    static char	 nambuf[RMAXWORD+1];
     register char  *cp = nambuf, *cpp;
 				/* check for explicit local */
     if (*nam == CNTXMARK)
@@ -267,7 +283,7 @@ int  lvl;
 	return(lvl > 0 ? NULL : nam);
 				/* copy name to static buffer */
     while (*nam) {
-	if (cp >= nambuf+MAXWORD)
+	if (cp >= nambuf+RMAXWORD)
 		goto toolong;
 	*cp++ = *nam++;
     }
@@ -286,7 +302,7 @@ int  lvl;
 	    ;
     }
     while (*cpp) {		/* copy context to static buffer */
-	if (cp >= nambuf+MAXWORD)
+	if (cp >= nambuf+RMAXWORD)
 	    goto toolong;
 	*cp++ = *cpp++;
     }
@@ -296,18 +312,23 @@ toolong:
 }
 
 
-incontext(qn)			/* is qualified name in current context? */
-register char  *qn;
+int
+incontext(			/* is qualified name in current context? */
+	register char  *qn
+)
 {
+    if (!context[0])			/* global context accepts all */
+	return(1);
     while (*qn && *qn != CNTXMARK)	/* find context mark */
 	qn++;
     return(!strcmp(qn, context));
 }
 
 
-#ifdef	OUTCHAN
-chanout(cs)			/* set output channels */
-int  (*cs)();
+void
+chanout(			/* set output channels */
+	void  (*cs)(int n, double v)
+)
 {
     register EPNODE  *ep;
 
@@ -315,11 +336,12 @@ int  (*cs)();
 	(*cs)(ep->v.kid->v.chan, evalue(ep->v.kid->sibling));
 
 }
-#endif
 
 
-dcleanup(lvl)		/* clear definitions (0->vars,1->output,2->consts) */
-int  lvl;
+void
+dcleanup(		/* clear definitions (0->vars,1->output,2->consts) */
+	int  lvl
+)
 {
     register int  i;
     register VARDEF  *vp;
@@ -327,24 +349,24 @@ int  lvl;
 				/* if context is global, clear all */
     for (i = 0; i < NHASH; i++)
 	for (vp = hashtbl[i]; vp != NULL; vp = vp->next)
-	    if (!context[0] || incontext(vp->name))
+	    if (incontext(vp->name)) {
 		if (lvl >= 2)
 		    dremove(vp->name);
 		else
 		    dclear(vp->name);
-#ifdef	OUTCHAN
+	    }
     if (lvl >= 1) {
 	for (ep = outchan; ep != NULL; ep = ep->sibling)
 	    epfree(ep);
 	outchan = NULL;
     }
-#endif
 }
 
 
 EPNODE *
-dlookup(name)			/* look up a definition */
-char  *name;
+dlookup(			/* look up a definition */
+	char  *name
+)
 {
     register VARDEF  *vp;
     
@@ -355,8 +377,9 @@ char  *name;
 
 
 VARDEF *
-varlookup(name)			/* look up a variable */
-char  *name;
+varlookup(			/* look up a variable */
+	char  *name
+)
 {
     int	 lvl = 0;
     register char  *qname;
@@ -371,8 +394,9 @@ char  *name;
 
 
 VARDEF *
-varinsert(name)			/* get a link to a variable */
-char  *name;
+varinsert(			/* get a link to a variable */
+	char  *name
+)
 {
     register VARDEF  *vp;
     int	 hv;
@@ -382,11 +406,7 @@ char  *name;
 	return(vp);
     }
     vp = (VARDEF *)emalloc(sizeof(VARDEF));
-#ifdef	FUNCTION
     vp->lib = liblookup(name);
-#else
-    vp->lib = NULL;
-#endif
     if (vp->lib == NULL)		/* if name not in library */
 	name = qualname(name, 0);	/* use fully qualified version */
     hv = hash(name);
@@ -399,9 +419,10 @@ char  *name;
 }
 
 
-#ifdef	FUNCTION
-libupdate(fn)			/* update library links */
-char  *fn;
+void
+libupdate(			/* update library links */
+	char  *fn
+)
 {
     register int  i;
     register VARDEF  *vp;
@@ -411,11 +432,12 @@ char  *fn;
 	    if (vp->lib != NULL || fn == NULL || !strcmp(fn, vp->name))
 		vp->lib = liblookup(vp->name);
 }
-#endif
 
 
-varfree(ln)				/* release link to variable */
-register VARDEF	 *ln;
+void
+varfree(				/* release link to variable */
+	register VARDEF	 *ln
+)
 {
     register VARDEF  *vp;
     int	 hv;
@@ -438,19 +460,17 @@ register VARDEF	 *ln;
 
 
 EPNODE *
-dfirst()			/* return pointer to first definition */
+dfirst(void)			/* return pointer to first definition */
 {
     htndx = 0;
     htpos = NULL;
-#ifdef	OUTCHAN
     ochpos = outchan;
-#endif
     return(dnext());
 }
 
 
 EPNODE *
-dnext()				/* return pointer to next definition */
+dnext(void)				/* return pointer to next definition */
 {
     register EPNODE  *ep;
     register char  *nm;
@@ -466,19 +486,16 @@ dnext()				/* return pointer to next definition */
 		return(ep);
 	}
     }
-#ifdef	OUTCHAN
     if ((ep = ochpos) != NULL)
 	ochpos = ep->sibling;
     return(ep);
-#else
-    return(NULL);
-#endif
 }
 
 
 EPNODE *
-dpop(name)			/* pop a definition */
-char  *name;
+dpop(			/* pop a definition */
+	char  *name
+)
 {
     register VARDEF  *vp;
     register EPNODE  *dp;
@@ -492,9 +509,11 @@ char  *name;
 }
 
 
-dpush(nm, ep)			/* push on a definition */
-char  *nm;
-register EPNODE	 *ep;
+void
+dpush(			/* push on a definition */
+	char  *nm,
+	register EPNODE	 *ep
+)
 {
     register VARDEF  *vp;
 
@@ -504,9 +523,10 @@ register EPNODE	 *ep;
 }
 
 
-#ifdef	OUTCHAN
-addchan(sp)			/* add an output channel assignment */
-EPNODE	*sp;
+void
+addchan(			/* add an output channel assignment */
+	EPNODE	*sp
+)
 {
     int	 ch = sp->v.kid->v.chan;
     register EPNODE  *ep, *epl;
@@ -532,10 +552,10 @@ EPNODE	*sp;
     sp->sibling = NULL;
 
 }
-#endif
 
 
-getstatement()			/* get next statement */
+void
+getstatement(void)			/* get next statement */
 {
     register EPNODE  *ep;
     char  *qname;
@@ -545,31 +565,25 @@ getstatement()			/* get next statement */
 	scan();
 	return;
     }
-#ifdef	OUTCHAN
-    if (nextc == '$') {		/* channel assignment */
+    if (esupport&E_OUTCHAN &&
+		nextc == '$') {		/* channel assignment */
 	ep = getchan();
 	addchan(ep);
-    } else
-#endif
-    {				/* ordinary definition */
+    } else {				/* ordinary definition */
 	ep = getdefn();
 	qname = qualname(dname(ep), 0);
-#ifdef	REDEFW
-	if ((vdef = varlookup(qname)) != NULL)
-	    if (vdef->def != NULL) {
+	if (esupport&E_REDEFW && (vdef = varlookup(qname)) != NULL) {
+	    if (vdef->def != NULL && epcmp(ep, vdef->def)) {
 		wputs(qname);
 		if (vdef->def->type == ':')
 		    wputs(": redefined constant expression\n");
 		else
 		    wputs(": redefined\n");
-	    }
-#ifdef	FUNCTION
-	    else if (ep->v.kid->type == FUNC && vdef->lib != NULL) {
+	    } else if (ep->v.kid->type == FUNC && vdef->lib != NULL) {
 		wputs(qname);
 		wputs(": definition hides library function\n");
 	    }
-#endif
-#endif
+	}
 	if (ep->type == ':')
 	    dremove(qname);
 	else
@@ -585,10 +599,11 @@ getstatement()			/* get next statement */
 
 
 EPNODE *
-getdefn()			/* A -> SYM = E1 */
-				/*	SYM : E1 */
-				/*	FUNC(SYM,..) = E1 */
-				/*	FUNC(SYM,..) : E1 */
+getdefn(void)
+	/* A -> SYM = E1 */
+	/*	SYM : E1 */
+	/*	FUNC(SYM,..) = E1 */
+	/*	FUNC(SYM,..) : E1 */
 {
     register EPNODE  *ep1, *ep2;
 
@@ -599,8 +614,7 @@ getdefn()			/* A -> SYM = E1 */
     ep1->type = SYM;
     ep1->v.name = savestr(getname());
 
-#ifdef	FUNCTION
-    if (nextc == '(') {
+    if (esupport&E_FUNCTION && nextc == '(') {
 	ep2 = newnode();
 	ep2->type = FUNC;
 	addekid(ep2, ep1);
@@ -618,9 +632,7 @@ getdefn()			/* A -> SYM = E1 */
 	    syntax("')' expected");
 	scan();
 	curfunc = ep1;
-    } else
-	curfunc = NULL;
-#endif
+    }
 
     if (nextc != '=' && nextc != ':')
 	syntax("'=' or ':' expected");
@@ -631,27 +643,23 @@ getdefn()			/* A -> SYM = E1 */
     addekid(ep2, ep1);
     addekid(ep2, getE1());
 
-    if (
-#ifdef	FUNCTION
-	    ep1->type == SYM &&
-#endif
-	    ep1->sibling->type != NUM) {
+    if (ep1->type == SYM && ep1->sibling->type != NUM) {
 	ep1 = newnode();
 	ep1->type = TICK;
-	ep1->v.tick = -1;
+	ep1->v.tick = 0;
 	addekid(ep2, ep1);
 	ep1 = newnode();
 	ep1->type = NUM;
 	addekid(ep2, ep1);
     }
+    curfunc = NULL;
 
     return(ep2);
 }
 
 
-#ifdef	OUTCHAN
 EPNODE *
-getchan()			/* A -> $N = E1 */
+getchan(void)			/* A -> $N = E1 */
 {
     register EPNODE  *ep1, *ep2;
 
@@ -674,7 +682,6 @@ getchan()			/* A -> $N = E1 */
 
     return(ep2);
 }
-#endif
 
 
 
@@ -683,10 +690,8 @@ getchan()			/* A -> $N = E1 */
  */
 
 
-static double
-dvalue(name, d)			/* evaluate a variable */
-char  *name;
-EPNODE	*d;
+static double			/* evaluate a variable */
+dvalue(char  *name, EPNODE	*d)
 {
     register EPNODE  *ep1, *ep2;
     
@@ -699,8 +704,11 @@ EPNODE	*d;
     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 = d->type == ':' ? 1L<<30 : eclock;
+    if (eclock >= MAXCLOCK)
+	eclock = 1;				/* wrap clock counter */
+    if (ep2->v.tick < MAXCLOCK &&
+		ep2->v.tick == 0 | ep2->v.tick != eclock) {
+	ep2->v.tick = d->type == ':' ? MAXCLOCK : eclock;
 	ep2 = ep2->sibling;
 	ep2->v.num = evalue(ep1);		/* needs new value */
     } else