--- ray/src/common/calexpr.c 1989/06/29 09:44:33 1.4 +++ ray/src/common/calexpr.c 2003/07/17 09:21:29 2.24 @@ -1,9 +1,6 @@ -/* Copyright (c) 1986 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: calexpr.c,v 2.24 2003/07/17 09:21:29 schorsch Exp $"; #endif - /* * Compute data values using expression parser * @@ -16,59 +13,50 @@ static char SCCSid[] = "$SunId$ LBL"; * 1/29/87 Made variables conditional (VARIABLE) * * 5/19/88 Added constant subexpression elimination (RCONST) + * + * 2/19/03 Eliminated conditional compiles in favor of esupport extern. */ -#include +#include "copyright.h" +#include +#include #include - #include +#include +#include +#include "rterror.h" #include "calcomp.h" -#define MAXLINE 256 /* maximum line length */ -#define MAXWORD 64 /* maximum word length */ +#define MAXLINE 256 /* maximum line length */ -#define newnode() (EPNODE *)ecalloc(1, sizeof(EPNODE)) +#define newnode() (EPNODE *)ecalloc(1, sizeof(EPNODE)) -#define isid(c) (isalnum(c) || (c) == '_' || (c) == '.') +#define isdecimal(c) (isdigit(c) || (c) == '.') -#define isdecimal(c) (isdigit(c) || (c) == '.') +static double euminus(EPNODE *), eargument(EPNODE *), enumber(EPNODE *); +static double echannel(EPNODE *); +static double eadd(EPNODE *), esubtr(EPNODE *), + emult(EPNODE *), edivi(EPNODE *), + epow(EPNODE *); +static double ebotch(EPNODE *); -extern double atof(), pow(); -extern char *fgets(), *savestr(); -extern char *emalloc(), *ecalloc(); -extern EPNODE *curfunc; -extern double efunc(), evariable(), enumber(), euminus(), echannel(); -extern double eargument(), eadd(), esubtr(), emult(), edivi(), epow(); -extern double ebotch(); -extern int errno; +unsigned int esupport = /* what to support */ + E_VARIABLE | E_FUNCTION ; int nextc; /* lookahead character */ -double (*eoper[])() = { /* expression operations */ +double (*eoper[])() = { /* expression operations */ ebotch, -#ifdef VARIABLE evariable, -#else - ebotch, -#endif enumber, euminus, -#ifdef INCHAN echannel, -#else - ebotch, -#endif -#ifdef FUNCTION efunc, eargument, -#else ebotch, ebotch, -#endif - ebotch, - ebotch, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, emult, @@ -77,16 +65,19 @@ double (*eoper[])() = { /* expression operations */ esubtr, 0, edivi, - 0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0, ebotch, + 0,0, + ebotch, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, epow, }; -static char *infile; /* input file name */ static FILE *infp; /* input file pointer */ static char *linbuf; /* line buffer */ +static char *infile; /* input file name */ +static int lineno; /* input line number */ static int linepos; /* position in buffer */ @@ -96,10 +87,8 @@ char *expr; { EPNODE *ep; - initstr(NULL, expr); -#if defined(VARIABLE) && defined(FUNCTION) + initstr(expr, NULL, 0); curfunc = NULL; -#endif ep = getE1(); if (nextc != EOF) syntax("unexpected character"); @@ -121,18 +110,65 @@ char *expr; } +int +epcmp(ep1, ep2) /* compare two expressions for equivalence */ +register EPNODE *ep1, *ep2; +{ + double d; + + if (ep1->type != ep2->type) + return(1); + + switch (ep1->type) { + + case VAR: + return(ep1->v.ln != ep2->v.ln); + + case NUM: + if (ep2->v.num == 0) + return(ep1->v.num != 0); + d = ep1->v.num / ep2->v.num; + return(d > 1.000000000001 | d < 0.999999999999); + + case CHAN: + case ARG: + return(ep1->v.chan != ep2->v.chan); + + case '=': + case ':': + return(epcmp(ep1->v.kid->sibling, ep2->v.kid->sibling)); + + case TICK: + case SYM: /* should never get this one */ + return(0); + + default: + ep1 = ep1->v.kid; + ep2 = ep2->v.kid; + while (ep1 != NULL) { + if (ep2 == NULL) + return(1); + if (epcmp(ep1, ep2)) + return(1); + ep1 = ep1->sibling; + ep2 = ep2->sibling; + } + return(ep2 != NULL); + } +} + + +void epfree(epar) /* free a parse tree */ -register EPNODE *epar; +register EPNODE *epar; { register EPNODE *ep; switch (epar->type) { -#if defined(VARIABLE) || defined(FUNCTION) case VAR: varfree(epar->v.ln); break; -#endif case SYM: freestr(epar->v.name); @@ -145,8 +181,10 @@ register EPNODE *epar; break; default: - for (ep = epar->v.kid; ep != NULL; ep = ep->sibling) + while ((ep = epar->v.kid) != NULL) { + epar->v.kid = ep->sibling; epfree(ep); + } break; } @@ -155,43 +193,39 @@ register EPNODE *epar; } /* the following used to be a switch */ -#ifdef FUNCTION static double eargument(ep) -EPNODE *ep; +EPNODE *ep; { return(argument(ep->v.chan)); } -#endif static double enumber(ep) -EPNODE *ep; +EPNODE *ep; { return(ep->v.num); } static double euminus(ep) -EPNODE *ep; +EPNODE *ep; { register EPNODE *ep1 = ep->v.kid; return(-evalue(ep1)); } -#ifdef INCHAN static double echannel(ep) -EPNODE *ep; +EPNODE *ep; { return(chanvalue(ep->v.chan)); } -#endif static double eadd(ep) -EPNODE *ep; +EPNODE *ep; { register EPNODE *ep1 = ep->v.kid; @@ -200,7 +234,7 @@ EPNODE *ep; static double esubtr(ep) -EPNODE *ep; +EPNODE *ep; { register EPNODE *ep1 = ep->v.kid; @@ -209,7 +243,7 @@ EPNODE *ep; static double emult(ep) -EPNODE *ep; +EPNODE *ep; { register EPNODE *ep1 = ep->v.kid; @@ -218,7 +252,7 @@ EPNODE *ep; static double edivi(ep) -EPNODE *ep; +EPNODE *ep; { register EPNODE *ep1 = ep->v.kid; double d; @@ -234,20 +268,20 @@ EPNODE *ep; static double epow(ep) -EPNODE *ep; +EPNODE *ep; { register EPNODE *ep1 = ep->v.kid; double d; - int lasterrno; + int lasterrno; lasterrno = errno; errno = 0; d = pow(evalue(ep1), evalue(ep1->sibling)); -#ifdef IEEE +#ifdef IEEE if (!finite(d)) errno = EDOM; #endif - if (errno) { + if (errno == EDOM || errno == ERANGE) { wputs("Illegal power\n"); return(0.0); } @@ -257,16 +291,17 @@ EPNODE *ep; static double ebotch(ep) -EPNODE *ep; +EPNODE *ep; { eputs("Bad expression!\n"); quit(1); + return 0.0; /* pro forma return */ } EPNODE * ekid(ep, n) /* return pointer to a node's nth kid */ -register EPNODE *ep; +register EPNODE *ep; register int n; { @@ -280,7 +315,7 @@ register int n; int nekids(ep) /* return # of kids for node ep */ -register EPNODE *ep; +register EPNODE *ep; { register int n = 0; @@ -291,45 +326,71 @@ register EPNODE *ep; } -initfile(file, fp) /* prepare input file */ -char *file; +void +initfile(fp, fn, ln) /* prepare input file */ FILE *fp; +char *fn; +int ln; { - static char inpbuf[MAXLINE]; + static char inpbuf[MAXLINE]; - infile = file; infp = fp; linbuf = inpbuf; + infile = fn; + lineno = ln; linepos = 0; inpbuf[0] = '\0'; scan(); } -initstr(file, s) /* prepare input string */ -char *file; +void +initstr(s, fn, ln) /* prepare input string */ char *s; +char *fn; +int ln; { - infile = file; infp = NULL; + infile = fn; + lineno = ln; linbuf = s; linepos = 0; scan(); } -scan() /* scan next character */ +void +getscanpos(fnp, lnp, spp, fpp) /* return current scan position */ +char **fnp; +int *lnp; +char **spp; +FILE **fpp; { + if (fnp != NULL) *fnp = infile; + if (lnp != NULL) *lnp = lineno; + if (spp != NULL) *spp = linbuf+linepos; + if (fpp != NULL) *fpp = infp; +} + + +int +scan() /* scan next character, return literal next */ +{ + register int lnext = 0; + do { if (linbuf[linepos] == '\0') if (infp == NULL || fgets(linbuf, MAXLINE, infp) == NULL) nextc = EOF; else { nextc = linbuf[0]; + lineno++; linepos = 1; } else nextc = linbuf[linepos++]; + if (!lnext) + lnext = nextc; if (nextc == '{') { scan(); while (nextc != '}') @@ -340,33 +401,66 @@ scan() /* scan next character */ scan(); } } while (isspace(nextc)); + return(lnext); } +char * +long2ascii(l) /* convert long to ascii */ +long l; +{ + static char buf[16]; + register char *cp; + int neg = 0; + + if (l == 0) + return("0"); + if (l < 0) { + l = -l; + neg++; + } + cp = buf + sizeof(buf); + *--cp = '\0'; + while (l) { + *--cp = l % 10 + '0'; + l /= 10; + } + if (neg) + *--cp = '-'; + return(cp); +} + + +void syntax(err) /* report syntax error and quit */ char *err; { register int i; + if (infile != NULL || lineno != 0) { + if (infile != NULL) eputs(infile); + if (lineno != 0) { + eputs(infile != NULL ? ", line " : "line "); + eputs(long2ascii((long)lineno)); + } + eputs(":\n"); + } eputs(linbuf); if (linbuf[strlen(linbuf)-1] != '\n') eputs("\n"); for (i = 0; i < linepos-1; i++) eputs(linbuf[i] == '\t' ? "\t" : " "); eputs("^ "); - if (infile != NULL) { - eputs(infile); - eputs(": "); - } eputs(err); eputs("\n"); quit(1); } +void addekid(ep, ekid) /* add a child to ep */ -register EPNODE *ep; -EPNODE *ekid; +register EPNODE *ep; +EPNODE *ekid; { if (ep->v.kid == NULL) ep->v.kid = ekid; @@ -382,12 +476,15 @@ EPNODE *ekid; char * getname() /* scan an identifier */ { - static char str[MAXWORD+1]; - register int i; + static char str[RMAXWORD+1]; + register int i, lnext; - for (i = 0; i < MAXWORD && isid(nextc); i++, scan()) - str[i] = nextc; + lnext = nextc; + for (i = 0; i < RMAXWORD && isid(lnext); i++, lnext = scan()) + str[i] = lnext; str[i] = '\0'; + while (isid(lnext)) /* skip rest of name */ + lnext = scan(); return(str); } @@ -396,12 +493,13 @@ getname() /* scan an identifier */ int getinum() /* scan a positive integer */ { - register int n; + register int n, lnext; n = 0; - while (isdigit(nextc)) { - n = n * 10 + nextc - '0'; - scan(); + lnext = nextc; + while (isdigit(lnext)) { + n = n * 10 + lnext - '0'; + lnext = scan(); } return(n); } @@ -410,32 +508,37 @@ getinum() /* scan a positive integer */ double getnum() /* scan a positive float */ { - register int i; - char str[MAXWORD+1]; + register int i, lnext; + char str[RMAXWORD+1]; i = 0; - while (isdigit(nextc) && i < MAXWORD) { - str[i++] = nextc; - scan(); + lnext = nextc; + while (isdigit(lnext) && i < RMAXWORD) { + str[i++] = lnext; + lnext = scan(); } - if (nextc == '.' && i < MAXWORD) { - str[i++] = nextc; - scan(); - while (isdigit(nextc) && i < MAXWORD) { - str[i++] = nextc; - scan(); + if (lnext == '.' && i < RMAXWORD) { + str[i++] = lnext; + lnext = scan(); + if (i == 1 && !isdigit(lnext)) + syntax("badly formed number"); + while (isdigit(lnext) && i < RMAXWORD) { + str[i++] = lnext; + lnext = scan(); } } - if ((nextc == 'e' || nextc == 'E') && i < MAXWORD) { - str[i++] = nextc; - scan(); - if ((nextc == '-' || nextc == '+') && i < MAXWORD) { - str[i++] = nextc; - scan(); + if ((lnext == 'e' | lnext == 'E') && i < RMAXWORD) { + str[i++] = lnext; + lnext = scan(); + if ((lnext == '-' | lnext == '+') && i < RMAXWORD) { + str[i++] = lnext; + lnext = scan(); } - while (isdigit(nextc) && i < MAXWORD) { - str[i++] = nextc; - scan(); + if (!isdigit(lnext)) + syntax("missing exponent"); + while (isdigit(lnext) && i < RMAXWORD) { + str[i++] = lnext; + lnext = scan(); } } str[i] = '\0'; @@ -446,7 +549,7 @@ getnum() /* scan a positive float */ EPNODE * getE1() /* E1 -> E1 ADDOP E2 */ - /* E2 */ + /* E2 */ { register EPNODE *ep1, *ep2; @@ -457,10 +560,9 @@ getE1() /* E1 -> E1 ADDOP E2 */ scan(); addekid(ep2, ep1); addekid(ep2, getE2()); -#ifdef RCONST - if (ep1->type == NUM && ep1->sibling->type == NUM) + if (esupport&E_RCONST && + ep1->type == NUM && ep1->sibling->type == NUM) ep2 = rconst(ep2); -#endif ep1 = ep2; } return(ep1); @@ -469,7 +571,7 @@ getE1() /* E1 -> E1 ADDOP E2 */ EPNODE * getE2() /* E2 -> E2 MULOP E3 */ - /* E3 */ + /* E3 */ { register EPNODE *ep1, *ep2; @@ -480,10 +582,9 @@ getE2() /* E2 -> E2 MULOP E3 */ scan(); addekid(ep2, ep1); addekid(ep2, getE3()); -#ifdef RCONST - if (ep1->type == NUM && ep1->sibling->type == NUM) + if (esupport&E_RCONST && + ep1->type == NUM && ep1->sibling->type == NUM) ep2 = rconst(ep2); -#endif ep1 = ep2; } return(ep1); @@ -491,23 +592,22 @@ getE2() /* E2 -> E2 MULOP E3 */ EPNODE * -getE3() /* E3 -> E3 ^ E4 */ - /* E4 */ +getE3() /* E3 -> E4 ^ E3 */ + /* E4 */ { register EPNODE *ep1, *ep2; ep1 = getE4(); - while (nextc == '^') { + if (nextc == '^') { ep2 = newnode(); ep2->type = nextc; scan(); addekid(ep2, ep1); - addekid(ep2, getE4()); -#ifdef RCONST - if (ep1->type == NUM && ep1->sibling->type == NUM) + addekid(ep2, getE3()); + if (esupport&E_RCONST && + ep1->type == NUM && ep1->sibling->type == NUM) ep2 = rconst(ep2); -#endif - ep1 = ep2; + return(ep2); } return(ep1); } @@ -515,7 +615,7 @@ getE3() /* E3 -> E3 ^ E4 */ EPNODE * getE4() /* E4 -> ADDOP E5 */ - /* E5 */ + /* E5 */ { register EPNODE *ep1, *ep2; @@ -526,6 +626,10 @@ getE4() /* E4 -> ADDOP E5 */ ep2->v.num = -ep2->v.num; return(ep2); } + if (ep2->type == UMINUS) { /* don't generate -(-E5) */ + efree((char *)ep2); + return(ep2->v.kid); + } ep1 = newnode(); ep1->type = UMINUS; addekid(ep1, ep2); @@ -539,89 +643,85 @@ getE4() /* E4 -> ADDOP E5 */ EPNODE * getE5() /* E5 -> (E1) */ - /* VAR */ - /* NUM */ - /* $N */ - /* FUNC(E1,..) */ - /* ARG */ + /* VAR */ + /* NUM */ + /* $N */ + /* FUNC(E1,..) */ + /* ARG */ { - int i; - register EPNODE *ep1, *ep2; + int i; + char *nam; + register EPNODE *ep1, *ep2; - if (nextc == '(') { - scan(); - ep1 = getE1(); - if (nextc != ')') - syntax("')' expected"); - scan(); - return(ep1); - } + if (nextc == '(') { + scan(); + ep1 = getE1(); + if (nextc != ')') + syntax("')' expected"); + scan(); + return(ep1); + } -#ifdef INCHAN - if (nextc == '$') { - scan(); - ep1 = newnode(); - ep1->type = CHAN; - ep1->v.chan = getinum(); - return(ep1); - } -#endif + if (esupport&E_INCHAN && nextc == '$') { + scan(); + ep1 = newnode(); + ep1->type = CHAN; + ep1->v.chan = getinum(); + return(ep1); + } -#if defined(VARIABLE) || defined(FUNCTION) - if (isalpha(nextc)) { - ep1 = newnode(); - ep1->type = VAR; - ep1->v.ln = varinsert(getname()); - -#if defined(VARIABLE) && defined(FUNCTION) - if (curfunc != NULL) - for (i = 1, ep2 = curfunc->v.kid->sibling; - ep2 != NULL; i++, ep2 = ep2->sibling) - if (!strcmp(ep2->v.name, ep1->v.ln->name)) { - epfree(ep1); - ep1 = newnode(); - ep1->type = ARG; - ep1->v.chan = i; - break; + if (esupport&(E_VARIABLE|E_FUNCTION) && + (isalpha(nextc) || nextc == CNTXMARK)) { + nam = getname(); + ep1 = NULL; + if ((esupport&(E_VARIABLE|E_FUNCTION)) == (E_VARIABLE|E_FUNCTION) + && curfunc != NULL) + for (i = 1, ep2 = curfunc->v.kid->sibling; + ep2 != NULL; i++, ep2 = ep2->sibling) + if (!strcmp(ep2->v.name, nam)) { + ep1 = newnode(); + ep1->type = ARG; + ep1->v.chan = i; + break; + } + if (ep1 == NULL) { + ep1 = newnode(); + ep1->type = VAR; + ep1->v.ln = varinsert(nam); } -#endif -#ifdef FUNCTION - if (nextc == '(') { - ep2 = newnode(); - ep2->type = FUNC; - addekid(ep2, ep1); - ep1 = ep2; - do { - scan(); - addekid(ep1, getE1()); - } while (nextc == ','); - if (nextc != ')') - syntax("')' expected"); - scan(); + if (esupport&E_FUNCTION && nextc == '(') { + ep2 = newnode(); + ep2->type = FUNC; + addekid(ep2, ep1); + ep1 = ep2; + do { + scan(); + addekid(ep1, getE1()); + } while (nextc == ','); + if (nextc != ')') + syntax("')' expected"); + scan(); + } else if (!(esupport&E_VARIABLE)) + syntax("'(' expected"); + if (esupport&E_RCONST && isconstvar(ep1)) + ep1 = rconst(ep1); + return(ep1); } -#ifndef VARIABLE - else - syntax("'(' expected"); -#endif -#endif - return(ep1); - } -#endif - if (isdecimal(nextc)) { - ep1 = newnode(); - ep1->type = NUM; - ep1->v.num = getnum(); - return(ep1); - } - syntax("unexpected character"); + if (isdecimal(nextc)) { + ep1 = newnode(); + ep1->type = NUM; + ep1->v.num = getnum(); + return(ep1); + } + syntax("unexpected character"); + return NULL; /* pro forma return */ } -#ifdef RCONST EPNODE * rconst(epar) /* reduce a constant expression */ -register EPNODE *epar; +register EPNODE *epar; { register EPNODE *ep; @@ -629,10 +729,54 @@ register EPNODE *epar; ep->type = NUM; errno = 0; ep->v.num = evalue(epar); - if (errno) - syntax("bad constant expression"); + if (errno == EDOM || errno == ERANGE) + syntax("bad constant expression"); epfree(epar); return(ep); } -#endif + + +int +isconstvar(ep) /* is ep linked to a constant expression? */ +register EPNODE *ep; +{ + register EPNODE *ep1; + + if (esupport&E_FUNCTION && ep->type == FUNC) { + if (!isconstfun(ep->v.kid)) + return(0); + for (ep1 = ep->v.kid->sibling; ep1 != NULL; ep1 = ep1->sibling) + if (ep1->type != NUM && !isconstfun(ep1)) + return(0); + return(1); + } + if (ep->type != VAR) + return(0); + ep1 = ep->v.ln->def; + if (ep1 == NULL || ep1->type != ':') + return(0); + if (esupport&E_FUNCTION && ep1->v.kid->type != SYM) + return(0); + return(1); +} + + +int +isconstfun(ep) /* is ep linked to a constant function? */ +register EPNODE *ep; +{ + register EPNODE *dp; + register LIBR *lp; + + if (ep->type != VAR) + return(0); + if ((dp = ep->v.ln->def) != NULL) + if (dp->v.kid->type == FUNC) + return(dp->type == ':'); + else + return(0); /* don't identify masked library functions */ + if ((lp = ep->v.ln->lib) != NULL) + return(lp->atyp == ':'); + return(0); +}