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.10 by schorsch, Sat Jun 7 12:50:20 2003 UTC vs.
Revision 2.16 by greg, Mon Aug 4 22:37:53 2003 UTC

# Line 4 | Line 4
4   */
5   #ifndef _RAD_CALCOMP_H_
6   #define _RAD_CALCOMP_H_
7 +
8 + #include <stdio.h>
9 +
10   #ifdef __cplusplus
11   extern "C" {
12   #endif
13  
11 –
12 – #include "copyright.h"
13 –
14 – #include <stdio.h>
15 –
14   #define  VAR            1
15   #define  NUM            2
16   #define  UMINUS         3
# Line 27 | Line 25 | typedef struct {
25      char  *fname;               /* function name */
26      short  nargs;               /* # of required arguments */
27      short  atyp;                /* assignment type (':' or '=') */
28 <    double  (*f)();             /* pointer to function */
28 >    double  (*f)(char *);       /* pointer to function */
29   }  LIBR;                /* a library function */
30  
31   typedef struct epnode {
# Line 51 | Line 49 | typedef struct epnode {
49  
50   typedef struct vardef  VARDEF;  /* a variable definition */
51  
52 < #define  MAXWORD        127             /* maximum word/id length */
52 > #define  RMAXWORD       127             /* maximum word/id length */
53   #define  CNTXMARK       '`'             /* context mark */
54  
55   #define  isid(c)        (isalnum(c) || (c) == '_' || \
# Line 67 | Line 65 | typedef struct vardef  VARDEF; /* a variable definitio
65   #define  E_RCONST       020
66   #define  E_REDEFW       040
67  
68 < extern double  (*eoper[])();
68 > extern double  (*eoper[])(EPNODE *);
69   extern unsigned long  eclock;
70   extern unsigned int  esupport;
71   extern EPNODE   *curfunc;
72   extern int  nextc;
73  
74 +                                        /* defined in biggerlib.c */
75 + extern void biggerlib(void);
76 +
77                                          /* defined in caldefn.c */
78   extern void     fcompile(char *fname);
79   extern void     scompile(char *str, char *fname, int ln);
# Line 98 | Line 99 | extern EPNODE  *dnext(void);
99   extern EPNODE   *dpop(char *name);
100   extern void     dpush(char *nm, EPNODE *ep);
101   extern void     addchan(EPNODE *sp);
102 < extern void     getstatement();
103 < extern EPNODE   *getdefn();
104 < extern EPNODE   *getchan();
102 > extern void     getstatement(void);
103 > extern EPNODE   *getdefn(void);
104 > extern EPNODE   *getchan(void);
105                                          /* defined in calexpr.c */
106   extern EPNODE   *eparse(char *expr);
107   extern double   eval(char *expr);
# Line 129 | Line 130 | extern int     isconstfun(EPNODE *ep);
130                                          /* defined in calfunc.c */
131   extern int      fundefined(char *fname);
132   extern double   funvalue(char *fname, int n, double *a);
133 < extern void     funset(char *fname, int nargs, int assign, double (*fptr)());
133 > extern void     funset(char *fname, int nargs, int assign,
134 >                                double (*fptr)(char *));
135   extern int      nargum(void);
136   extern double   argument(int n);
137   extern VARDEF   *argf(int n);
# Line 149 | Line 151 | 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);
152 –                                        /* miscellaneous */
153 – extern void     eputs(char *s);
154 – extern void     wputs(char *s);
155 – extern void     quit(int code);
154                                          /* defined by client */
155   extern double   chanvalue(int n);
156  

Diff Legend

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