[ViewVC] Diff of: cvs/cvsroot/microscheme/scheme.c

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.24 by root, Fri Nov 27 02:12:08 2015 UTC vs.
Revision 1.28 by root, Sat Nov 28 08:09:04 2015 UTC

…		…
182	# define FIRST_CELLSEGS 3	182	# define FIRST_CELLSEGS 3
183	#endif	183	#endif
184		184
185	enum scheme_types	185	enum scheme_types
186	{	186	{
		187	T_INTEGER,
187	T_FREE,	188	T_REAL,
188	T_STRING,	189	T_STRING,
189	T_NUMBER,
190	T_SYMBOL,	190	T_SYMBOL,
191	T_PROC,	191	T_PROC,
192	T_PAIR,	192	T_PAIR, /* also used for free cells */
193	T_CLOSURE,	193	T_CLOSURE,
194	T_CONTINUATION,	194	T_CONTINUATION,
195	T_FOREIGN,	195	T_FOREIGN,
196	T_CHARACTER,	196	T_CHARACTER,
197	T_PORT,	197	T_PORT,
…		…
207	#define T_SYNTAX 0x0010	207	#define T_SYNTAX 0x0010
208	#define T_IMMUTABLE 0x0020	208	#define T_IMMUTABLE 0x0020
209	#define T_ATOM 0x0040 /* only for gc */	209	#define T_ATOM 0x0040 /* only for gc */
210	#define T_MARK 0x0080 /* only for gc */	210	#define T_MARK 0x0080 /* only for gc */
211		211
		212	/* num, for generic arithmetic */
		213	struct num
		214	{
		215	IVALUE ivalue;
		216	#if USE_REAL
		217	RVALUE rvalue;
		218	char is_fixnum;
		219	#endif
		220	};
		221
		222	#if USE_REAL
		223	# define num_is_fixnum(n) (n).is_fixnum
		224	# define num_set_fixnum(n,f) (n).is_fixnum = (f)
		225	# define num_ivalue(n) (n).ivalue
		226	# define num_rvalue(n) (n).rvalue
		227	# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
		228	# define num_set_rvalue(n,r) (n).rvalue = (r)
		229	#else
		230	# define num_is_fixnum(n) 1
		231	# define num_set_fixnum(n,f) 0
		232	# define num_ivalue(n) (n).ivalue
		233	# define num_rvalue(n) (n).ivalue
		234	# define num_set_ivalue(n,i) (n).ivalue = (i)
		235	# define num_set_rvalue(n,r) (n).ivalue = (r)
		236	#endif
		237
212	enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };	238	enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
213		239
214	static num num_op (enum num_op op, num a, num b);	240	static num num_op (enum num_op op, num a, num b);
215	static num num_intdiv (num a, num b);	241	static num num_intdiv (num a, num b);
216	static num num_rem (num a, num b);	242	static num num_rem (num a, num b);
…		…
219	#if USE_MATH	245	#if USE_MATH
220	static double round_per_R5RS (double x);	246	static double round_per_R5RS (double x);
221	#endif	247	#endif
222	static int is_zero_rvalue (RVALUE x);	248	static int is_zero_rvalue (RVALUE x);
223		249
224	ecb_inline int
225	num_is_integer (pointer p)
226	{
227	return num_is_fixnum (p->object.number);
228	}
229
230	static num num_zero;	250	static num num_zero;
231	static num num_one;	251	static num num_one;
232		252
233	/* macros for cell operations */	253	/* macros for cell operations */
234	#define typeflag(p) ((p)->flag + 0)	254	#define typeflag(p) ((p)->flag + 0)
…		…
242	}	262	}
243		263
244	#define strvalue(p) ((p)->object.string.svalue)	264	#define strvalue(p) ((p)->object.string.svalue)
245	#define strlength(p) ((p)->object.string.length)	265	#define strlength(p) ((p)->object.string.length)
246		266
247	INTERFACE int is_list (SCHEME_P_ pointer p);
248
249	INTERFACE int	267	INTERFACE int
250	is_vector (pointer p)	268	is_vector (pointer p)
251	{	269	{
252	return type (p) == T_VECTOR;	270	return type (p) == T_VECTOR;
253	}	271	}
254		272
255	#define vecvalue(p) ((p)->object.vector.vvalue)	273	#define vecvalue(p) ((p)->object.vector.vvalue)
256	#define veclength(p) ((p)->object.vector.length)	274	#define veclength(p) ((p)->object.vector.length)
257	INTERFACE void fill_vector (pointer vec, pointer obj);	275	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
258	INTERFACE uint32_t vector_length (pointer vec);
259	INTERFACE pointer vector_elem (pointer vec, uint32_t ielem);	276	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
260	INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a);	277	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
261		278
262	INTERFACE uint32_t	279	INTERFACE int
263	vector_length (pointer vec)	280	is_integer (pointer p)
264	{	281	{
265	return vec->object.vector.length;	282	return type (p) == T_INTEGER;
		283	}
		284
		285	/* not the same as in scheme, where integers are (correctly :) reals */
		286	INTERFACE int
		287	is_real (pointer p)
		288	{
		289	return type (p) == T_REAL;
266	}	290	}
267		291
268	INTERFACE int	292	INTERFACE int
269	is_number (pointer p)	293	is_number (pointer p)
270	{	294	{
271	return type (p) == T_NUMBER;	295	return is_integer (p) \|\| is_real (p);
272	}
273
274	INTERFACE int
275	is_integer (pointer p)
276	{
277	if (!is_number (p))
278	return 0;
279
280	if (num_is_integer (p) \|\| ivalue (p) == rvalue (p))
281	return 1;
282
283	return 0;
284	}
285
286	INTERFACE int
287	is_real (pointer p)
288	{
289	return is_number (p) && !num_is_fixnum (p->object.number);
290	}	296	}
291		297
292	INTERFACE int	298	INTERFACE int
293	is_character (pointer p)	299	is_character (pointer p)
294	{	300	{
…		…
299	string_value (pointer p)	305	string_value (pointer p)
300	{	306	{
301	return strvalue (p);	307	return strvalue (p);
302	}	308	}
303		309
304	ecb_inline num
305	nvalue (pointer p)
306	{
307	return (p)->object.number;
308	}
309
310	static IVALUE
311	num_get_ivalue (const num n)
312	{
313	return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
314	}
315
316	static RVALUE
317	num_get_rvalue (const num n)
318	{
319	return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
320	}
321
322	INTERFACE IVALUE
323	ivalue (pointer p)
324	{
325	return num_get_ivalue (p->object.number);
326	}
327
328	INTERFACE RVALUE
329	rvalue (pointer p)
330	{
331	return num_get_rvalue (p->object.number);
332	}
333
334	#define ivalue_unchecked(p) ((p)->object.number.value.ivalue)	310	#define ivalue_unchecked(p) (p)->object.ivalue
		311	#define set_ivalue(p,v) (p)->object.ivalue = (v)
		312
335	#if USE_REAL	313	#if USE_REAL
336	# define rvalue_unchecked(p) ((p)->object.number.value.rvalue)	314	#define rvalue_unchecked(p) (p)->object.rvalue
337	# define set_num_integer(p) (p)->object.number.is_fixnum=1;	315	#define set_rvalue(p,v) (p)->object.rvalue = (v)
338	# define set_num_real(p) (p)->object.number.is_fixnum=0;
339	#else	316	#else
340	# define rvalue_unchecked(p) ((p)->object.number.value.ivalue)	317	#define rvalue_unchecked(p) (p)->object.ivalue
341	# define set_num_integer(p) 0	318	#define set_rvalue(p,v) (p)->object.ivalue = (v)
342	# define set_num_real(p) 0
343	#endif	319	#endif
344		320
345	INTERFACE long	321	INTERFACE long
346	charvalue (pointer p)	322	charvalue (pointer p)
347	{	323	{
…		…
452	syntaxname (pointer p)	428	syntaxname (pointer p)
453	{	429	{
454	return strvalue (car (p));	430	return strvalue (car (p));
455	}	431	}
456		432
457	#define procnum(p) ivalue (p)	433	#define procnum(p) ivalue_unchecked (p)
458	static const char *procname (pointer x);	434	static const char *procname (pointer x);
459		435
460	INTERFACE int	436	INTERFACE int
461	is_closure (pointer p)	437	is_closure (pointer p)
462	{	438	{
…		…
523	setimmutable (pointer p)	499	setimmutable (pointer p)
524	{	500	{
525	#if USE_ERROR_CHECKING	501	#if USE_ERROR_CHECKING
526	set_typeflag (p, typeflag (p) \| T_IMMUTABLE);	502	set_typeflag (p, typeflag (p) \| T_IMMUTABLE);
527	#endif	503	#endif
		504	}
		505
		506	/* Result is:
		507	proper list: length
		508	circular list: -1
		509	not even a pair: -2
		510	dotted list: -2 minus length before dot
		511	*/
		512	INTERFACE int
		513	list_length (SCHEME_P_ pointer a)
		514	{
		515	int i = 0;
		516	pointer slow, fast;
		517
		518	slow = fast = a;
		519
		520	while (1)
		521	{
		522	if (fast == NIL)
		523	return i;
		524
		525	if (!is_pair (fast))
		526	return -2 - i;
		527
		528	fast = cdr (fast);
		529	++i;
		530
		531	if (fast == NIL)
		532	return i;
		533
		534	if (!is_pair (fast))
		535	return -2 - i;
		536
		537	++i;
		538	fast = cdr (fast);
		539
		540	/* Safe because we would have already returned if `fast'
		541	encountered a non-pair. */
		542	slow = cdr (slow);
		543
		544	if (fast == slow)
		545	{
		546	/* the fast pointer has looped back around and caught up
		547	with the slow pointer, hence the structure is circular,
		548	not of finite length, and therefore not a list */
		549	return -1;
		550	}
		551	}
		552	}
		553
		554	INTERFACE int
		555	is_list (SCHEME_P_ pointer a)
		556	{
		557	return list_length (SCHEME_A_ a) >= 0;
528	}	558	}
529		559
530	#if USE_CHAR_CLASSIFIERS	560	#if USE_CHAR_CLASSIFIERS
531	ecb_inline int	561	ecb_inline int
532	Cisalpha (int c)	562	Cisalpha (int c)
…		…
676	static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);	706	static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
677	static void assign_syntax (SCHEME_P_ const char *name);	707	static void assign_syntax (SCHEME_P_ const char *name);
678	static int syntaxnum (pointer p);	708	static int syntaxnum (pointer p);
679	static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);	709	static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
680		710
		711	static IVALUE
		712	ivalue (pointer x)
		713	{
		714	return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
		715	}
		716
		717	static RVALUE
		718	rvalue (pointer x)
		719	{
		720	return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
		721	}
		722
		723	INTERFACE num
		724	nvalue (pointer x)
		725	{
		726	num n;
		727
		728	num_set_fixnum (n, is_integer (x));
		729
		730	if (num_is_fixnum (n))
		731	num_set_ivalue (n, ivalue_unchecked (x));
		732	else
		733	num_set_rvalue (n, rvalue_unchecked (x));
		734
		735	return n;
		736	}
		737
681	static num	738	static num
682	num_op (enum num_op op, num a, num b)	739	num_op (enum num_op op, num a, num b)
683	{	740	{
684	num ret;	741	num ret;
685		742
686	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	743	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
687		744
688	if (num_is_fixnum (ret))	745	if (num_is_fixnum (ret))
689	{	746	{
690	IVALUE av = num_get_ivalue (a);
691	IVALUE bv = num_get_ivalue (b);
692
693	switch (op)	747	switch (op)
694	{	748	{
695	case NUM_ADD: av += bv; break;	749	case NUM_ADD: a.ivalue += b.ivalue; break;
696	case NUM_SUB: av -= bv; break;	750	case NUM_SUB: a.ivalue -= b.ivalue; break;
697	case NUM_MUL: av *= bv; break;	751	case NUM_MUL: a.ivalue *= b.ivalue; break;
698	case NUM_INTDIV: av /= bv; break;	752	case NUM_INTDIV: a.ivalue /= b.ivalue; break;
699	}	753	}
700		754
701	num_set_ivalue (ret, av);	755	num_set_ivalue (ret, a.ivalue);
702	}	756	}
		757	#if USE_REAL
703	else	758	else
704	{	759	{
705	RVALUE av = num_get_rvalue (a);
706	RVALUE bv = num_get_rvalue (b);
707
708	switch (op)	760	switch (op)
709	{	761	{
710	case NUM_ADD: av += bv; break;	762	case NUM_ADD: a.rvalue += b.rvalue; break;
711	case NUM_SUB: av -= bv; break;	763	case NUM_SUB: a.rvalue -= b.rvalue; break;
712	case NUM_MUL: av *= bv; break;	764	case NUM_MUL: a.rvalue *= b.rvalue; break;
713	case NUM_INTDIV: av /= bv; break;	765	case NUM_INTDIV: a.rvalue /= b.rvalue; break;
714	}	766	}
715		767
716	num_set_rvalue (ret, av);	768	num_set_rvalue (ret, a.rvalue);
717	}	769	}
		770	#endif
718		771
719	return ret;	772	return ret;
720	}	773	}
721		774
722	static num	775	static num
723	num_div (num a, num b)	776	num_div (num a, num b)
724	{	777	{
725	num ret;	778	num ret;
726		779
727	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0);	780	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
728		781
729	if (num_is_fixnum (ret))	782	if (num_is_fixnum (ret))
730	num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));	783	num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
731	else	784	else
732	num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));	785	num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
733		786
734	return ret;	787	return ret;
735	}	788	}
736		789
737	static num	790	static num
…		…
739	{	792	{
740	num ret;	793	num ret;
741	long e1, e2, res;	794	long e1, e2, res;
742		795
743	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	796	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
744	e1 = num_get_ivalue (a);	797	e1 = num_ivalue (a);
745	e2 = num_get_ivalue (b);	798	e2 = num_ivalue (b);
746	res = e1 % e2;	799	res = e1 % e2;
747		800
748	/* remainder should have same sign as second operand */	801	/* remainder should have same sign as second operand */
749	if (res > 0)	802	if (res > 0)
750	{	803	{
…		…
766	{	819	{
767	num ret;	820	num ret;
768	long e1, e2, res;	821	long e1, e2, res;
769		822
770	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	823	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
771	e1 = num_get_ivalue (a);	824	e1 = num_ivalue (a);
772	e2 = num_get_ivalue (b);	825	e2 = num_ivalue (b);
773	res = e1 % e2;	826	res = e1 % e2;
774		827
775	/* modulo should have same sign as second operand */	828	/* modulo should have same sign as second operand */
776	if (res * e2 < 0)	829	if (res * e2 < 0)
777	res += e2;	830	res += e2;
…		…
787	int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);	840	int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
788	int ret;	841	int ret;
789		842
790	if (is_fixnum)	843	if (is_fixnum)
791	{	844	{
792	IVALUE av = num_get_ivalue (a);	845	IVALUE av = num_ivalue (a);
793	IVALUE bv = num_get_ivalue (b);	846	IVALUE bv = num_ivalue (b);
794		847
795	ret = av == bv ? 0 : av < bv ? -1 : +1;	848	ret = av == bv ? 0 : av < bv ? -1 : +1;
796	}	849	}
797	else	850	else
798	{	851	{
799	RVALUE av = num_get_rvalue (a);	852	RVALUE av = num_rvalue (a);
800	RVALUE bv = num_get_rvalue (b);	853	RVALUE bv = num_rvalue (b);
801		854
802	ret = av == bv ? 0 : av < bv ? -1 : +1;	855	ret = av == bv ? 0 : av < bv ? -1 : +1;
803	}	856	}
804		857
805	return ret;	858	return ret;
…		…
868	return k;	921	return k;
869		922
870	i = ++SCHEME_V->last_cell_seg;	923	i = ++SCHEME_V->last_cell_seg;
871	SCHEME_V->alloc_seg[i] = cp;	924	SCHEME_V->alloc_seg[i] = cp;
872		925
873	/* insert new segment in address order */
874	newp = (pointer)cp;	926	newp = (pointer)cp;
875	SCHEME_V->cell_seg[i] = newp;	927	SCHEME_V->cell_seg[i] = newp;
876	SCHEME_V->cell_segsize[i] = segsize;	928	SCHEME_V->cell_segsize[i] = segsize;
877
878	//TODO: insert, not swap
879	while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
880	{
881	p = SCHEME_V->cell_seg[i];
882	SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
883	SCHEME_V->cell_seg[i - 1] = p;
884
885	k = SCHEME_V->cell_segsize[i];
886	SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
887	SCHEME_V->cell_segsize[i - 1] = k;
888
889	--i;
890	}
891
892	SCHEME_V->fcells += segsize;	929	SCHEME_V->fcells += segsize;
893	last = newp + segsize - 1;	930	last = newp + segsize - 1;
894		931
895	for (p = newp; p <= last; p++)	932	for (p = newp; p <= last; p++)
896	{	933	{
897	set_typeflag (p, T_FREE);	934	set_typeflag (p, T_PAIR);
898	set_car (p, NIL);	935	set_car (p, NIL);
899	set_cdr (p, p + 1);	936	set_cdr (p, p + 1);
900	}	937	}
901		938
902	/* insert new cells in address order on free list */
903	if (SCHEME_V->free_cell == NIL \|\| p < SCHEME_V->free_cell)
904	{
905	set_cdr (last, SCHEME_V->free_cell);	939	set_cdr (last, SCHEME_V->free_cell);
906	SCHEME_V->free_cell = newp;	940	SCHEME_V->free_cell = newp;
907	}
908	else
909	{
910	p = SCHEME_V->free_cell;
911
912	while (cdr (p) != NIL && newp > cdr (p))
913	p = cdr (p);
914
915	set_cdr (last, cdr (p));
916	set_cdr (p, newp);
917	}
918	}	941	}
919		942
920	return n;	943	return n;
921	}	944	}
922		945
…		…
1001	/* Record it as a vector so that gc understands it. */	1024	/* Record it as a vector so that gc understands it. */
1002	set_typeflag (v, T_VECTOR \| T_ATOM);	1025	set_typeflag (v, T_VECTOR \| T_ATOM);
1003		1026
1004	v->object.vector.vvalue = e;	1027	v->object.vector.vvalue = e;
1005	v->object.vector.length = len;	1028	v->object.vector.length = len;
1006	fill_vector (v, init);	1029	fill_vector (v, 0, init);
1007	push_recent_alloc (SCHEME_A_ v, NIL);	1030	push_recent_alloc (SCHEME_A_ v, NIL);
1008		1031
1009	return v;	1032	return v;
1010	}	1033	}
1011		1034
…		…
1077	pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);	1100	pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1078	set_typeflag (x, T_SYMBOL);	1101	set_typeflag (x, T_SYMBOL);
1079	setimmutable (car (x));	1102	setimmutable (car (x));
1080		1103
1081	location = hash_fn (name, veclength (SCHEME_V->oblist));	1104	location = hash_fn (name, veclength (SCHEME_V->oblist));
1082	set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location)));	1105	vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1083	return x;	1106	return x;
1084	}	1107	}
1085		1108
1086	ecb_inline pointer	1109	ecb_inline pointer
1087	oblist_find_by_name (SCHEME_P_ const char *name)	1110	oblist_find_by_name (SCHEME_P_ const char *name)
…		…
1090	pointer x;	1113	pointer x;
1091	char *s;	1114	char *s;
1092		1115
1093	location = hash_fn (name, veclength (SCHEME_V->oblist));	1116	location = hash_fn (name, veclength (SCHEME_V->oblist));
1094		1117
1095	for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x))	1118	for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1096	{	1119	{
1097	s = symname (car (x));	1120	s = symname (car (x));
1098		1121
1099	/* case-insensitive, per R5RS section 2 */	1122	/* case-insensitive, per R5RS section 2 */
1100	if (stricmp (name, s) == 0)	1123	if (stricmp (name, s) == 0)
…		…
1110	int i;	1133	int i;
1111	pointer x;	1134	pointer x;
1112	pointer ob_list = NIL;	1135	pointer ob_list = NIL;
1113		1136
1114	for (i = 0; i < veclength (SCHEME_V->oblist); i++)	1137	for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1115	for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x))	1138	for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1116	ob_list = cons (x, ob_list);	1139	ob_list = cons (x, ob_list);
1117		1140
1118	return ob_list;	1141	return ob_list;
1119	}	1142	}
1120		1143
…		…
1193	mk_character (SCHEME_P_ int c)	1216	mk_character (SCHEME_P_ int c)
1194	{	1217	{
1195	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1218	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196		1219
1197	set_typeflag (x, (T_CHARACTER \| T_ATOM));	1220	set_typeflag (x, (T_CHARACTER \| T_ATOM));
1198	ivalue_unchecked (x) = c & 0xff;	1221	set_ivalue (x, c & 0xff);
1199	set_num_integer (x);	1222
1200	return x;	1223	return x;
1201	}	1224	}
1202		1225
1203	/* get number atom (integer) */	1226	/* get number atom (integer) */
1204	INTERFACE pointer	1227	INTERFACE pointer
1205	mk_integer (SCHEME_P_ long num)	1228	mk_integer (SCHEME_P_ long n)
1206	{	1229	{
1207	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1230	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1208		1231
1209	set_typeflag (x, (T_NUMBER \| T_ATOM));	1232	set_typeflag (x, (T_INTEGER \| T_ATOM));
1210	ivalue_unchecked (x) = num;	1233	set_ivalue (x, n);
1211	set_num_integer (x);	1234
1212	return x;	1235	return x;
1213	}	1236	}
1214		1237
1215	INTERFACE pointer	1238	INTERFACE pointer
1216	mk_real (SCHEME_P_ RVALUE n)	1239	mk_real (SCHEME_P_ RVALUE n)
1217	{	1240	{
		1241	#if USE_REAL
1218	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1242	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1219		1243
1220	set_typeflag (x, (T_NUMBER \| T_ATOM));	1244	set_typeflag (x, (T_REAL \| T_ATOM));
1221	rvalue_unchecked (x) = n;	1245	set_rvalue (x, n);
1222	set_num_real (x);	1246
1223	return x;	1247	return x;
		1248	#else
		1249	return mk_integer (SCHEME_A_ n);
		1250	#endif
1224	}	1251	}
1225		1252
1226	static pointer	1253	static pointer
1227	mk_number (SCHEME_P_ const num n)	1254	mk_number (SCHEME_P_ const num n)
1228	{	1255	{
		1256	#if USE_REAL
1229	if (num_is_fixnum (n))	1257	return num_is_fixnum (n)
		1258	? mk_integer (SCHEME_A_ num_ivalue (n))
		1259	: mk_real (SCHEME_A_ num_rvalue (n));
		1260	#else
1230	return mk_integer (SCHEME_A_ num_get_ivalue (n));	1261	return mk_integer (SCHEME_A_ num_ivalue (n));
1231	else	1262	#endif
1232	return mk_real (SCHEME_A_ num_get_rvalue (n));
1233	}	1263	}
1234		1264
1235	/* allocate name to string area */	1265	/* allocate name to string area */
1236	static char *	1266	static char *
1237	store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)	1267	store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
…		…
1296	{	1326	{
1297	return get_vector_object (SCHEME_A_ len, NIL);	1327	return get_vector_object (SCHEME_A_ len, NIL);
1298	}	1328	}
1299		1329
1300	INTERFACE void	1330	INTERFACE void
1301	fill_vector (pointer vec, pointer obj)	1331	fill_vector (pointer vec, uint32_t start, pointer obj)
1302	{	1332	{
1303	int i;	1333	int i;
1304		1334
1305	for (i = 0; i < vec->object.vector.length; i++)	1335	for (i = start; i < veclength (vec); i++)
1306	vecvalue (vec)[i] = obj;	1336	vecvalue (vec)[i] = obj;
1307	}	1337	}
1308		1338
1309	INTERFACE pointer	1339	INTERFACE pointer
1310	vector_elem (pointer vec, uint32_t ielem)	1340	vector_get (pointer vec, uint32_t ielem)
1311	{	1341	{
1312	return vecvalue(vec)[ielem];	1342	return vecvalue(vec)[ielem];
1313	}	1343	}
1314		1344
1315	INTERFACE void	1345	INTERFACE void
1316	set_vector_elem (pointer vec, uint32_t ielem, pointer a)	1346	vector_set (pointer vec, uint32_t ielem, pointer a)
1317	{	1347	{
1318	vecvalue(vec)[ielem] = a;	1348	vecvalue(vec)[ielem] = a;
1319	}	1349	}
1320		1350
1321	/* get new symbol */	1351	/* get new symbol */
…		…
1413	}	1443	}
1414	else if ((c == 'e') \|\| (c == 'E'))	1444	else if ((c == 'e') \|\| (c == 'E'))
1415	{	1445	{
1416	if (!has_fp_exp)	1446	if (!has_fp_exp)
1417	{	1447	{
1418	has_dec_point = 1; /* decimal point illegal	1448	has_dec_point = 1; /* decimal point illegal from now on */
1419	from now on */
1420	p++;	1449	p++;
1421		1450
1422	if ((p == '-') \|\| (p == '+') \|\| isdigit (*p))	1451	if ((p == '-') \|\| (p == '+') \|\| isdigit (*p))
1423	continue;	1452	continue;
1424	}	1453	}
…		…
1512		1541
1513	if (ecb_expect_false (is_vector (p)))	1542	if (ecb_expect_false (is_vector (p)))
1514	{	1543	{
1515	int i;	1544	int i;
1516		1545
1517	for (i = 0; i < p->object.vector.length; i++)	1546	for (i = 0; i < veclength (p); i++)
1518	mark (vecvalue (p)[i]);	1547	mark (vecvalue (p)[i]);
1519	}	1548	}
1520		1549
1521	if (is_atom (p))	1550	if (is_atom (p))
1522	goto E6;	1551	goto E6;
…		…
1620	if (is_mark (p))	1649	if (is_mark (p))
1621	clrmark (p);	1650	clrmark (p);
1622	else	1651	else
1623	{	1652	{
1624	/* reclaim cell */	1653	/* reclaim cell */
1625	if (typeflag (p) != T_FREE)	1654	if (typeflag (p) != T_PAIR)
1626	{	1655	{
1627	finalize_cell (SCHEME_A_ p);	1656	finalize_cell (SCHEME_A_ p);
1628	set_typeflag (p, T_FREE);	1657	set_typeflag (p, T_PAIR);
1629	set_car (p, NIL);	1658	set_car (p, NIL);
1630	}	1659	}
1631		1660
1632	++SCHEME_V->fcells;	1661	++SCHEME_V->fcells;
1633	set_cdr (p, SCHEME_V->free_cell);	1662	set_cdr (p, SCHEME_V->free_cell);
…		…
1635	}	1664	}
1636	}	1665	}
1637	}	1666	}
1638		1667
1639	if (SCHEME_V->gc_verbose)	1668	if (SCHEME_V->gc_verbose)
		1669	{
1640	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");	1670	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
		1671	}
