--- ray/src/common/calcomp.h	2004/04/29 22:32:11	2.18
+++ ray/src/common/calcomp.h	2008/05/01 16:42:05	2.22
@@ -1,4 +1,4 @@
-/* RCSid $Id: calcomp.h,v 2.18 2004/04/29 22:32:11 greg Exp $ */
+/* RCSid $Id: calcomp.h,v 2.22 2008/05/01 16:42:05 greg Exp $ */
 /*
  *  calcomp.h - header file for expression parser.
  */
@@ -17,7 +17,7 @@ extern "C" {
 #define	 CHAN		4
 #define	 FUNC		5
 #define	 ARG		6
-#define	 TICK		7
+#define	 CLKT		7
 #define	 SYM		8
 				/* also: '+', '-', '*', '/', '^', '=', ':' */
 
@@ -29,8 +29,6 @@ typedef struct {
 }  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 */
@@ -70,6 +70,7 @@ 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);