ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/calexpr.c

Comparing ray/src/common/calexpr.c (file contents):
Revision 2.39 by greg, Sat Dec 28 18:05:13 2019 UTC vs.
Revision 2.55 by greg, Sat Dec 6 04:07:05 2025 UTC

#	Line 33 | Line 33 | static const char      RCSid[] = "$Id$";
33
34		#define  newnode()      (EPNODE *)ecalloc(1, sizeof(EPNODE))
35
36	<	#define  isdecimal(c)   (isdigit(c) || (c) == '.')
36	>	#define  isdecimal(c)   (isdigit(c) | ((c) == '.'))
37
38	<	static double  euminus(EPNODE *), eargument(EPNODE *), enumber(EPNODE *);
38	>	#define  envalue(ep)    ((ep)->type==NUM ? (ep)->v.num : evalue(ep))
39	>
40	>	static double  euminus(EPNODE *), enumber(EPNODE *);
41		static double  echannel(EPNODE *);
42		static double  eadd(EPNODE *), esubtr(EPNODE *),
43		emult(EPNODE *), edivi(EPNODE *),
#	Line 90 | Line 92 | eparse(                        /* parse an expression string */
92		EPNODE  *ep;
93
94		initstr(expr, NULL, 0);
95	<	curfunc = NULL;
95	>	ecurfunc = NULL;
96		ep = getE1();
97		if (nextc != EOF)
98	<	syntax("unexpected character");
98	>	esyntax("unexpected character");
99		return(ep);
100		}
101
#	Line 111 | Line 113 | eval(                  /* evaluate an expression string */
113		ep = eparse(expr);
114		esupport = prev_support;    /* as you were */
115		rval = evalue(ep);
116	<	epfree(ep);
116	>	epfree(ep,1);
117		return(rval);
118		}
119
#	Line 168 | Line 170 | epcmp(                 /* compare two expressions for equivalence */
170
171		void
172		epfree(                 /* free a parse tree */
173	<	EPNODE       *epar
173	>	EPNODE       *epar,
174	>	int         frep
175		)
176		{
177	<	EPNODE  *ep;
177	>	EPNODE      *ep;
178
179		switch (epar->type) {
180
#	Line 190 | Line 193 | epfree(                        /* free a parse tree */
193		break;
194
195		default:
196	<	while ((ep = epar->v.kid) != NULL) {
197	<	epar->v.kid = ep->sibling;
198	<	epfree(ep);
199	<	}
196	>	if (epar->nkids < 0) {
197	>	ep = epar->v.kid - epar->nkids;
198	>	while (ep > epar->v.kid)
199	>	epfree(--ep, 0);
200	>	efree(ep);      /* free array space */
201	>	} else
202	>	while ((ep = epar->v.kid) != NULL) {
203	>	epar->v.kid = ep->sibling;
204	>	epfree(ep, 1);
205	>	}
206		break;
207
208		}
209	+	if (frep)
210	+	efree(epar);
211	+	else
212	+	memset(epar, 0, sizeof(EPNODE));
213	+	}
214
215	<	efree((char *)epar);
215	>
216	>	static void
217	>	epflatten(                      /* flatten hierarchies for '+', '*' */
218	>	EPNODE *epar
219	>	)
220	>	{
221	>	EPNODE      *ep, *ep1;
222	>	double      combined;
223	>
224	>	if (epar->nkids <= 0)       /* can't handle array allocations */
225	>	return;
226	>
227	>	for (ep = epar->v.kid; ep != NULL; ep = ep->sibling)
228	>	while ((ep->type == epar->type) & (ep->nkids > 0)) {
229	>	ep1 = ep->v.kid;
230	>	while (ep1->sibling != NULL)
231	>	ep1 = ep1->sibling;
232	>	ep1->sibling = ep->sibling;
233	>	epar->nkids += ep->nkids - 1;
234	>	ep1 = ep->v.kid;
235	>	*ep = *ep1;
236	>	efree(ep1);         /* not epfree()! */
237	>	}
238	>	if (!(esupport & E_RCONST))
239	>	return;
240	>	ep1 = NULL;                 /* combine constants in sum/product */
241	>	for (ep = epar->v.kid; ep != NULL; ep = ep->sibling)
242	>	if (ep->type == NUM) {
243	>	if (ep1 == NULL) combined = (ep1 = ep)->v.num;
244	>	else if (epar->type == '+') combined += ep->v.num;
245	>	else /* epar->type=='*' */ combined *= ep->v.num;
246	>	}
247	>	if (ep1 == NULL)
248	>	return;
249	>	ep1->v.num = combined;      /* assumes commutative property, also */
250	>	while (ep1->sibling != NULL)
251	>	if (ep1->sibling->type == NUM) {
252	>	ep = ep1->sibling;
253	>	ep1->sibling = ep->sibling;
254	>	epar->nkids--;
255	>	efree(ep);          /* drop subsumed constant */
256	>	} else
257	>	ep1 = ep1->sibling;
258	>
259	>	if (epar->nkids == 1) {     /* late constant expression? */
260	>	ep = epar->v.kid;
261	>	*epar = *ep;
262	>	efree(ep);
263	>	}
264		}
265
266	<	/* the following used to be a switch */
267	<	static double
268	<	eargument(
269	<	EPNODE      *ep
266	>
267	>	void
268	>	epoptimize(                     /* flatten operations, lists -> arrays */
269	>	EPNODE  *epar
270		)
271		{
272	<	return(argument(ep->v.chan));
272	>	EPNODE      *ep;
273	>
274	>	if ((epar->type == '+') | (epar->type == '*'))
275	>	epflatten(epar);        /* flatten associative operations */
276	>
277	>	if (epar->nkids)            /* do children if any */
278	>	for (ep = epar->v.kid; ep != NULL; ep = ep->sibling)
279	>	epoptimize(ep);
280	>
281	>	if (epar->nkids > 4) {      /* make list into array if > 4 kids */
282	>	int     n = 1;
283	>	epar->v.kid = (EPNODE *)erealloc(epar->v.kid,
284	>	sizeof(EPNODE)*epar->nkids);
285	>	while (n < epar->nkids) {
286	>	ep = epar->v.kid[n-1].sibling;
287	>	epar->v.kid[n] = *ep;
288	>	efree(ep);          /* not epfree()! */
289	>	epar->v.kid[n-1].sibling = epar->v.kid + n;
290	>	n++;
291	>	}
292	>	epar->nkids = -n;
293	>	}
294		}
295
296	+	/* the following used to be a switch */
297		static double
298		enumber(
299		EPNODE      *ep
#	Line 241 | Line 325 | eadd(
325		EPNODE      *ep
326		)
327		{
328	+	double  sum = 0;
329		EPNODE  *ep1 = ep->v.kid;
330
331	<	return(evalue(ep1) + evalue(ep1->sibling));
331	>	do
332	>	sum += envalue(ep1);
333	>	while ((ep1 = ep1->sibling) != NULL);
334	>
335	>	return(sum);
336		}
337
338		static double
#	Line 252 | Line 341 | esubtr(
341		)
342		{
343		EPNODE  *ep1 = ep->v.kid;
344	+	EPNODE  *ep2 = ep1->sibling;
345
346	<	return(evalue(ep1) - evalue(ep1->sibling));
346	>	return(envalue(ep1) - envalue(ep2));
347		}
348
349		static double
#	Line 261 | Line 351 | emult(
351		EPNODE      *ep
352		)
353		{
354	+	double  prod = 1;
355		EPNODE  *ep1 = ep->v.kid;
356
357	<	return(evalue(ep1) * evalue(ep1->sibling));
357	>	do
358	>	prod *= envalue(ep1);
359	>	while ((ep1 = ep1->sibling) != NULL);
360	>
361	>	return(prod);
362		}
363
364		static double
#	Line 272 | Line 367 | edivi(
367		)
368		{
369		EPNODE  *ep1 = ep->v.kid;
370	<	double  d;
370	>	double  den = evalue(ep1->sibling);
371
372	<	d = evalue(ep1->sibling);
278	<	if (d == 0.0) {
372	>	if (den == 0.0) {
373		wputs("Division by zero\n");
374		errno = ERANGE;
375		return(0.0);
376		}
377	<	return(evalue(ep1) / d);
377	>	return(envalue(ep1) / den);
378		}
379
380		static double
#	Line 303 | Line 397 | epow(
397		errno = ERANGE;
398		}
399		#endif
400	<	if (errno == EDOM || errno == ERANGE) {
400	>	if ((errno == EDOM) | (errno == ERANGE)) {
401		wputs("Illegal power\n");
402		return(0.0);
403		}
#	Line 328 | Line 422 | ekid(                  /* return pointer to a node's nth kid */
422		int  n
423		)
424		{
425	<
426	<	for (ep = ep->v.kid; ep != NULL; ep = ep->sibling)
427	<	if (--n < 0)
428	<	break;
429	<
425	>	if (ep->nkids < 0) {        /* allocated array? */
426	>	if (n >= -ep->nkids)
427	>	return(NULL);
428	>	return(ep->v.kid + n);
429	>	}
430	>	ep = ep->v.kid;             /* else get from list */
431	>	while (n-- > 0)
432	>	if ((ep = ep->sibling) == NULL)
433	>	break;
434		return(ep);
435		}
436
437
340	–	int
341	–	nekids(                 /* return # of kids for node ep */
342	–	EPNODE       *ep
343	–	)
344	–	{
345	–	int  n = 0;
346	–
347	–	for (ep = ep->v.kid; ep != NULL; ep = ep->sibling)
348	–	n++;
349	–
350	–	return(n);
351	–	}
352	–
353	–
438		void
439		initfile(               /* prepare input file */
440		FILE  *fp,
#	Line 366 | Line 450 | initfile(              /* prepare input file */
450		lineno = ln;
451		linepos = 0;
452		inpbuf[0] = '\0';
453	<	scan();
453	>	escan();
454		}
455
456
#	Line 382 | Line 466 | initstr(               /* prepare input string */
466		lineno = ln;
467		linbuf = s;
468		linepos = 0;
469	<	scan();
469	>	escan();
470		}
471
472
#	Line 402 | Line 486 | getscanpos(    /* return current scan position */
486
487
488		int
489	<	scan(void)              /* scan next character, return literal next */
489	>	escan(void)             /* scan next character, return literal next */
490		{
491		int  lnext = 0;
492
#	Line 424 | Line 508 | scan(void)             /* scan next character, return literal nex
508		break;
509		}
510		if (nextc == '{') {
511	<	scan();
511	>	escan();
512		while (nextc != '}')
513		if (nextc == EOF)
514	<	syntax("'}' expected");
514	>	esyntax("'}' expected");
515		else
516	<	scan();
517	<	scan();
516	>	escan();
517	>	escan();
518		}
519		} while (isspace(nextc));
520		return(lnext);
#	Line 465 | Line 549 | long2ascii(                          /* convert long to ascii */
549
550
551		void
552	<	syntax(                 /* report syntax error and quit */
552	>	esyntax(                        /* report syntax error and quit */
553		char  *err
554		)
555		{
556		int  i;
557
558	<	if (infile != NULL || lineno != 0) {
558	>	if ((infile != NULL) | (lineno != 0)) {
559		if (infile != NULL) eputs(infile);
560		if (lineno != 0) {
561		eputs(infile != NULL ? ", line " : "line ");
#	Line 494 | Line 578 | syntax(                        /* report syntax error and quit */
578		void
579		addekid(                        /* add a child to ep */
580		EPNODE       *ep,
581	<	EPNODE      *ekid
581	>	EPNODE      *ek
582		)
583		{
584	+	if (ep->nkids < 0) {
585	+	eputs("Cannot add kid to EPNODE array\n");
586	+	quit(1);
587	+	}
588	+	ep->nkids++;
589		if (ep->v.kid == NULL)
590	<	ep->v.kid = ekid;
590	>	ep->v.kid = ek;
591		else {
592		for (ep = ep->v.kid; ep->sibling != NULL; ep = ep->sibling)
593		;
594	<	ep->sibling = ekid;
594	>	ep->sibling = ek;
595		}
596	<	ekid->sibling = NULL;
596	>	ek->sibling = NULL;         /* shouldn't be necessary */
597		}
598
599
#	Line 515 | Line 604 | getname(void)                  /* scan an identifier */
604		int  i, lnext;
605
606		lnext = nextc;
607	<	for (i = 0; i < RMAXWORD && isid(lnext); i++, lnext = scan())
607	>	for (i = 0; i < RMAXWORD && isid(lnext); i++, lnext = escan())
608		str[i] = lnext;
609		str[i] = '\0';
610		while (isid(lnext))         /* skip rest of name */
611	<	lnext = scan();
611	>	lnext = escan();
612
613		return(str);
614		}
#	Line 534 | Line 623 | getinum(void)                  /* scan a positive integer */
623		lnext = nextc;
624		while (isdigit(lnext)) {
625		n = n * 10 + lnext - '0';
626	<	lnext = scan();
626	>	lnext = escan();
627		}
628		return(n);
629		}
#	Line 550 | Line 639 | getnum(void)                   /* scan a positive float */
639		lnext = nextc;
640		while (isdigit(lnext) && i < RMAXWORD) {
641		str[i++] = lnext;
642	<	lnext = scan();
642	>	lnext = escan();
643		}
644	<	if (lnext == '.' && i < RMAXWORD) {
644	>	if ((lnext == '.') & (i < RMAXWORD)) {
645		str[i++] = lnext;
646	<	lnext = scan();
646	>	lnext = escan();
647		if (i == 1 && !isdigit(lnext))
648	<	syntax("badly formed number");
648	>	esyntax("badly formed number");
649		while (isdigit(lnext) && i < RMAXWORD) {
650		str[i++] = lnext;
651	<	lnext = scan();
651	>	lnext = escan();
652		}
653		}
654		if ((lnext == 'e') | (lnext == 'E') && i < RMAXWORD) {
655		str[i++] = lnext;
656	<	lnext = scan();
656	>	lnext = escan();
657		if ((lnext == '-') | (lnext == '+') && i < RMAXWORD) {
658		str[i++] = lnext;
659	<	lnext = scan();
659	>	lnext = escan();
660		}
661		if (!isdigit(lnext))
662	<	syntax("missing exponent");
662	>	esyntax("missing exponent");
663		while (isdigit(lnext) && i < RMAXWORD) {
664		str[i++] = lnext;
665	<	lnext = scan();
665	>	lnext = escan();
666		}
667		}
668		str[i] = '\0';
#	Line 589 | Line 678 | getE1(void)                    /* E1 -> E1 ADDOP E2 */
678		EPNODE  *ep1, *ep2;
679
680		ep1 = getE2();
681	<	while (nextc == '+' || nextc == '-') {
681	>	while ((nextc == '+') | (nextc == '-')) {
682		ep2 = newnode();
683		ep2->type = nextc;
684	<	scan();
684	>	escan();
685		addekid(ep2, ep1);
686		addekid(ep2, getE2());
687		if (esupport&E_RCONST &&
688	<	ep1->type == NUM && ep1->sibling->type == NUM)
688	>	(ep1->type == NUM) & (ep1->sibling->type == NUM))
689		ep2 = rconst(ep2);
690		ep1 = ep2;
691		}
#	Line 611 | Line 700 | getE2(void)                    /* E2 -> E2 MULOP E3 */
700		EPNODE  *ep1, *ep2;
701
702		ep1 = getE3();
703	<	while (nextc == '*' || nextc == '/') {
703	>	while ((nextc == '*') | (nextc == '/')) {
704		ep2 = newnode();
705		ep2->type = nextc;
706	<	scan();
706	>	escan();
707		addekid(ep2, ep1);
708		addekid(ep2, getE3());
709		if (esupport&E_RCONST) {
710	<	EPNODE  *ep3 = ep1->sibling;
711	<	if (ep1->type == NUM && ep3->type == NUM) {
712	<	ep2 = rconst(ep2);
713	<	} else if (ep3->type == NUM) {
714	<	if (ep2->type == '/') {
715	<	if (ep3->v.num == 0)
716	<	syntax("divide by zero constant");
717	<	ep2->type = '*';        /* for speed */
718	<	ep3->v.num = 1./ep3->v.num;
719	<	} else if (ep3->v.num == 0) {
720	<	ep1->sibling = NULL;    /* (E2 * 0) */
721	<	epfree(ep2);
722	<	ep2 = ep3;
634	<	}
635	<	} else if (ep1->type == NUM && ep1->v.num == 0) {
636	<	epfree(ep3);            /* (0 * E3) or (0 / E3) */
637	<	ep1->sibling = NULL;
638	<	efree((char *)ep2);
639	<	ep2 = ep1;
710	>	EPNODE      *ep3 = ep1->sibling;
711	>	if ((ep1->type == NUM) & (ep3->type == NUM)) {
712	>	ep2 = rconst(ep2);
713	>	} else if (ep3->type == NUM) {
714	>	if (ep2->type == '/') {
715	>	if (ep3->v.num == 0)
716	>	esyntax("divide by zero constant");
717	>	ep2->type = '*';            /* for speed */
718	>	ep3->v.num = 1./ep3->v.num;
719	>	} else if (ep3->v.num == 0) {
720	>	ep1->sibling = NULL;        /* (E2 * 0) */
721	>	epfree(ep2,1);
722	>	ep2 = ep3;
723		}
724	+	} else if (ep1->type == NUM && ep1->v.num == 0) {
725	+	epfree(ep3,1);                  /* (0 * E3) or (0 / E3) */
726	+	ep1->sibling = NULL;
727	+	efree(ep2);
728	+	ep2 = ep1;
729	+	}
730		}
731		ep1 = ep2;
732		}
#	Line 656 | Line 745 | getE3(void)                    /* E3 -> E4 ^ E3 */
745		return(ep1);
746		ep2 = newnode();
747		ep2->type = nextc;
748	<	scan();
748	>	escan();
749		addekid(ep2, ep1);
750		addekid(ep2, getE3());
751		if (esupport&E_RCONST) {
752	<	EPNODE  *ep3 = ep1->sibling;
753	<	if (ep1->type == NUM && ep3->type == NUM) {
754	<	ep2 = rconst(ep2);
755	<	} else if (ep1->type == NUM && ep1->v.num == 0) {
756	<	epfree(ep3);            /* (0 ^ E3) */
757	<	ep1->sibling = NULL;
758	<	efree((char *)ep2);
759	<	ep2 = ep1;
760	<	} else if ((ep3->type == NUM && ep3->v.num == 0) ||
752	>	EPNODE      *ep3 = ep1->sibling;
753	>	if ((ep1->type == NUM) & (ep3->type == NUM)) {
754	>	ep2 = rconst(ep2);
755	>	} else if (ep1->type == NUM && ep1->v.num == 0) {
756	>	epfree(ep3,1);          /* (0 ^ E3) */
757	>	ep1->sibling = NULL;
758	>	efree(ep2);
759	>	ep2 = ep1;
760	>	} else if ((ep3->type == NUM && ep3->v.num == 0) |
761		(ep1->type == NUM && ep1->v.num == 1)) {
762	<	epfree(ep2);            /* (E4 ^ 0) or (1 ^ E3) */
763	<	ep2 = newnode();
764	<	ep2->type = NUM;
765	<	ep2->v.num = 1;
766	<	}
762	>	epfree(ep2,0);          /* (E4 ^ 0) or (1 ^ E3) */
763	>	ep2->type = NUM;
764	>	ep2->v.num = 1;
765	>	} else if (ep3->type == NUM && ep3->v.num == 1) {
766	>	efree(ep3);             /* (E4 ^ 1) */
767	>	ep1->sibling = NULL;
768	>	efree(ep2);
769	>	ep2 = ep1;
770	>	}
771		}
772		return(ep2);
773		}
#	Line 687 | Line 780 | getE4(void)                    /* E4 -> ADDOP E5 */
780		EPNODE  *ep1, *ep2;
781
782		if (nextc == '-') {
783	<	scan();
783	>	escan();
784		ep2 = getE5();
785		if (ep2->type == NUM) {
786	<	ep2->v.num = -ep2->v.num;
787	<	return(ep2);
786	>	ep2->v.num = -ep2->v.num;
787	>	return(ep2);
788		}
789		if (ep2->type == UMINUS) {      /* don't generate -(-E5) */
790		ep1 = ep2->v.kid;
791	<	efree((char *)ep2);
791	>	efree(ep2);
792		return(ep1);
793		}
794		ep1 = newnode();
#	Line 704 | Line 797 | getE4(void)                    /* E4 -> ADDOP E5 */
797		return(ep1);
798		}
799		if (nextc == '+')
800	<	scan();
800	>	escan();
801		return(getE5());
802		}
803
#	Line 722 | Line 815 | getE5(void)                    /* E5 -> (E1) */
815		EPNODE  *ep1, *ep2;
816
817		if (nextc == '(') {
818	<	scan();
819	<	ep1 = getE1();
820	<	if (nextc != ')')
821	<	syntax("')' expected");
822	<	scan();
823	<	return(ep1);
818	>	escan();
819	>	ep1 = getE1();
820	>	if (nextc != ')')
821	>	esyntax("')' expected");
822	>	escan();
823	>	return(ep1);
824		}
732	–
825		if (esupport&E_INCHAN && nextc == '$') {
826	<	scan();
827	<	ep1 = newnode();
828	<	ep1->type = CHAN;
829	<	ep1->v.chan = getinum();
830	<	return(ep1);
826	>	escan();
827	>	ep1 = newnode();
828	>	ep1->type = CHAN;
829	>	ep1->v.chan = getinum();
830	>	return(ep1);
831		}
740	–
832		if (esupport&(E_VARIABLE|E_FUNCTION) &&
833	<	(isalpha(nextc) || nextc == CNTXMARK)) {
834	<	nam = getname();
835	<	ep1 = NULL;
836	<	if ((esupport&(E_VARIABLE|E_FUNCTION)) == (E_VARIABLE|E_FUNCTION)
837	<	&& curfunc != NULL)
838	<	for (i = 1, ep2 = curfunc->v.kid->sibling;
839	<	ep2 != NULL; i++, ep2 = ep2->sibling)
840	<	if (!strcmp(ep2->v.name, nam)) {
750	<	ep1 = newnode();
751	<	ep1->type = ARG;
752	<	ep1->v.chan = i;
753	<	break;
754	<	}
755	<	if (ep1 == NULL) {
833	>	(isalpha(nextc) | (nextc == CNTXMARK))) {
834	>	nam = getname();
835	>	ep1 = NULL;
836	>	if ((esupport&(E_VARIABLE|E_FUNCTION)) == (E_VARIABLE|E_FUNCTION)
837	>	&& ecurfunc != NULL)
838	>	for (i = 1, ep2 = ecurfunc->v.kid->sibling;
839	>	ep2 != NULL; i++, ep2 = ep2->sibling)
840	>	if (!strcmp(ep2->v.name, nam)) {
841		ep1 = newnode();
842	<	ep1->type = VAR;
843	<	ep1->v.ln = varinsert(nam);
844	<	}
845	<	if (esupport&E_FUNCTION && nextc == '(') {
846	<	ep2 = newnode();
847	<	ep2->type = FUNC;
848	<	addekid(ep2, ep1);
849	<	ep1 = ep2;
850	<	do {
851	<	scan();
852	<	addekid(ep1, getE1());
853	<	} while (nextc == ',');
854	<	if (nextc != ')')
855	<	syntax("')' expected");
856	<	scan();
857	<	} else if (!(esupport&E_VARIABLE))
858	<	syntax("'(' expected");
859	<	if (esupport&E_RCONST && isconstvar(ep1))
860	<	ep1 = rconst(ep1);
861	<	return(ep1);
842	>	ep1->type = ARG;
843	>	ep1->v.chan = i;
844	>	break;
845	>	}
846	>	if (ep1 == NULL) {
847	>	ep1 = newnode();
848	>	ep1->type = VAR;
849	>	ep1->v.ln = varinsert(nam);
850	>	}
851	>	if (esupport&E_FUNCTION && nextc == '(') {
852	>	ep2 = newnode();
853	>	ep2->type = FUNC;
854	>	addekid(ep2, ep1);
855	>	ep1 = ep2;
856	>	do {
857	>	escan();
858	>	addekid(ep1, getE1());
859	>	} while (nextc == ',');
860	>	if (nextc != ')')
861	>	esyntax("')' expected");
862	>	escan();
863	>	} else if (!(esupport&E_VARIABLE))
864	>	esyntax("'(' expected");
865	>	if (esupport&E_RCONST && isconstvar(ep1))
866	>	ep1 = rconst(ep1);
867	>	return(ep1);
868		}
778	–
869		if (isdecimal(nextc)) {
870	<	ep1 = newnode();
871	<	ep1->type = NUM;
872	<	ep1->v.num = getnum();
873	<	return(ep1);
870	>	ep1 = newnode();
871	>	ep1->type = NUM;
872	>	ep1->v.num = getnum();
873	>	return(ep1);
874		}
875	<	syntax("unexpected character");
875	>	esyntax("unexpected character");
876		return NULL; /* pro forma return */
877		}
878
#	Line 798 | Line 888 | rconst(                        /* reduce a constant expression */
888		ep->type = NUM;
889		errno = 0;
890		ep->v.num = evalue(epar);
891	<	if (errno == EDOM || errno == ERANGE)
892	<	syntax("bad constant expression");
893	<	epfree(epar);
891	>	if ((errno == EDOM) | (errno == ERANGE))
892	>	esyntax("bad constant expression");
893	>	epfree(epar,1);
894
895		return(ep);
896		}
#	Line 838 | Line 928 | isconstfun(                    /* is ep linked to a constant function?
928		)
929		{
930		EPNODE  *dp;
931	<	LIBR  *lp;
931	>	ELIBR  *lp;
932
933		if (ep->type != VAR)
934		return(0);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)