--- ray/src/common/caldefn.c 1995/02/16 09:49:27 2.7 +++ ray/src/common/caldefn.c 2003/04/27 06:08:03 2.15 @@ -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.15 2003/04/27 06:08:03 greg Exp $"; #endif - /* * Store variable definitions. * @@ -22,10 +19,18 @@ 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 "copyright.h" + #include +#include + #include #include "calcomp.h" @@ -38,32 +43,29 @@ static char SCCSid[] = "$SunId$ LBL"; #define newnode() (EPNODE *)ecalloc(1, sizeof(EPNODE)) -extern char *ecalloc(), *emalloc(), *savestr(), *strcpy(); - static double dvalue(); -long eclock = -1; /* value storage timer */ +#define MAXCLOCK (1L<<31) /* clock wrap value */ -static char context[MAXWORD+1]; /* current context path */ +unsigned long eclock = 0; /* value storage timer */ +#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 +void fcompile(fname) /* get definitions from a file */ char *fname; { @@ -84,6 +86,7 @@ char *fname; } +void scompile(str, fn, ln) /* get definitions from a string */ char *str; char *fn; @@ -113,6 +116,7 @@ EPNODE *ep; } +void varset(vname, assign, val) /* set a variable's value */ char *vname; int assign; @@ -147,6 +151,7 @@ double val; } +void dclear(name) /* delete variable definitions of name */ char *name; { @@ -162,6 +167,7 @@ char *name; } +void dremove(name) /* delete all definitions of name */ char *name; { @@ -172,6 +178,7 @@ char *name; } +int vardefined(name) /* return non-zero if variable defined */ char *name; { @@ -198,7 +205,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++; @@ -217,16 +224,15 @@ char * pushcontext(ctx) /* 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); @@ -296,18 +302,21 @@ toolong: } +int incontext(qn) /* 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 +void chanout(cs) /* set output channels */ -int (*cs)(); +void (*cs)(); { register EPNODE *ep; @@ -315,9 +324,9 @@ int (*cs)(); (*cs)(ep->v.kid->v.chan, evalue(ep->v.kid->sibling)); } -#endif +void dcleanup(lvl) /* clear definitions (0->vars,1->output,2->consts) */ int lvl; { @@ -327,18 +336,16 @@ 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 } @@ -382,11 +389,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,7 +402,7 @@ char *name; } -#ifdef FUNCTION +void libupdate(fn) /* update library links */ char *fn; { @@ -411,9 +414,9 @@ char *fn; if (vp->lib != NULL || fn == NULL || !strcmp(fn, vp->name)) vp->lib = liblookup(vp->name); } -#endif +void varfree(ln) /* release link to variable */ register VARDEF *ln; { @@ -442,9 +445,7 @@ dfirst() /* return pointer to first definition */ { htndx = 0; htpos = NULL; -#ifdef OUTCHAN ochpos = outchan; -#endif return(dnext()); } @@ -466,13 +467,9 @@ dnext() /* return pointer to next definition */ return(ep); } } -#ifdef OUTCHAN if ((ep = ochpos) != NULL) ochpos = ep->sibling; return(ep); -#else - return(NULL); -#endif } @@ -492,6 +489,7 @@ char *name; } +void dpush(nm, ep) /* push on a definition */ char *nm; register EPNODE *ep; @@ -504,7 +502,7 @@ register EPNODE *ep; } -#ifdef OUTCHAN +void addchan(sp) /* add an output channel assignment */ EPNODE *sp; { @@ -532,9 +530,9 @@ EPNODE *sp; sp->sibling = NULL; } -#endif +void getstatement() /* get next statement */ { register EPNODE *ep; @@ -545,31 +543,24 @@ 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 (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 @@ -599,8 +590,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 +608,7 @@ getdefn() /* A -> SYM = E1 */ syntax("')' expected"); scan(); curfunc = ep1; - } else - curfunc = NULL; -#endif + } if (nextc != '=' && nextc != ':') syntax("'=' or ':' expected"); @@ -631,25 +619,21 @@ 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 */ { @@ -674,7 +658,6 @@ getchan() /* A -> $N = E1 */ return(ep2); } -#endif @@ -699,8 +682,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