--- ray/src/common/calcomp.h 2003/04/27 06:08:03 2.8 +++ ray/src/common/calcomp.h 2025/12/03 18:14:26 2.28 @@ -1,17 +1,23 @@ -/* RCSid $Id: calcomp.h,v 2.8 2003/04/27 06:08:03 greg Exp $ */ +/* RCSid $Id: calcomp.h,v 2.28 2025/12/03 18:14:26 greg Exp $ */ /* * calcomp.h - header file for expression parser. */ +#ifndef _RAD_CALCOMP_H_ +#define _RAD_CALCOMP_H_ -#include "copyright.h" +#include +#ifdef __cplusplus +extern "C" { +#endif + #define VAR 1 #define NUM 2 #define UMINUS 3 #define CHAN 4 #define FUNC 5 #define ARG 6 -#define TICK 7 +#define CLKT 7 #define SYM 8 /* also: '+', '-', '*', '/', '^', '=', ':' */ @@ -19,31 +25,34 @@ typedef struct { char *fname; /* function name */ short nargs; /* # of required arguments */ short atyp; /* assignment type (':' or '=') */ - double (*f)(); /* pointer to function */ -} LIBR; /* a library function */ + double (*f)(char *); /* pointer to function */ +} ELIBR; /* a library function */ +typedef struct vardef { + char *name; /* variable name */ + int nlinks; /* number of references */ + struct epnode *def; /* definition */ + ELIBR *lib; /* library definition */ + struct vardef *next; /* next in hash list */ +} VARDEF; /* a variable definition */ + typedef struct epnode { - int type; /* node type */ - struct epnode *sibling; /* next child this level */ union { struct epnode *kid; /* first child */ double num; /* number */ char *name; /* symbol name */ int chan; /* channel number */ unsigned long tick; /* timestamp */ - struct vardef { - char *name; /* variable name */ - int nlinks; /* number of references */ - struct epnode *def; /* definition */ - LIBR *lib; /* library definition */ - struct vardef *next; /* next in hash list */ - } *ln; /* link */ + VARDEF *ln; /* variable definition link */ } v; /* value */ + struct epnode *sibling; /* next child this level */ + short type; /* node type */ + short nkids; /* child count (neg if array) */ } EPNODE; /* an expression node */ -typedef struct vardef VARDEF; /* a variable definition */ +#define nekids(ep) abs((ep)->nkids) -#define MAXWORD 127 /* maximum word/id length */ +#define RMAXWORD 127 /* maximum word/id length */ #define CNTXMARK '`' /* context mark */ #define isid(c) (isalnum(c) || (c) == '_' || \ @@ -51,6 +60,10 @@ typedef struct vardef VARDEF; /* a variable definitio #define evalue(ep) (*eoper[(ep)->type])(ep) +#define dfn_name(ep) ((ep)->v.kid->type == SYM ? \ + (ep)->v.kid->v.name : \ + (ep)->v.kid->v.kid->v.name) + /* flags to set in esupport */ #define E_VARIABLE 001 #define E_FUNCTION 002 @@ -59,106 +72,30 @@ 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 EPNODE *ecurfunc; extern int nextc; - -#ifdef NOPROTO - -extern void fcompile(); -extern void scompile(); -extern double varvalue(); -extern double evariable(); -extern void varset(); -extern void dclear(); -extern void dremove(); -extern int vardefined(); -extern char *setcontext(); -extern char *pushcontext(); -extern char *popcontext(); -extern char *qualname(); -extern int incontext(); -extern void chanout(); -extern void dcleanup(); -extern EPNODE *dlookup(); -extern VARDEF *varlookup(); -extern VARDEF *varinsert(); -extern void varfree(); -extern EPNODE *dfirst(); -extern EPNODE *dnext(); -extern EPNODE *dpop(); -extern void dpush(); -extern void addchan(); -extern void getstatement(); -extern EPNODE *getdefn(); -extern EPNODE *getchan(); -extern EPNODE *eparse(); -extern double eval(); -extern int epcmp(); -extern void epfree(); -extern EPNODE *ekid(); -extern int nekids(); -extern void initfile(); -extern void initstr(); -extern void getscanpos(); -extern int scan(); -extern char *long2ascii(); -extern void syntax(); -extern void addekid(); -extern char *getname(); -extern int getinum(); -extern double getnum(); -extern EPNODE *getE1(); -extern EPNODE *getE2(); -extern EPNODE *getE3(); -extern EPNODE *getE4(); -extern EPNODE *getE5(); -extern EPNODE *rconst(); -extern int isconstvar(); -extern int isconstfun(); -extern int fundefined(); -extern double funvalue(); -extern void funset(); -extern int nargum(); -extern double argument(); -extern VARDEF *argf(); -extern char *argfun(); -extern double efunc(); -extern LIBR *liblookup(); -extern void libupdate(); -extern void eprint(); -extern void dprint(); -extern char *savestr(); -extern void freestr(); -extern int shash(); -extern char *emalloc(); -extern char *ecalloc(); -extern char *erealloc(); -extern void efree(); -extern void eputs(); -extern void wputs(); -extern void quit(); - -extern double chanvalue(); - -#else +extern int eofc; + /* defined in biggerlib.c */ +extern void biggerlib(void); /* defined in caldefn.c */ 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); -extern char *setcontext(char *ctx); +extern char *calcontext(char *ctx); extern char *pushcontext(char *ctx); extern char *popcontext(void); extern char *qualname(char *nam, int lvl); extern int incontext(char *qn); extern void chanout(void (*cs)(int n, double v)); +extern void doptimize(int activate); extern void dcleanup(int lvl); extern EPNODE *dlookup(char *name); extern VARDEF *varlookup(char *name); @@ -168,24 +105,24 @@ extern EPNODE *dfirst(void); extern EPNODE *dnext(void); extern EPNODE *dpop(char *name); extern void dpush(char *nm, EPNODE *ep); -extern void addchan(EPNODE *sp); -extern void getstatement(); -extern EPNODE *getdefn(); -extern EPNODE *getchan(); +extern void eaddchan(EPNODE *sp); +extern void egetstatement(void); +extern EPNODE *egetdefn(void); +extern EPNODE *egetchan(void); /* defined in calexpr.c */ extern EPNODE *eparse(char *expr); extern double eval(char *expr); extern int epcmp(EPNODE *ep1, EPNODE *ep2); -extern void epfree(EPNODE *epar); +extern void epfree(EPNODE *epar, int frep); +extern void epoptimize(EPNODE *epar); extern EPNODE *ekid(EPNODE *ep, int n); -extern int nekids(EPNODE *ep); extern void initfile(FILE *fp, char *fn, int ln); extern void initstr(char *s, char *fn, int ln); extern void getscanpos(char **fnp, int *lnp, char **spp, FILE **fpp); -extern int scan(void); +extern int escan(void); extern char *long2ascii(long l); -extern void syntax(char *err); -extern void addekid(EPNODE *ep, EPNODE *ekid); +extern void esyntax(char *err); +extern void addekid(EPNODE *ep, EPNODE *ek); extern char *getname(void); extern int getinum(void); extern double getnum(void); @@ -200,31 +137,24 @@ 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); -extern char *argfun(int n); +extern VARDEF *eargf(int n); +extern char *eargfun(int n); extern double efunc(EPNODE *ep); -extern LIBR *liblookup(char *fname); -extern void libupdate(char *fn); +extern double eargument(EPNODE *ep); +extern ELIBR *eliblookup(char *fname); +extern void elibupdate(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); - /* miscellaneous */ -extern void eputs(char *s); -extern void wputs(char *s); -extern void quit(int code); /* defined by client */ extern double chanvalue(int n); +#ifdef __cplusplus +} #endif +#endif /* _RAD_CALCOMP_H_ */ +