ViewVC Help

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

root/Development/ray/src/rt/func.c

Comparing ray/src/rt/func.c (file contents):
Revision 2.30 by greg, Wed May 20 13:16:20 2015 UTC vs.
Revision 2.34 by greg, Sat May 13 00:26:27 2017 UTC

#	Line 37 | Line 37 | static double  l_erf(char *), l_erfc(char *), l_arg(ch
37
38
39		void
40	<	initfunc()      /* initialize function evaluation */
40	>	initfunc(void)  /* initialize function evaluation */
41		{
42		if (!rayinitcal[0])     /* already done? */
43		return;
#	Line 67 | Line 67 | initfunc()     /* initialize function evaluation */
67		void
68		set_eparams(char *prms)
69		{
70	<	static char     *last_params = NULL;
70	>	static char     *last_params;
71	>	static int      lplen = 0;
72	>	int             len;
73		char            vname[RMAXWORD];
74		double          value;
75		char            *cpd;
76		/* check if already set */
77	<	if ((prms == NULL) | (prms == last_params))
77	>	if (prms == NULL || !*prms)
78		return;
79	<	if (last_params != NULL && !strcmp(prms, last_params))
79	>	if (lplen && !strcmp(prms, last_params))
80		return;
81	<	last_params = prms;             /* assign each variable */
81	>	len = strlen(prms);             /* record new settings */
82	>	if ((lplen != 0) & (lplen <= len)) {
83	>	free(last_params);
84	>	lplen = 0;
85	>	}
86	>	if (!lplen) {
87	>	lplen = len + 100;
88	>	last_params = (char *)malloc(lplen);
89	>	if (last_params == NULL)
90	>	error(SYSTEM, "out of memory in set_eparams()");
91	>	}
92	>	strcpy(last_params, prms);
93	>	/* assign each variable */
94		while (*prms) {
95		if (isspace(*prms)) {
96		++prms; continue;
#	Line 85 | Line 99 | set_eparams(char *prms)
99		goto bad_params;
100		cpd = vname;
101		while (*prms && (*prms != '=') & !isspace(*prms)) {
102	<	if (!isid(*prms))
102	>	if (!isid(*prms) | (cpd-vname >= RMAXWORD-1))
103		goto bad_params;
104		*cpd++ = *prms++;
105		}
92	–	if (cpd == vname)
93	–	goto bad_params;
106		*cpd = '\0';
107		while (isspace(*prms)) prms++;
108		if (*prms++ != '=')
#	Line 102 | Line 114 | set_eparams(char *prms)
114		prms += (*prms == ',') | (*prms == ';');
115		varset(vname, '=', value);
116		}
117	+	eclock++;               /* notify expression evaluator */
118		return;
119		bad_params:
120		sprintf(errmsg, "bad parameter list '%s'", last_params);
#	Line 286 | Line 299 | loadfunc(                      /* load definition file */
299
300		if ((ffname = getpath(fname, getrlibpath(), R_OK)) == NULL) {
301		sprintf(errmsg, "cannot find function file \"%s\"", fname);
302	<	error(USER, errmsg);
302	>	error(SYSTEM, errmsg);
303		}
304		fcompile(ffname);
305		}
#	Line 298 | Line 311 | l_arg(char *nm)                        /* return nth real argument */
311		int  n;
312
313		if (fobj == NULL)
314	<	error(USER, "arg(n) called without a context");
314	>	error(INTERNAL, "arg(n) called without a modifier context");
315
316		n = argument(1) + .5;           /* round to integer */
317

Diff Legend

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