1641	}	1672	}
1642		1673
1643	static void	1674	static void
1644	finalize_cell (SCHEME_P_ pointer a)	1675	finalize_cell (SCHEME_P_ pointer a)
1645	{	1676	{
…		…
2480	{	2511	{
2481	p = SCHEME_V->strbuff;	2512	p = SCHEME_V->strbuff;
2482		2513
2483	if (f <= 1 \|\| f == 10) /* f is the base for numbers if > 1 */	2514	if (f <= 1 \|\| f == 10) /* f is the base for numbers if > 1 */
2484	{	2515	{
2485	if (num_is_integer (l))	2516	if (is_integer (l))
2486	xnum (p, ivalue_unchecked (l));	2517	xnum (p, ivalue_unchecked (l));
2487	#if USE_REAL	2518	#if USE_REAL
2488	else	2519	else
2489	{	2520	{
2490	snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));	2521	snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
…		…
2745	return 0;	2776	return 0;
2746	}	2777	}
2747	else if (is_number (a))	2778	else if (is_number (a))
2748	{	2779	{
2749	if (is_number (b))	2780	if (is_number (b))
2750	if (num_is_integer (a) == num_is_integer (b))
2751	return num_cmp (nvalue (a), nvalue (b)) == 0;	2781	return num_cmp (nvalue (a), nvalue (b)) == 0;
2752		2782
2753	return 0;	2783	return 0;
2754	}	2784	}
2755	else if (is_character (a))	2785	else if (is_character (a))
2756	{	2786	{
…		…
2832		2862
2833	if (is_vector (car (env)))	2863	if (is_vector (car (env)))
2834	{	2864	{
2835	int location = hash_fn (symname (variable), veclength (car (env)));	2865	int location = hash_fn (symname (variable), veclength (car (env)));
2836		2866
2837	set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location)));	2867	vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2838	}	2868	}
2839	else	2869	else
2840	set_car (env, immutable_cons (slot, car (env)));	2870	set_car (env, immutable_cons (slot, car (env)));
2841	}	2871	}
2842		2872
…		…
2849	for (x = env; x != NIL; x = cdr (x))	2879	for (x = env; x != NIL; x = cdr (x))
2850	{	2880	{
2851	if (is_vector (car (x)))	2881	if (is_vector (car (x)))
2852	{	2882	{
2853	location = hash_fn (symname (hdl), veclength (car (x)));	2883	location = hash_fn (symname (hdl), veclength (car (x)));
2854	y = vector_elem (car (x), location);	2884	y = vector_get (car (x), location);
2855	}	2885	}
2856	else	2886	else
2857	y = car (x);	2887	y = car (x);
2858		2888
2859	for (; y != NIL; y = cdr (y))	2889	for (; y != NIL; y = cdr (y))
…		…
3132	int i = 0;	3162	int i = 0;
3133	struct dump_stack_frame *frame = SCHEME_V->dump_base;	3163	struct dump_stack_frame *frame = SCHEME_V->dump_base;
3134		3164
3135	while (cont != NIL)	3165	while (cont != NIL)
3136	{	3166	{
3137	frame->op = ivalue (car (cont)); cont = cdr (cont);	3167	frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3138	frame->args = car (cont) ; cont = cdr (cont);	3168	frame->args = car (cont) ; cont = cdr (cont);
3139	frame->envir = car (cont) ; cont = cdr (cont);	3169	frame->envir = car (cont) ; cont = cdr (cont);
3140	frame->code = car (cont) ; cont = cdr (cont);	3170	frame->code = car (cont) ; cont = cdr (cont);
3141		3171
3142	++frame;	3172	++frame;
3143	++i;	3173	++i;
3144	}	3174	}
3145		3175
…		…
3174	SCHEME_V->value = a;	3204	SCHEME_V->value = a;
3175		3205
3176	if (dump == NIL)	3206	if (dump == NIL)
3177	return -1;	3207	return -1;
3178		3208
3179	SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump);	3209	SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3180	SCHEME_V->args = car (dump) ; dump = cdr (dump);	3210	SCHEME_V->args = car (dump) ; dump = cdr (dump);
3181	SCHEME_V->envir = car (dump) ; dump = cdr (dump);	3211	SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3182	SCHEME_V->code = car (dump) ; dump = cdr (dump);	3212	SCHEME_V->code = car (dump) ; dump = cdr (dump);
3183		3213
3184	SCHEME_V->dump = dump;	3214	SCHEME_V->dump = dump;
3185		3215
3186	return 0;	3216	return 0;
3187	}	3217	}
…		…
3393		3423
3394	case OP_TRACING:	3424	case OP_TRACING:
3395	{	3425	{
3396	int tr = SCHEME_V->tracing;	3426	int tr = SCHEME_V->tracing;
3397		3427
3398	SCHEME_V->tracing = ivalue (car (args));	3428	SCHEME_V->tracing = ivalue_unchecked (car (args));
3399	s_return (mk_integer (SCHEME_A_ tr));	3429	s_return (mk_integer (SCHEME_A_ tr));
3400	}	3430	}
3401		3431
3402	#endif	3432	#endif
3403		3433
…		…
3922	{	3952	{
3923	pointer args = SCHEME_V->args;	3953	pointer args = SCHEME_V->args;
3924	pointer x = car (args);	3954	pointer x = car (args);
3925	num v;	3955	num v;
3926		3956
3927	#if USE_MATH
3928	RVALUE dd;
3929	#endif
3930
3931	switch (op)	3957	switch (op)
3932	{	3958	{
3933	#if USE_MATH	3959	#if USE_MATH
3934	case OP_INEX2EX: /* inexact->exact */	3960	case OP_INEX2EX: /* inexact->exact */
		3961	{
3935	if (num_is_integer (x))	3962	if (is_integer (x))
3936	s_return (x);	3963	s_return (x);
3937	else if (modf (rvalue_unchecked (x), &dd) == 0)	3964
		3965	RVALUE r = rvalue_unchecked (x);
		3966
		3967	if (r == (RVALUE)(IVALUE)r)
3938	s_return (mk_integer (SCHEME_A_ ivalue (x)));	3968	s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3939	else	3969	else
3940	Error_1 ("inexact->exact: not integral:", x);	3970	Error_1 ("inexact->exact: not integral:", x);
		3971	}
3941		3972
3942	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));	3973	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3943	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));	3974	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3944	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));	3975	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3945	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));	3976	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
…		…
3963	{	3994	{
3964	RVALUE result;	3995	RVALUE result;
3965	int real_result = 1;	3996	int real_result = 1;
3966	pointer y = cadr (args);	3997	pointer y = cadr (args);
3967		3998
3968	if (num_is_integer (x) && num_is_integer (y))	3999	if (is_integer (x) && is_integer (y))
3969	real_result = 0;	4000	real_result = 0;
3970		4001
3971	/* This 'if' is an R5RS compatibility fix. */	4002	/* This 'if' is an R5RS compatibility fix. */
3972	/* NOTE: Remove this 'if' fix for R6RS. */	4003	/* NOTE: Remove this 'if' fix for R6RS. */
3973	if (rvalue (x) == 0 && rvalue (y) < 0)	4004	if (rvalue (x) == 0 && rvalue (y) < 0)
…		…
3979	/* If the test fails, result is too big for integer. */	4010	/* If the test fails, result is too big for integer. */
3980	if (!real_result)	4011	if (!real_result)
3981	{	4012	{
3982	long result_as_long = result;	4013	long result_as_long = result;
3983		4014
3984	if (result != (RVALUE) result_as_long)	4015	if (result != result_as_long)
3985	real_result = 1;	4016	real_result = 1;
3986	}	4017	}
3987		4018
3988	if (real_result)	4019	if (real_result)
3989	s_return (mk_real (SCHEME_A_ result));	4020	s_return (mk_real (SCHEME_A_ result));
…		…
3994	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));	4025	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
3995	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));	4026	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3996		4027
3997	case OP_TRUNCATE:	4028	case OP_TRUNCATE:
3998	{	4029	{
3999	RVALUE rvalue_of_x;	4030	RVALUE n = rvalue (x);
4000
4001	rvalue_of_x = rvalue (x);
4002
4003	if (rvalue_of_x > 0)
4004	s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));	4031	s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4005	else
4006	s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4007	}	4032	}
4008		4033
4009	case OP_ROUND:	4034	case OP_ROUND:
4010	if (num_is_integer (x))	4035	if (is_integer (x))
4011	s_return (x);	4036	s_return (x);
4012		4037
4013	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));	4038	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4014	#endif	4039	#endif
4015		4040
…		…
4135	}	4160	}
4136	else	4161	else
4137	Error_0 ("set-cdr!: unable to alter immutable pair");	4162	Error_0 ("set-cdr!: unable to alter immutable pair");
4138		4163
4139	case OP_CHAR2INT: /* char->integer */	4164	case OP_CHAR2INT: /* char->integer */
4140	s_return (mk_integer (SCHEME_A_ ivalue (x)));	4165	s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4141		4166
4142	case OP_INT2CHAR: /* integer->char */	4167	case OP_INT2CHAR: /* integer->char */
4143	s_return (mk_character (SCHEME_A_ ivalue (x)));	4168	s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4144		4169
4145	case OP_CHARUPCASE:	4170	case OP_CHARUPCASE:
4146	{	4171	{
4147	unsigned char c = ivalue (x);	4172	unsigned char c = ivalue_unchecked (x);
4148	c = toupper (c);	4173	c = toupper (c);
4149	s_return (mk_character (SCHEME_A_ c));	4174	s_return (mk_character (SCHEME_A_ c));
4150	}	4175	}
4151		4176
4152	case OP_CHARDNCASE:	4177	case OP_CHARDNCASE:
4153	{	4178	{
4154	unsigned char c = ivalue (x);	4179	unsigned char c = ivalue_unchecked (x);
4155	c = tolower (c);	4180	c = tolower (c);
4156	s_return (mk_character (SCHEME_A_ c));	4181	s_return (mk_character (SCHEME_A_ c));
4157	}	4182	}
4158		4183
4159	case OP_STR2SYM: /* string->symbol */	4184	case OP_STR2SYM: /* string->symbol */
…		…
4236	Error_1 ("atom->string: not an atom:", x);	4261	Error_1 ("atom->string: not an atom:", x);
4237	}	4262	}
4238		4263
4239	case OP_MKSTRING: /* make-string */	4264	case OP_MKSTRING: /* make-string */
4240	{	4265	{
4241	int fill = ' ';	4266	int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4242	int len;
4243
4244	len = ivalue (x);	4267	int len = ivalue_unchecked (x);
4245
4246	if (cdr (args) != NIL)
4247	fill = charvalue (cadr (args));
4248		4268
4249	s_return (mk_empty_string (SCHEME_A_ len, fill));	4269	s_return (mk_empty_string (SCHEME_A_ len, fill));
4250	}	4270	}
4251		4271
4252	case OP_STRLEN: /* string-length */	4272	case OP_STRLEN: /* string-length */
4253	s_return (mk_integer (SCHEME_A_ strlength (x)));	4273	s_return (mk_integer (SCHEME_A_ strlength (x)));
4254		4274
4255	case OP_STRREF: /* string-ref */	4275	case OP_STRREF: /* string-ref */
4256	{	4276	{
4257	char *str;
4258	int index;
4259
4260	str = strvalue (x);	4277	char *str = strvalue (x);
4261
4262	index = ivalue (cadr (args));	4278	int index = ivalue_unchecked (cadr (args));
4263		4279
4264	if (index >= strlength (x))	4280	if (index >= strlength (x))
4265	Error_1 ("string-ref: out of bounds:", cadr (args));	4281	Error_1 ("string-ref: out of bounds:", cadr (args));
4266		4282
4267	s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));	4283	s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4268	}	4284	}
4269		4285
4270	case OP_STRSET: /* string-set! */	4286	case OP_STRSET: /* string-set! */
4271	{	4287	{
4272	char *str;	4288	char *str = strvalue (x);
4273	int index;	4289	int index = ivalue_unchecked (cadr (args));
4274	int c;	4290	int c;
4275		4291
4276	if (is_immutable (x))	4292	if (is_immutable (x))
4277	Error_1 ("string-set!: unable to alter immutable string:", x);	4293	Error_1 ("string-set!: unable to alter immutable string:", x);
4278
4279	str = strvalue (x);
4280
4281	index = ivalue (cadr (args));
4282		4294
4283	if (index >= strlength (x))	4295	if (index >= strlength (x))
4284	Error_1 ("string-set!: out of bounds:", cadr (args));	4296	Error_1 ("string-set!: out of bounds:", cadr (args));
4285		4297
4286	c = charvalue (caddr (args));	4298	c = charvalue (caddr (args));
…		…
4309	s_return (newstr);	4321	s_return (newstr);
4310	}	4322	}
4311		4323
4312	case OP_SUBSTR: /* substring */	4324	case OP_SUBSTR: /* substring */
4313	{	4325	{
4314	char *str;	4326	char *str = strvalue (x);
4315	int index0;	4327	int index0 = ivalue_unchecked (cadr (args));
4316	int index1;	4328	int index1;
4317	int len;	4329	int len;
4318		4330
4319	str = strvalue (x);
4320
4321	index0 = ivalue (cadr (args));
4322
4323	if (index0 > strlength (x))	4331	if (index0 > strlength (x))
4324	Error_1 ("substring: start out of bounds:", cadr (args));	4332	Error_1 ("substring: start out of bounds:", cadr (args));
4325		4333
4326	if (cddr (args) != NIL)	4334	if (cddr (args) != NIL)
4327	{	4335	{
4328	index1 = ivalue (caddr (args));	4336	index1 = ivalue_unchecked (caddr (args));
4329		4337
4330	if (index1 > strlength (x) \|\| index1 < index0)	4338	if (index1 > strlength (x) \|\| index1 < index0)
4331	Error_1 ("substring: end out of bounds:", caddr (args));	4339	Error_1 ("substring: end out of bounds:", caddr (args));
4332	}	4340	}
4333	else	4341	else
…		…
4356	if (SCHEME_V->no_memory)	4364	if (SCHEME_V->no_memory)
4357	s_return (S_SINK);	4365	s_return (S_SINK);
4358	#endif	4366	#endif
4359		4367
4360	for (x = args, i = 0; is_pair (x); x = cdr (x), i++)	4368	for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4361	set_vector_elem (vec, i, car (x));	4369	vector_set (vec, i, car (x));
4362		4370
4363	s_return (vec);	4371	s_return (vec);
4364	}	4372	}
4365		4373
4366	case OP_MKVECTOR: /* make-vector */	4374	case OP_MKVECTOR: /* make-vector */
4367	{	4375	{
4368	pointer fill = NIL;	4376	pointer fill = NIL;
4369	int len;
4370	pointer vec;	4377	pointer vec;
4371
4372	len = ivalue (x);	4378	int len = ivalue_unchecked (x);
4373		4379
4374	if (cdr (args) != NIL)	4380	if (cdr (args) != NIL)
4375	fill = cadr (args);	4381	fill = cadr (args);
4376		4382
4377	vec = mk_vector (SCHEME_A_ len);	4383	vec = mk_vector (SCHEME_A_ len);
…		…
4380	if (SCHEME_V->no_memory)	4386	if (SCHEME_V->no_memory)
4381	s_return (S_SINK);	4387	s_return (S_SINK);
4382	#endif	4388	#endif
4383		4389
4384	if (fill != NIL)	4390	if (fill != NIL)
4385	fill_vector (vec, fill);	4391	fill_vector (vec, 0, fill);
4386		4392
4387	s_return (vec);	4393	s_return (vec);
4388	}	4394	}
4389		4395
4390	case OP_VECLEN: /* vector-length */	4396	case OP_VECLEN: /* vector-length */
4391	s_return (mk_integer (SCHEME_A_ veclength (x)));	4397	s_return (mk_integer (SCHEME_A_ veclength (x)));
4392		4398
4393	case OP_VECREF: /* vector-ref */	4399	case OP_VECREF: /* vector-ref */
4394	{	4400	{
4395	int index;
4396
4397	index = ivalue (cadr (args));	4401	int index = ivalue_unchecked (cadr (args));
4398		4402
4399	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)	4403	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4400	Error_1 ("vector-ref: out of bounds:", cadr (args));	4404	Error_1 ("vector-ref: out of bounds:", cadr (args));
4401		4405
4402	s_return (vector_elem (x, index));	4406	s_return (vector_get (x, index));
4403	}	4407	}
4404		4408
4405	case OP_VECSET: /* vector-set! */	4409	case OP_VECSET: /* vector-set! */
4406	{	4410	{
4407	int index;	4411	int index = ivalue_unchecked (cadr (args));
4408		4412
4409	if (is_immutable (x))	4413	if (is_immutable (x))
4410	Error_1 ("vector-set!: unable to alter immutable vector:", x);	4414	Error_1 ("vector-set!: unable to alter immutable vector:", x);
4411		4415
4412	index = ivalue (cadr (args));
4413
4414	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)	4416	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4415	Error_1 ("vector-set!: out of bounds:", cadr (args));	4417	Error_1 ("vector-set!: out of bounds:", cadr (args));
4416		4418
4417	set_vector_elem (x, index, caddr (args));	4419	vector_set (x, index, caddr (args));
4418	s_return (x);	4420	s_return (x);
4419	}	4421	}
4420	}	4422	}
4421		4423
4422	if (USE_ERROR_CHECKING) abort ();	4424	if (USE_ERROR_CHECKING) abort ();
4423	}
4424
4425	INTERFACE int
4426	is_list (SCHEME_P_ pointer a)
4427	{
4428	return list_length (SCHEME_A_ a) >= 0;
4429	}
4430
4431	/* Result is:
4432	proper list: length
4433	circular list: -1
4434	not even a pair: -2
4435	dotted list: -2 minus length before dot
4436	*/
4437	INTERFACE int
4438	list_length (SCHEME_P_ pointer a)
4439	{
4440	int i = 0;
4441	pointer slow, fast;
4442
4443	slow = fast = a;
4444
4445	while (1)
4446	{
4447	if (fast == NIL)
4448	return i;
4449
4450	if (!is_pair (fast))
4451	return -2 - i;
4452
4453	fast = cdr (fast);
4454	++i;
4455
4456	if (fast == NIL)
4457	return i;
4458
4459	if (!is_pair (fast))
4460	return -2 - i;
4461
4462	++i;
4463	fast = cdr (fast);
4464
4465	/* Safe because we would have already returned if `fast'
4466	encountered a non-pair. */
4467	slow = cdr (slow);
4468
4469	if (fast == slow)
4470	{
4471	/* the fast pointer has looped back around and caught up
4472	with the slow pointer, hence the structure is circular,
4473	not of finite length, and therefore not a list */
4474	return -1;
4475	}
4476	}
4477	}	4425	}
4478		4426
4479	static int	4427	static int
4480	opexe_2 (SCHEME_P_ enum scheme_opcodes op)	4428	opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4481	{	4429	{
…		…
4527	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;	4475	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4528	case OP_REALP: /* real? / r = is_number (a) ; break; / all numbers are real */	4476	case OP_REALP: /* real? / r = is_number (a) ; break; / all numbers are real */
4529	case OP_CHARP: /* char? */ r = is_character (a) ; break;	4477	case OP_CHARP: /* char? */ r = is_character (a) ; break;
4530		4478
4531	#if USE_CHAR_CLASSIFIERS	4479	#if USE_CHAR_CLASSIFIERS
4532	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;	4480	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4533	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;	4481	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4534	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;	4482	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4535	case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;	4483	case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4536	case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;	4484	case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4537	#endif	4485	#endif
4538		4486
4539	#if USE_PORTS	4487	#if USE_PORTS
4540	case OP_PORTP: /* port? */ r = is_port (a) ; break;	4488	case OP_PORTP: /* port? */ r = is_port (a) ; break;
4541	case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;	4489	case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
…		…
4742		4690
4743	case OP_NEWSEGMENT: /* new-segment */	4691	case OP_NEWSEGMENT: /* new-segment */
4744	if (!is_pair (args) \|\| !is_number (a))	4692	if (!is_pair (args) \|\| !is_number (a))
4745	Error_0 ("new-segment: argument must be a number");	4693	Error_0 ("new-segment: argument must be a number");
4746		4694
4747	alloc_cellseg (SCHEME_A_ (int)ivalue (a));	4695	alloc_cellseg (SCHEME_A_ ivalue (a));
4748		4696
4749	s_return (S_T);	4697	s_return (S_T);
4750		4698
4751	case OP_OBLIST: /* oblist */	4699	case OP_OBLIST: /* oblist */
4752	s_return (oblist_all_symbols (SCHEME_A));	4700	s_return (oblist_all_symbols (SCHEME_A));
…		…
5197	putstr (SCHEME_A_ ")");	5145	putstr (SCHEME_A_ ")");
5198	s_return (S_T);	5146	s_return (S_T);
5199	}	5147	}
5200	else	5148	else
5201	{	5149	{
5202	pointer elem = vector_elem (vec, i);	5150	pointer elem = vector_get (vec, i);
5203		5151
5204	ivalue_unchecked (cdr (args)) = i + 1;	5152	ivalue_unchecked (cdr (args)) = i + 1;
5205	s_save (SCHEME_A_ OP_PVECFROM, args, NIL);	5153	s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5206	SCHEME_V->args = elem;	5154	SCHEME_V->args = elem;
5207		5155
…		…
5282	/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */	5230	/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5283	typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);	5231	typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5284		5232
5285	typedef int (*test_predicate)(pointer);	5233	typedef int (*test_predicate)(pointer);
5286	static int	5234	static int
5287	is_any (pointer p)	5235	tst_any (pointer p)
5288	{	5236	{
5289	return 1;	5237	return 1;
5290	}	5238	}
5291		5239
5292	static int	5240	static int
5293	is_nonneg (pointer p)	5241	tst_inonneg (pointer p)
5294	{	5242	{
5295	return ivalue (p) >= 0 && is_integer (p);	5243	return is_integer (p) && ivalue_unchecked (p) >= 0;
5296	}	5244	}
5297		5245
5298	static int	5246	static int
5299	tst_is_list (pointer p)	5247	tst_is_list (SCHEME_P_ pointer p)
5300	{	5248	{
5301	return p == NIL \|\| is_pair (p);	5249	return p == NIL \|\| is_pair (p);
5302	}	5250	}
5303		5251
5304	/* Correspond carefully with following defines! */	5252	/* Correspond carefully with following defines! */
5305	static struct	5253	static struct
5306	{	5254	{
5307	test_predicate fct;	5255	test_predicate fct;
5308	const char *kind;	5256	const char *kind;
5309	} tests[] =	5257	} tests[] = {
5310	{
5311	{ is_any, 0 },	5258	{ tst_any , 0 },
5312	{ is_string, "string" },	5259	{ is_string , "string" },
5313	{ is_symbol, "symbol" },	5260	{ is_symbol , "symbol" },
5314	{ is_port, "port" },	5261	{ is_port , "port" },
5315	{ is_inport, "input port" },	5262	{ is_inport , "input port" },
5316	{ is_outport, "output port" },	5263	{ is_outport , "output port" },
5317	{ is_environment, "environment" },	5264	{ is_environment, "environment" },
5318	{ is_pair, "pair" },	5265	{ is_pair , "pair" },
5319	{ tst_is_list, "pair or '()" },	5266	{ 0 , "pair or '()" },
5320	{ is_character, "character" },	5267	{ is_character , "character" },
5321	{ is_vector, "vector" },	5268	{ is_vector , "vector" },
5322	{ is_number, "number" },	5269	{ is_number , "number" },
5323	{ is_integer, "integer" },	5270	{ is_integer , "integer" },
5324	{ is_nonneg, "non-negative integer" }	5271	{ tst_inonneg , "non-negative integer" }
5325	};	5272	};
5326		5273
5327	#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */	5274	#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5328	#define TST_ANY "\001"	5275	#define TST_ANY "\001"
5329	#define TST_STRING "\002"	5276	#define TST_STRING "\002"
…		…
5370	typedef struct	5317	typedef struct
5371	{	5318	{
5372	uint8_t func;	5319	uint8_t func;
5373	/dispatch_func func;//TODO: maybe optionally keep the pointer, for speed? /	5320	/dispatch_func func;//TODO: maybe optionally keep the pointer, for speed? /
5374	uint8_t builtin;	5321	uint8_t builtin;
		5322	#if USE_ERROR_CHECKING
5375	uint8_t min_arity;	5323	uint8_t min_arity;
5376	uint8_t max_arity;	5324	uint8_t max_arity;
5377	char arg_tests_encoding[3];	5325	char arg_tests_encoding[3];
		5326	#endif
5378	} op_code_info;	5327	} op_code_info;
5379		5328
5380	static const op_code_info dispatch_table[] = {	5329	static const op_code_info dispatch_table[] = {
		5330	#if USE_ERROR_CHECKING
5381	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },	5331	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
		5332	#else
		5333	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
		5334	#endif
5382	#include "opdefines.h"	5335	#include "opdefines.h"
5383	#undef OP_DEF	5336	#undef OP_DEF
5384	{0}	5337	{0}
5385	};	5338	};
5386		5339
…		…
5428	{	5381	{
5429	pointer arg = car (arglist);	5382	pointer arg = car (arglist);
5430		5383
5431	j = t[0];	5384	j = t[0];
5432		5385
		5386	/TODO: tst_is_list has different prototype - fix if other tests acquire same prototype /
		5387	if (j == TST_LIST[0])
		5388	{
		5389	if (!tst_is_list (SCHEME_A_ arg))
		5390	break;
		5391	}
		5392	else
		5393	{
5433	if (!tests[j - 1].fct (arg))	5394	if (!tests[j - 1].fct (arg))
5434	break;	5395	break;
		5396	}
5435		5397
5436	if (t[1]) /* last test is replicated as necessary */	5398	if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5437	t++;	5399	t++;
5438		5400
5439	arglist = cdr (arglist);	5401	arglist = cdr (arglist);
5440	i++;	5402	i++;
5441	}	5403	}
…		…
5496	mk_proc (SCHEME_P_ enum scheme_opcodes op)	5458	mk_proc (SCHEME_P_ enum scheme_opcodes op)
5497	{	5459	{
5498	pointer y = get_cell (SCHEME_A_ NIL, NIL);	5460	pointer y = get_cell (SCHEME_A_ NIL, NIL);
5499	set_typeflag (y, (T_PROC \| T_ATOM));	5461	set_typeflag (y, (T_PROC \| T_ATOM));
5500	ivalue_unchecked (y) = op;	5462	ivalue_unchecked (y) = op;
5501	set_num_integer (y);
5502	return y;	5463	return y;
5503	}	5464	}
5504		5465
5505	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */	5466	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5506	static int	5467	static int

Diff Legend

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

Comparing cvsroot/microscheme/scheme.c (file contents): Revision 1.24 by root, Fri Nov 27 02:12:08 2015 UTC vs. Revision 1.28 by root, Sat Nov 28 08:09:04 2015 UTC

Diff Legend

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.24 by root, Fri Nov 27 02:12:08 2015 UTC vs.
Revision 1.28 by root, Sat Nov 28 08:09:04 2015 UTC