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.16 by greg, Mon Aug 4 22:37:53 2003 UTC vs.
Revision 2.22 by greg, Thu May 1 16:42:05 2008 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 +    int  type;                  /* node type */
48   }  EPNODE;      /* an expression node */
49  
50   typedef struct vardef  VARDEF;  /* a variable definition */
# Line 70 | Line 70 | extern unsigned long  eclock;
70   extern unsigned int  esupport;
71   extern EPNODE   *curfunc;
72   extern int  nextc;
73 + extern int  eofc;
74  
75                                          /* defined in biggerlib.c */
76   extern void biggerlib(void);
# Line 79 | Line 80 | extern void    fcompile(char *fname);
80   extern void     scompile(char *str, char *fname, int ln);
81   extern double   varvalue(char *vname);
82   extern double   evariable(EPNODE *ep);
83 < extern void     varset(char *fname, int assign, double val);
83 > extern void     varset(char *vname, int assign, double val);
84   extern void     dclear(char *name);
85   extern void     dremove(char *name);
86   extern int      vardefined(char *name);
# Line 142 | Line 143 | extern void    libupdate(char *fn);
143                                          /* defined in calprnt.c */
144   extern void     eprint(EPNODE *ep, FILE *fp);
145   extern void     dprint(char *name, FILE *fp);
145 –                                        /* defined in savestr.c */
146 – extern char     *savestr(char *str);
147 – extern void     freestr(char *s);
148 – extern int      shash(char *s);
149 –                                        /* defined in ealloc.c */
150 – extern char     *emalloc(unsigned int n);
151 – extern char     *ecalloc(unsigned int ne, unsigned int es);
152 – extern char     *erealloc(char *cp, unsigned int n);
153 – extern void     efree(char *cp);
146                                          /* defined by client */
147   extern double   chanvalue(int n);
148  

Diff Legend

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