ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/calcomp.h
(Generate patch)

Comparing ray/src/common/calcomp.h (file contents):
Revision 2.20 by greg, Wed May 25 04:44:25 2005 UTC vs.
Revision 2.25 by greg, Fri Feb 23 03:47:57 2024 UTC

# Line 17 | Line 17 | extern "C" {
17   #define  CHAN           4
18   #define  FUNC           5
19   #define  ARG            6
20 < #define  TICK           7
20 > #define  CLKT           7
21   #define  SYM            8
22                                  /* also: '+', '-', '*', '/', '^', '=', ':' */
23  
# Line 29 | Line 29 | typedef struct {
29   }  LIBR;                /* a library function */
30  
31   typedef struct epnode {
32 –    int  type;                  /* node type */
33 –    struct epnode  *sibling;    /* next child this level */
32      union {
33          struct epnode  *kid;    /* first child */
34          double  num;            /* number */
# Line 45 | Line 43 | typedef struct epnode {
43              struct vardef  *next;       /* next in hash list */
44          }  *ln;                 /* link */
45      } v;                /* value */
46 +    struct epnode  *sibling;    /* next child this level */
47 +    short  type;                /* node type */
48 +    short  nkids;               /* child count (neg if array) */
49   }  EPNODE;      /* an expression node */
50  
51   typedef struct vardef  VARDEF;  /* a variable definition */
52  
53 + #define  nekids(ep)     abs((ep)->nkids)
54 +
55   #define  RMAXWORD       127             /* maximum word/id length */
56   #define  CNTXMARK       '`'             /* context mark */
57  
# Line 57 | Line 60 | typedef struct vardef  VARDEF; /* a variable definitio
60  
61   #define  evalue(ep)     (*eoper[(ep)->type])(ep)
62  
63 + #define  dfn_name(ep)   ((ep)->v.kid->type == SYM ? \
64 +                        (ep)->v.kid->v.name : \
65 +                        (ep)->v.kid->v.kid->v.name)
66 +
67                                          /* flags to set in esupport */
68   #define  E_VARIABLE     001
69   #define  E_FUNCTION     002
# Line 71 | Line 78 | extern unsigned int  esupport;
78   extern EPNODE   *curfunc;
79   extern int  nextc;
80   extern int  eofc;
74 –
81                                          /* defined in biggerlib.c */
82   extern void biggerlib(void);
77 –
83                                          /* defined in caldefn.c */
84   extern void     fcompile(char *fname);
85   extern void     scompile(char *str, char *fname, int ln);
# Line 84 | Line 89 | extern void    varset(char *vname, int assign, double val
89   extern void     dclear(char *name);
90   extern void     dremove(char *name);
91   extern int      vardefined(char *name);
92 < extern char     *setcontext(char *ctx);
92 > extern char     *calcontext(char *ctx);
93   extern char     *pushcontext(char *ctx);
94   extern char     *popcontext(void);
95   extern char     *qualname(char *nam, int lvl);
96   extern int      incontext(char *qn);
97   extern void     chanout(void (*cs)(int n, double v));
98 + extern void     doptimize(int activate);
99   extern void     dcleanup(int lvl);
100   extern EPNODE   *dlookup(char *name);
101   extern VARDEF   *varlookup(char *name);
# Line 107 | Line 113 | extern EPNODE  *getchan(void);
113   extern EPNODE   *eparse(char *expr);
114   extern double   eval(char *expr);
115   extern int      epcmp(EPNODE *ep1, EPNODE *ep2);
116 < extern void     epfree(EPNODE *epar);
116 > extern void     epfree(EPNODE *epar, int frep);
117 > extern void     epoptimize(EPNODE *epar);
118   extern EPNODE   *ekid(EPNODE *ep, int n);
112 – extern int      nekids(EPNODE *ep);
119   extern void     initfile(FILE *fp, char *fn, int ln);
120   extern void     initstr(char *s, char *fn, int ln);
121   extern void     getscanpos(char **fnp, int *lnp, char **spp, FILE **fpp);
122   extern int      scan(void);
123   extern char     *long2ascii(long l);
124   extern void     syntax(char *err);
125 < extern void     addekid(EPNODE *ep, EPNODE *ekid);
125 > extern void     addekid(EPNODE *ep, EPNODE *ek);
126   extern char     *getname(void);
127   extern int      getinum(void);
128   extern double   getnum(void);
# Line 145 | Line 151 | extern void    eprint(EPNODE *ep, FILE *fp);
151   extern void     dprint(char *name, FILE *fp);
152                                          /* defined by client */
153   extern double   chanvalue(int n);
148 –
154  
155   #ifdef __cplusplus
156   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines