[ViewVC] Diff of: radiance/ray/src/common/caldefn.c

Comparing ray/src/common/caldefn.c (file contents):
Revision 1.14 by greg, Thu Aug 8 12:12:16 1991 UTC vs.
Revision 2.25 by greg, Sun Jul 29 22:10:45 2012 UTC

#	Line 1 \| Line 1
1	–	/* Copyright (c) 1991 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		* Store variable definitions.
6		*
#	Line 22 \| Line 19 \| static char SCCSid[] = "$SunId$ LBL";
19		* 4/23/91 Added ':' assignment for constant expressions
20		*
21		* 8/7/91 Added optional context path to append to variable names
22	+	*
23	+	* 5/17/2001 Fixed clock counter wrapping behavior
24	+	*
25	+	* 2/19/03 Eliminated conditional compiles in favor of esupport extern.
26		*/
27
28	<	#include <stdio.h>
28	>	#include "copyright.h"
29
30	+	#include <stdio.h>
31	+	#include <string.h>
32		#include <ctype.h>
33
34	+	#include "rterror.h"
35	+	#include "rtio.h"
36	+	#include "rtmisc.h"
37		#include "calcomp.h"
38
39	<	#ifndef NHASH
40	<	#define NHASH 521 /* hash size (a prime!) */
39	>	#ifndef NHASH
40	>	#define NHASH 521 /* hash size (a prime!) */
41		#endif
42
43	<	#define newnode() (EPNODE *)ecalloc(1, sizeof(EPNODE))
43	>	#define hash(s) (shash(s)%NHASH)
44
45	<	extern char ecalloc(), savestr(), *strcpy();
45	>	#define newnode() (EPNODE *)ecalloc(1, sizeof(EPNODE))
46
47	<	static double dvalue();
47	>	static double dvalue(char name, EPNODE d);
48
49	<	long eclock = -1; /* value storage timer */
49	>	#define MAXCLOCK (1L<<31) /* clock wrap value */
50
51	<	static char context[MAXWORD]; /* current context path */
51	>	unsigned long eclock = 0; /* value storage timer */
52
53	+	#define MAXCNTX 1023 /* maximum context length */
54	+
55	+	static char context[MAXCNTX+1]; /* current context path */
56	+
57		static VARDEF hashtbl[NHASH]; / definition list */
58		static int htndx; /* index for */
59		static VARDEF htpos; / ...dfirst() and */
50	–	#ifdef OUTCHAN
60		static EPNODE ochpos; / ...dnext */
61		static EPNODE *outchan;
53	–	#endif
62
63	<	#ifdef FUNCTION
64	<	EPNODE *curfunc;
57	<	#define dname(ep) ((ep)->v.kid->type == SYM ? \
63	>	EPNODE *curfunc = NULL;
64	>	#define dname(ep) ((ep)->v.kid->type == SYM ? \
65		(ep)->v.kid->v.name : \
66		(ep)->v.kid->v.kid->v.name)
60	–	#else
61	–	#define dname(ep) ((ep)->v.kid->v.name)
62	–	#endif
67
68
69	<	fcompile(fname) /* get definitions from a file */
70	<	char *fname;
69	>	void
70	>	fcompile( /* get definitions from a file */
71	>	char *fname
72	>	)
73		{
74		FILE *fp;
75
#	Line 82 \| Line 88 \| *char fname;**
88		}
89
90
91	<	scompile(str, fn, ln) /* get definitions from a string */
92	<	char *str;
93	<	char *fn;
94	<	int ln;
91	>	void
92	>	scompile( /* get definitions from a string */
93	>	char *str,
94	>	char *fn,
95	>	int ln
96	>	)
97		{
98		initstr(str, fn, ln);
99		while (nextc != EOF)
#	Line 94 \| Line 102 \| int ln;
102
103
104		double
105	<	varvalue(vname) /* return a variable's value */
106	<	char *vname;
105	>	varvalue( /* return a variable's value */
106	>	char *vname
107	>	)
108		{
109		return(dvalue(vname, dlookup(vname)));
110		}
111
112
113		double
114	<	evariable(ep) /* evaluate a variable */
115	<	EPNODE *ep;
114	>	evariable( /* evaluate a variable */
115	>	EPNODE *ep
116	>	)
117		{
118	<	register VARDEF *dp = ep->v.ln;
118	>	VARDEF *dp = ep->v.ln;
119
120		return(dvalue(dp->name, dp->def));
121		}
122
123
124	<	varset(vname, assign, val) /* set a variable's value */
125	<	char *vname;
126	<	int assign;
127	<	double val;
124	>	void
125	>	varset( /* set a variable's value */
126	>	char *vname,
127	>	int assign,
128	>	double val
129	>	)
130		{
131		char *qname;
132	<	register EPNODE ep1, ep2;
132	>	EPNODE ep1, ep2;
133		/* get qualified name */
134		qname = qualname(vname, 0);
135		/* check for quick set */
136	<	if ((ep1 = dlookup(qname)) != NULL && ep1->v.kid->type == SYM) {
136	>	if ((ep1 = dlookup(qname)) != NULL && ep1->v.kid->type == SYM &&
137	>	(ep1->type == ':') <= (assign == ':')) {
138		ep2 = ep1->v.kid->sibling;
139		if (ep2->type == NUM) {
140		ep2->v.num = val;
#	Line 140 \| Line 153 \| double val;
153		ep2->type = NUM;
154		ep2->v.num = val;
155		addekid(ep1, ep2);
156	<	dremove(qname);
156	>	if (assign == ':')
157	>	dremove(qname);
158	>	else
159	>	dclear(qname);
160		dpush(qname, ep1);
161		}
162
163
164	<	dclear(name) /* delete variable definitions of name */
165	<	char *name;
164	>	void
165	>	dclear( /* delete variable definitions of name */
166	>	char *name
167	>	)
168		{
169	<	register EPNODE *ep;
169	>	EPNODE *ep;
170
171		while ((ep = dpop(name)) != NULL) {
172		if (ep->type == ':') {
#	Line 160 \| Line 178 \| *char name;**
178		}
179
180
181	<	dremove(name) /* delete all definitions of name */
182	<	char *name;
181	>	void
182	>	dremove( /* delete all definitions of name */
183	>	char *name
184	>	)
185		{
186	<	register EPNODE *ep;
186	>	EPNODE *ep;
187
188		while ((ep = dpop(name)) != NULL)
189		epfree(ep);
190		}
191
192
193	<	vardefined(name) /* return non-zero if variable defined */
194	<	char *name;
193	>	int
194	>	vardefined( /* return non-zero if variable defined */
195	>	char *name
196	>	)
197		{
198	<	register EPNODE *dp;
198	>	EPNODE *dp;
199
200		return((dp = dlookup(name)) != NULL && dp->v.kid->type == SYM);
201		}
202
203
204		char *
205	<	setcontext(ctx) /* set a new context path */
206	<	register char *ctx;
205	>	setcontext( /* set a new context path */
206	>	char *ctx
207	>	)
208		{
209	<	register char *cpp;
209	>	char *cpp;
210
211		if (ctx == NULL)
212		return(context); /* just asking */
213	+	while (*ctx == CNTXMARK)
214	+	ctx++; /* skip past marks */
215		if (!*ctx) {
216	<	context[0] = '\0'; /* clear context */
216	>	context[0] = '\0'; /* empty means clear context */
217		return(context);
218		}
219	<	cpp = context; /* else copy it (carefully!) */
220	<	if (*ctx != CNTXMARK)
221	<	cpp++ = CNTXMARK; / make sure there's a mark */
222	<	do {
223	<	if (cpp >= context+MAXWORD-1) {
199	<	*cpp = '\0';
200	<	wputs(context);
201	<	wputs(": context path too long\n");
202	<	return(NULL);
203	<	}
219	>	cpp = context; /* start context with mark */
220	>	*cpp++ = CNTXMARK;
221	>	do { /* carefully copy new context */
222	>	if (cpp >= context+MAXCNTX)
223	>	break; /* just copy what we can */
224		if (isid(*ctx))
225		cpp++ = ctx++;
226		else {
227		*cpp++ = '_'; ctx++;
228		}
229		} while (*ctx);
230	+	while (cpp[-1] == CNTXMARK) /* cannot end in context mark */
231	+	cpp--;
232		*cpp = '\0';
233		return(context);
234		}
235
236
237		char *
238	<	qualname(nam, lvl) /* get qualified name */
239	<	register char *nam;
240	<	int lvl;
238	>	pushcontext( /* push on another context */
239	>	char *ctx
240	>	)
241		{
242	<	static char nambuf[MAXWORD];
243	<	register char cp = nambuf, cpp = context;
244	<	/* check for repeat call */
245	<	if (nam == nambuf)
246	<	return(lvl > 0 ? NULL : nambuf);
242	>	char oldcontext[MAXCNTX+1];
243	>	int n;
244	>
245	>	strcpy(oldcontext, context); /* save old context */
246	>	setcontext(ctx); /* set new context */
247	>	n = strlen(context); /* tack on old */
248	>	if (n+strlen(oldcontext) > MAXCNTX) {
249	>	strncpy(context+n, oldcontext, MAXCNTX-n);
250	>	context[MAXCNTX] = '\0';
251	>	} else
252	>	strcpy(context+n, oldcontext);
253	>	return(context);
254	>	}
255	>
256	>
257	>	char *
258	>	popcontext(void) /* pop off top context */
259	>	{
260	>	char cp1, cp2;
261	>
262	>	if (!context[0]) /* nothing left to pop */
263	>	return(context);
264	>	cp2 = context; /* find mark */
265	>	while (++cp2 && cp2 != CNTXMARK)
266	>	;
267	>	cp1 = context; /* copy tail to front */
268	>	while ( (cp1++ = cp2++) )
269	>	;
270	>	return(context);
271	>	}
272	>
273	>
274	>	char *
275	>	qualname( /* get qualified name */
276	>	char *nam,
277	>	int lvl
278	>	)
279	>	{
280	>	static char nambuf[RMAXWORD+1];
281	>	char cp = nambuf, cpp;
282	>	/* check for explicit local */
283	>	if (*nam == CNTXMARK)
284	>	if (lvl > 0) /* only action is to refuse search */
285	>	return(NULL);
286	>	else
287	>	nam++;
288	>	else if (nam == nambuf) /* check for repeat call */
289	>	return(lvl > 0 ? NULL : nam);
290		/* copy name to static buffer */
291		while (*nam) {
292	<	if (cp >= nambuf+MAXWORD-1)
292	>	if (cp >= nambuf+RMAXWORD)
293		goto toolong;
294	<	if ((cp++ = nam++) == CNTXMARK)
230	<	cpp = NULL; /* flag a qualified name */
294	>	cp++ = nam++;
295		}
296	<	if (cpp == NULL) {
296	>	/* check for explicit global */
297	>	if (cp > nambuf && cp[-1] == CNTXMARK) {
298		if (lvl > 0)
299	<	return(NULL); /* no higher level */
300	<	if (cp[-1] == CNTXMARK) {
301	<	cp--; cpp = context; /* current context explicitly */
302	<	} else
303	<	cpp = ""; /* else fully qualified */
304	<	} else /* else skip the requested levels */
305	<	while (lvl-- > 0) {
306	<	if (!*cpp)
307	<	return(NULL); /* return NULL if past global level */
308	<	while (++cpp && cpp != CNTXMARK)
309	<	;
245	<	}
299	>	return(NULL);
300	>	*--cp = '\0';
301	>	return(nambuf); /* already qualified */
302	>	}
303	>	cpp = context; /* else skip the requested levels */
304	>	while (lvl-- > 0) {
305	>	if (!*cpp)
306	>	return(NULL); /* return NULL if past global level */
307	>	while (++cpp && cpp != CNTXMARK)
308	>	;
309	>	}
310		while (cpp) { / copy context to static buffer */
311	<	if (cp >= nambuf+MAXWORD-1)
311	>	if (cp >= nambuf+RMAXWORD)
312		goto toolong;
313		cp++ = cpp++;
314		}
251	–	*cp = '\0';
252	–	return(nambuf); /* return qualified name */
315		toolong:
316		*cp = '\0';
317	<	eputs(nambuf);
256	<	eputs(": name too long\n");
257	<	quit(1);
317	>	return(nambuf); /* return qualified name */
318		}
319
320
321	<	incontext(qn) /* is qualified name in current context? */
322	<	register char *qn;
321	>	int
322	>	incontext( /* is qualified name in current context? */
323	>	char *qn
324	>	)
325		{
326	+	if (!context[0]) /* global context accepts all */
327	+	return(1);
328		while (qn && qn != CNTXMARK) /* find context mark */
329	<	;
329	>	qn++;
330		return(!strcmp(qn, context));
331		}
332
333
334	<	#ifdef OUTCHAN
335	<	chanout(cs) /* set output channels */
336	<	int (*cs)();
334	>	void
335	>	chanout( /* set output channels */
336	>	void (*cs)(int n, double v)
337	>	)
338		{
339	<	register EPNODE *ep;
339	>	EPNODE *ep;
340
341		for (ep = outchan; ep != NULL; ep = ep->sibling)
342		(*cs)(ep->v.kid->v.chan, evalue(ep->v.kid->sibling));
343
344		}
280	–	#endif
345
346
347	<	dcleanup(lvl) /* clear definitions (0->vars,1->output,2->consts) */
348	<	int lvl;
347	>	void
348	>	dcleanup( /* clear definitions (0->vars,1->output,2->consts) */
349	>	int lvl
350	>	)
351		{
352	<	register int i;
353	<	register VARDEF *vp;
354	<	register EPNODE *ep;
352	>	int i;
353	>	VARDEF *vp;
354	>	EPNODE *ep;
355		/* if context is global, clear all */
356		for (i = 0; i < NHASH; i++)
357		for (vp = hashtbl[i]; vp != NULL; vp = vp->next)
358	<	if (!context[0] \|\| incontext(vp->name))
358	>	if (incontext(vp->name)) {
359		if (lvl >= 2)
360		dremove(vp->name);
361		else
362		dclear(vp->name);
363	<	#ifdef OUTCHAN
363	>	}
364		if (lvl >= 1) {
365		for (ep = outchan; ep != NULL; ep = ep->sibling)
366		epfree(ep);
367		outchan = NULL;
368		}
303	–	#endif
369		}
370
371
372		EPNODE *
373	<	dlookup(name) /* look up a definition */
374	<	char *name;
373	>	dlookup( /* look up a definition */
374	>	char *name
375	>	)
376		{
377	<	register VARDEF *vp;
377	>	VARDEF *vp;
378
379		if ((vp = varlookup(name)) == NULL)
380	<	return(NULL);
380	>	return(NULL);
381		return(vp->def);
382		}
383
384
385		VARDEF *
386	<	varlookup(name) /* look up a variable */
387	<	char *name;
386	>	varlookup( /* look up a variable */
387	>	char *name
388	>	)
389		{
390	<	int lvl = 0;
391	<	register char *qname;
392	<	register VARDEF *vp;
393	<	/* find most qualified match */
390	>	int lvl = 0;
391	>	char *qname;
392	>	VARDEF *vp;
393	>	/* find most qualified match */
394		while ((qname = qualname(name, lvl++)) != NULL)
395		for (vp = hashtbl[hash(qname)]; vp != NULL; vp = vp->next)
396		if (!strcmp(vp->name, qname))
#	Line 333 \| Line 400 \| *char name;**
400
401
402		VARDEF *
403	<	varinsert(name) /* get a link to a variable */
404	<	char *name;
403	>	varinsert( /* get a link to a variable */
404	>	char *name
405	>	)
406		{
407	<	register VARDEF *vp;
408	<	int hv;
407	>	VARDEF *vp;
408	>	int hv;
409
410		if ((vp = varlookup(name)) != NULL) {
411		vp->nlinks++;
412		return(vp);
413		}
346	–	name = qualname(name, 0); /* use fully qualified name */
347	–	hv = hash(name);
414		vp = (VARDEF *)emalloc(sizeof(VARDEF));
415	+	vp->lib = liblookup(name);
416	+	if (vp->lib == NULL) /* if name not in library */
417	+	name = qualname(name, 0); /* use fully qualified version */
418	+	hv = hash(name);
419		vp->name = savestr(name);
420		vp->nlinks = 1;
421		vp->def = NULL;
352	–	vp->lib = NULL;
422		vp->next = hashtbl[hv];
423		hashtbl[hv] = vp;
424		return(vp);
425		}
426
427
428	<	varfree(ln) /* release link to variable */
429	<	register VARDEF *ln;
428	>	void
429	>	libupdate( /* update library links */
430	>	char *fn
431	>	)
432		{
433	<	register VARDEF *vp;
434	<	int hv;
433	>	int i;
434	>	VARDEF *vp;
435	>	/* if fn is NULL then relink all */
436	>	for (i = 0; i < NHASH; i++)
437	>	for (vp = hashtbl[i]; vp != NULL; vp = vp->next)
438	>	if (vp->lib != NULL \|\| fn == NULL \|\| !strcmp(fn, vp->name))
439	>	vp->lib = liblookup(vp->name);
440	>	}
441
442	+
443	+	void
444	+	varfree( /* release link to variable */
445	+	VARDEF *ln
446	+	)
447	+	{
448	+	VARDEF *vp;
449	+	int hv;
450	+
451		if (--ln->nlinks > 0)
452	<	return; /* still active */
452	>	return; /* still active */
453
454		hv = hash(ln->name);
455		vp = hashtbl[hv];
456		if (vp == ln)
457	<	hashtbl[hv] = vp->next;
457	>	hashtbl[hv] = vp->next;
458		else {
459	<	while (vp->next != ln) /* must be in list */
460	<	vp = vp->next;
461	<	vp->next = ln->next;
459	>	while (vp->next != ln) /* must be in list */
460	>	vp = vp->next;
461	>	vp->next = ln->next;
462		}
463		freestr(ln->name);
464		efree((char *)ln);
#	Line 380 \| Line 466 \| *register VARDEF ln;**
466
467
468		EPNODE *
469	<	dfirst() /* return pointer to first definition */
469	>	dfirst(void) /* return pointer to first definition */
470		{
471		htndx = 0;
472		htpos = NULL;
387	–	#ifdef OUTCHAN
473		ochpos = outchan;
389	–	#endif
474		return(dnext());
475		}
476
477
478		EPNODE *
479	<	dnext() /* return pointer to next definition */
479	>	dnext(void) /* return pointer to next definition */
480		{
481	<	register EPNODE *ep;
481	>	EPNODE *ep;
482	>	char *nm;
483
484		while (htndx < NHASH) {
485	<	if (htpos == NULL)
486	<	htpos = hashtbl[htndx++];
487	<	while (htpos != NULL) {
488	<	ep = htpos->def;
489	<	htpos = htpos->next;
490	<	if (ep != NULL)
491	<	return(ep);
492	<	}
485	>	if (htpos == NULL)
486	>	htpos = hashtbl[htndx++];
487	>	while (htpos != NULL) {
488	>	ep = htpos->def;
489	>	nm = htpos->name;
490	>	htpos = htpos->next;
491	>	if (ep != NULL && incontext(nm))
492	>	return(ep);
493	>	}
494		}
409	–	#ifdef OUTCHAN
495		if ((ep = ochpos) != NULL)
496	<	ochpos = ep->sibling;
496	>	ochpos = ep->sibling;
497		return(ep);
413	–	#else
414	–	return(NULL);
415	–	#endif
498		}
499
500
501		EPNODE *
502	<	dpop(name) /* pop a definition */
503	<	char *name;
502	>	dpop( /* pop a definition */
503	>	char *name
504	>	)
505		{
506	<	register VARDEF *vp;
507	<	register EPNODE *dp;
506	>	VARDEF *vp;
507	>	EPNODE *dp;
508
509		if ((vp = varlookup(name)) == NULL \|\| vp->def == NULL)
510	<	return(NULL);
510	>	return(NULL);
511		dp = vp->def;
512		vp->def = dp->sibling;
513		varfree(vp);
#	Line 432 \| Line 515 \| *char name;**
515		}
516
517
518	<	dpush(nm, ep) /* push on a definition */
519	<	char *nm;
520	<	register EPNODE *ep;
518	>	void
519	>	dpush( /* push on a definition */
520	>	char *nm,
521	>	EPNODE *ep
522	>	)
523		{
524	<	register VARDEF *vp;
524	>	VARDEF *vp;
525
526		vp = varinsert(nm);
527		ep->sibling = vp->def;
#	Line 444 \| Line 529 \| *register EPNODE ep;**
529		}
530
531
532	<	#ifdef OUTCHAN
533	<	addchan(sp) /* add an output channel assignment */
534	<	EPNODE *sp;
532	>	void
533	>	addchan( /* add an output channel assignment */
534	>	EPNODE *sp
535	>	)
536		{
537	<	int ch = sp->v.kid->v.chan;
538	<	register EPNODE ep, epl;
537	>	int ch = sp->v.kid->v.chan;
538	>	EPNODE ep, epl;
539
540		for (epl = NULL, ep = outchan; ep != NULL; epl = ep, ep = ep->sibling)
541		if (ep->v.kid->v.chan >= ch) {
#	Line 472 \| Line 558 \| *EPNODE sp;**
558		sp->sibling = NULL;
559
560		}
475	–	#endif
561
562
563	<	getstatement() /* get next statement */
563	>	void
564	>	getstatement(void) /* get next statement */
565		{
566	<	register EPNODE *ep;
566	>	EPNODE *ep;
567		char *qname;
568	<	EPNODE *lastdef;
568	>	VARDEF *vdef;
569
570		if (nextc == ';') { /* empty statement */
571		scan();
572		return;
573		}
574	<	#ifdef OUTCHAN
575	<	if (nextc == '$') { /* channel assignment */
574	>	if (esupport&E_OUTCHAN &&
575	>	nextc == '$') { /* channel assignment */
576		ep = getchan();
577		addchan(ep);
578	<	} else
493	<	#endif
494	<	{ /* ordinary definition */
578	>	} else { /* ordinary definition */
579		ep = getdefn();
580		qname = qualname(dname(ep), 0);
581	<	#ifdef REDEFW
582	<	if ((lastdef = dlookup(qname)) != NULL) {
583	<	wputs(qname);
584	<	if (lastdef->type == ':')
585	<	wputs(": redefined constant expression\n");
586	<	else
587	<	wputs(": redefined\n");
581	>	if (esupport&E_REDEFW && (vdef = varlookup(qname)) != NULL) {
582	>	if (vdef->def != NULL && epcmp(ep, vdef->def)) {
583	>	wputs(qname);
584	>	if (vdef->def->type == ':')
585	>	wputs(": redefined constant expression\n");
586	>	else
587	>	wputs(": redefined\n");
588	>	} else if (ep->v.kid->type == FUNC && vdef->lib != NULL) {
589	>	wputs(qname);
590	>	wputs(": definition hides library function\n");
591	>	}
592		}
505	–	#ifdef FUNCTION
506	–	else if (ep->v.kid->type == FUNC && liblookup(qname) != NULL) {
507	–	wputs(qname);
508	–	wputs(": definition hides library function\n");
509	–	}
510	–	#endif
511	–	#endif
593		if (ep->type == ':')
594		dremove(qname);
595		else
#	Line 524 \| Line 605 \| *getstatement() / get next statement /*
605
606
607		EPNODE *
608	<	getdefn() /* A -> SYM = E1 */
609	<	/* SYM : E1 */
610	<	/* FUNC(SYM,..) = E1 */
611	<	/* FUNC(SYM,..) : E1 */
608	>	getdefn(void)
609	>	/* A -> SYM = E1 */
610	>	/* SYM : E1 */
611	>	/* FUNC(SYM,..) = E1 */
612	>	/* FUNC(SYM,..) : E1 */
613		{
614	<	register EPNODE ep1, ep2;
614	>	EPNODE ep1, ep2;
615
616	<	if (!isalpha(nextc))
616	>	if (!isalpha(nextc) && nextc != CNTXMARK)
617		syntax("illegal variable name");
618
619		ep1 = newnode();
620		ep1->type = SYM;
621		ep1->v.name = savestr(getname());
622
623	<	#ifdef FUNCTION
542	<	if (nextc == '(') {
623	>	if (esupport&E_FUNCTION && nextc == '(') {
624		ep2 = newnode();
625		ep2->type = FUNC;
626		addekid(ep2, ep1);
#	Line 547 \| Line 628 \| *getdefn() / A -> SYM = E1 /*
628		do {
629		scan();
630		if (!isalpha(nextc))
631	<	syntax("illegal variable name");
631	>	syntax("illegal parameter name");
632		ep2 = newnode();
633		ep2->type = SYM;
634		ep2->v.name = savestr(getname());
#	Line 557 \| Line 638 \| *getdefn() / A -> SYM = E1 /*
638		syntax("')' expected");
639		scan();
640		curfunc = ep1;
641	<	} else
561	<	curfunc = NULL;
562	<	#endif
641	>	}
642
643		if (nextc != '=' && nextc != ':')
644		syntax("'=' or ':' expected");
#	Line 570 \| Line 649 \| *getdefn() / A -> SYM = E1 /*
649		addekid(ep2, ep1);
650		addekid(ep2, getE1());
651
652	<	if (
574	<	#ifdef FUNCTION
575	<	ep1->type == SYM &&
576	<	#endif
577	<	ep1->sibling->type != NUM) {
652	>	if (ep1->type == SYM && ep1->sibling->type != NUM) {
653		ep1 = newnode();
654	<	ep1->type = TICK;
655	<	ep1->v.tick = -1;
654	>	ep1->type = CLKT;
655	>	ep1->v.tick = 0;
656		addekid(ep2, ep1);
657		ep1 = newnode();
658		ep1->type = NUM;
659		addekid(ep2, ep1);
660		}
661	+	curfunc = NULL;
662
663		return(ep2);
664		}
665
666
591	–	#ifdef OUTCHAN
667		EPNODE *
668	<	getchan() /* A -> $N = E1 */
668	>	getchan(void) /* A -> $N = E1 */
669		{
670	<	register EPNODE ep1, ep2;
670	>	EPNODE ep1, ep2;
671
672		if (nextc != '$')
673		syntax("missing '$'");
#	Line 613 \| Line 688 \| *getchan() / A -> $N = E1 /*
688
689		return(ep2);
690		}
616	–	#endif
691
692
693
#	Line 622 \| Line 696 \| *getchan() / A -> $N = E1 /*
696		*/
697
698
699	<	static double
700	<	dvalue(name, d) /* evaluate a variable */
627	<	char *name;
628	<	EPNODE *d;
699	>	static double /* evaluate a variable */
700	>	dvalue(char name, EPNODE d)
701		{
702	<	register EPNODE ep1, ep2;
702	>	EPNODE ep1, ep2;
703
704		if (d == NULL \|\| d->v.kid->type != SYM) {
705		eputs(name);
#	Line 638 \| Line 710 \| *EPNODE d;**
710		if (ep1->type == NUM)
711		return(ep1->v.num); /* return if number */
712		ep2 = ep1->sibling; /* check time */
713	<	if (ep2->v.tick < 0 \|\| ep2->v.tick < eclock) {
714	<	ep2->v.tick = d->type == ':' ? 1L<<30 : eclock;
713	>	if (eclock >= MAXCLOCK)
714	>	eclock = 1; /* wrap clock counter */
715	>	if (ep2->v.tick < MAXCLOCK &&
716	>	(ep2->v.tick == 0) \| (ep2->v.tick != eclock)) {
717	>	ep2->v.tick = d->type == ':' ? MAXCLOCK : eclock;
718		ep2 = ep2->sibling;
719		ep2->v.num = evalue(ep1); /* needs new value */
720		} else
721		ep2 = ep2->sibling; /* else reuse old value */
722
723		return(ep2->v.num);
649	–	}
650	–
651	–
652	–	static int
653	–	hash(s) /* hash a string */
654	–	register char *s;
655	–	{
656	–	register int rval = 0;
657	–
658	–	while (*s)
659	–	rval += *s++;
660	–
661	–	return(rval % NHASH);
724		}

Diff Legend

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

Comparing ray/src/common/caldefn.c (file contents): Revision 1.14 by greg, Thu Aug 8 12:12:16 1991 UTC vs. Revision 2.25 by greg, Sun Jul 29 22:10:45 2012 UTC

Diff Legend

Comparing ray/src/common/caldefn.c (file contents):
Revision 1.14 by greg, Thu Aug 8 12:12:16 1991 UTC vs.
Revision 2.25 by greg, Sun Jul 29 22:10:45 2012 UTC