--- ray/src/common/calcomp.h 2003/07/17 09:21:29 2.14 +++ ray/src/common/calcomp.h 2005/09/23 19:04:52 2.21 @@ -1,4 +1,4 @@ -/* RCSid $Id: calcomp.h,v 2.14 2003/07/17 09:21:29 schorsch Exp $ */ +/* RCSid $Id: calcomp.h,v 2.21 2005/09/23 19:04:52 greg Exp $ */ /* * calcomp.h - header file for expression parser. */ @@ -25,12 +25,10 @@ typedef struct { char *fname; /* function name */ short nargs; /* # of required arguments */ short atyp; /* assignment type (':' or '=') */ - double (*f)(); /* pointer to function */ + double (*f)(char *); /* pointer to function */ } LIBR; /* a library function */ typedef struct epnode { - int type; /* node type */ - struct epnode *sibling; /* next child this level */ union { struct epnode *kid; /* first child */ double num; /* number */ @@ -45,6 +43,8 @@ typedef struct epnode { struct vardef *next; /* next in hash list */ } *ln; /* link */ } v; /* value */ + struct epnode *sibling; /* next child this level */ + int type; /* node type */ } EPNODE; /* an expression node */ typedef struct vardef VARDEF; /* a variable definition */ @@ -65,11 +65,12 @@ typedef struct vardef VARDEF; /* a variable definitio #define E_RCONST 020 #define E_REDEFW 040 -extern double (*eoper[])(); +extern double (*eoper[])(EPNODE *); extern unsigned long eclock; extern unsigned int esupport; extern EPNODE *curfunc; extern int nextc; +extern int eofc; /* defined in biggerlib.c */ extern void biggerlib(void); @@ -79,7 +80,7 @@ extern void fcompile(char *fname); extern void scompile(char *str, char *fname, int ln); extern double varvalue(char *vname); extern double evariable(EPNODE *ep); -extern void varset(char *fname, int assign, double val); +extern void varset(char *vname, int assign, double val); extern void dclear(char *name); extern void dremove(char *name); extern int vardefined(char *name); @@ -130,7 +131,8 @@ extern int isconstfun(EPNODE *ep); /* defined in calfunc.c */ extern int fundefined(char *fname); extern double funvalue(char *fname, int n, double *a); -extern void funset(char *fname, int nargs, int assign, double (*fptr)()); +extern void funset(char *fname, int nargs, int assign, + double (*fptr)(char *)); extern int nargum(void); extern double argument(int n); extern VARDEF *argf(int n); @@ -141,15 +143,6 @@ extern void libupdate(char *fn); /* defined in calprnt.c */ extern void eprint(EPNODE *ep, FILE *fp); extern void dprint(char *name, FILE *fp); - /* defined in savestr.c */ -extern char *savestr(char *str); -extern void freestr(char *s); -extern int shash(char *s); - /* defined in ealloc.c */ -extern char *emalloc(unsigned int n); -extern char *ecalloc(unsigned int ne, unsigned int es); -extern char *erealloc(char *cp, unsigned int n); -extern void efree(char *cp); /* defined by client */ extern double chanvalue(int n);