--- ray/src/rt/func.c	1992/03/03 13:58:12	2.6
+++ ray/src/rt/func.c	1993/05/25 10:30:16	2.9
@@ -23,10 +23,10 @@ static char SCCSid[] = "$SunId$ LBL";
 #define  LCALSUF	4
 
 XF  unitxf = {			/* identity transform */
-	1.0, 0.0, 0.0, 0.0,
-	0.0, 1.0, 0.0, 0.0,
-	0.0, 0.0, 1.0, 0.0,
-	0.0, 0.0, 0.0, 1.0,
+	{{1.0, 0.0, 0.0, 0.0},
+	{0.0, 1.0, 0.0, 0.0},
+	{0.0, 0.0, 1.0, 0.0},
+	{0.0, 0.0, 0.0, 1.0}},
 	1.0
 };
 
@@ -54,6 +54,7 @@ int  dofwd;
 					/* check to see if done already */
 	if ((f = (MFUNC *)m->os) != NULL)
 		return(f);
+	fobj = NULL; fray = NULL;
 	if (initfile[0]) {		/* initialize on first call */
 		setcontext("");
 		scompile("Dx=$1;Dy=$2;Dz=$3;", NULL, 0);
@@ -165,7 +166,7 @@ setfunc(m, r)			/* set channels for function call */
 OBJREC  *m;
 register RAY  *r;
 {
-	static long  lastrno = -1;
+	static unsigned long  lastrno = ~0;
 	register MFUNC  *f;
 					/* get function */
 	if ((f = (MFUNC *)m->os) == NULL)
@@ -211,6 +212,9 @@ l_arg()				/* return nth real argument */
 	extern double  argument();
 	register int  n;
 
+	if (fobj == NULL)
+		syntax("arg(n) used in constant expression");
+
 	n = argument(1) + .5;		/* round to integer */
 
 	if (n < 1)
@@ -248,6 +252,9 @@ register int  n;
 {
 	double  sum;
 	register RAY  *r;
+
+	if (fray == NULL)
+		syntax("ray parameter used in constant expression");
 
 	if (--n < 0)
 		goto badchan;