ViewVC Help

View File | Revision Log | Show Annotations | Download File

/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.37 by root, Sun Nov 29 05:09:24 2015 UTC

…		…
34		34
35	#include <sys/types.h>	35	#include <sys/types.h>
36	#include <sys/stat.h>	36	#include <sys/stat.h>
37	#include <fcntl.h>	37	#include <fcntl.h>
38		38
		39	#if !USE_ERROR_CHECKING
		40	# define NDEBUG
		41	#endif
		42
		43	#include <assert.h>
		44	#include <stdlib.h>
39	#include <string.h>	45	#include <string.h>
40	#include <stdlib.h>
41		46
42	#include <limits.h>	47	#include <limits.h>
43	#include <inttypes.h>	48	#include <inttypes.h>
44	#include <float.h>	49	#include <float.h>
45	//#include <ctype.h>	50	//#include <ctype.h>
		51
		52	#if '1' != '0' + 1 \
		53	|| '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
		54	|| '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
		55	|| 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
		56	|| 'f' != 'a' + 5
		57	# error "execution character set digits not consecutive"
		58	#endif
46		59
47	enum {	60	enum {
48	TOK_EOF,	61	TOK_EOF,
49	TOK_LPAREN,	62	TOK_LPAREN,
50	TOK_RPAREN,	63	TOK_RPAREN,
51	TOK_DOT,	64	TOK_DOT,
52	TOK_ATOM,	65	TOK_ATOM,
		66	TOK_DOTATOM, /* atom name starting with '.' */
		67	TOK_STRATOM, /* atom name enclosed in | */
53	TOK_QUOTE,	68	TOK_QUOTE,
54	TOK_DQUOTE,	69	TOK_DQUOTE,
55	TOK_BQUOTE,	70	TOK_BQUOTE,
56	TOK_COMMA,	71	TOK_COMMA,
57	TOK_ATMARK,	72	TOK_ATMARK,
…		…
182	# define FIRST_CELLSEGS 3	197	# define FIRST_CELLSEGS 3
183	#endif	198	#endif
184		199
185	enum scheme_types	200	enum scheme_types
186	{	201	{
		202	T_INTEGER,
187	T_FREE,	203	T_REAL,
188	T_STRING,	204	T_STRING,
189	T_NUMBER,
190	T_SYMBOL,	205	T_SYMBOL,
191	T_PROC,	206	T_PROC,
192	T_PAIR,	207	T_PAIR, /* also used for free cells */
193	T_CLOSURE,	208	T_CLOSURE,
194	T_CONTINUATION,	209	T_CONTINUATION,
195	T_FOREIGN,	210	T_FOREIGN,
196	T_CHARACTER,	211	T_CHARACTER,
197	T_PORT,	212	T_PORT,
…		…
207	#define T_SYNTAX 0x0010	222	#define T_SYNTAX 0x0010
208	#define T_IMMUTABLE 0x0020	223	#define T_IMMUTABLE 0x0020
209	#define T_ATOM 0x0040 /* only for gc */	224	#define T_ATOM 0x0040 /* only for gc */
210	#define T_MARK 0x0080 /* only for gc */	225	#define T_MARK 0x0080 /* only for gc */
211		226
		227	/* num, for generic arithmetic */
		228	struct num
		229	{
		230	IVALUE ivalue;
		231	#if USE_REAL
		232	RVALUE rvalue;
		233	char is_fixnum;
		234	#endif
		235	};
		236
		237	#if USE_REAL
		238	# define num_is_fixnum(n) (n).is_fixnum
		239	# define num_set_fixnum(n,f) (n).is_fixnum = (f)
		240	# define num_ivalue(n) (n).ivalue
		241	# define num_rvalue(n) (n).rvalue
		242	# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
		243	# define num_set_rvalue(n,r) (n).rvalue = (r)
		244	#else
		245	# define num_is_fixnum(n) 1
		246	# define num_set_fixnum(n,f) 0
		247	# define num_ivalue(n) (n).ivalue
		248	# define num_rvalue(n) (n).ivalue
		249	# define num_set_ivalue(n,i) (n).ivalue = (i)
		250	# define num_set_rvalue(n,r) (n).ivalue = (r)
		251	#endif
		252
212	enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };	253	enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
213		254
214	static num num_op (enum num_op op, num a, num b);	255	static num num_op (enum num_op op, num a, num b);
215	static num num_intdiv (num a, num b);	256	static num num_intdiv (num a, num b);
216	static num num_rem (num a, num b);	257	static num num_rem (num a, num b);
…		…
219	#if USE_MATH	260	#if USE_MATH
220	static double round_per_R5RS (double x);	261	static double round_per_R5RS (double x);
221	#endif	262	#endif
222	static int is_zero_rvalue (RVALUE x);	263	static int is_zero_rvalue (RVALUE x);
223		264
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;	265	static num num_zero;
231	static num num_one;	266	static num num_one;
232		267
233	/* macros for cell operations */	268	/* macros for cell operations */
234	#define typeflag(p) ((p)->flag + 0)	269	#define typeflag(p) ((p)->flag + 0)
…		…
242	}	277	}
243		278
244	#define strvalue(p) ((p)->object.string.svalue)	279	#define strvalue(p) ((p)->object.string.svalue)
245	#define strlength(p) ((p)->object.string.length)	280	#define strlength(p) ((p)->object.string.length)
246		281
247	INTERFACE int is_list (SCHEME_P_ pointer p);
248
249	INTERFACE int	282	INTERFACE int
250	is_vector (pointer p)	283	is_vector (pointer p)
251	{	284	{
252	return type (p) == T_VECTOR;	285	return type (p) == T_VECTOR;
253	}	286	}
254		287
255	#define vecvalue(p) ((p)->object.vector.vvalue)	288	#define vecvalue(p) ((p)->object.vector.vvalue)
256	#define veclength(p) ((p)->object.vector.length)	289	#define veclength(p) ((p)->object.vector.length)
257	INTERFACE void fill_vector (pointer vec, pointer obj);	290	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);	291	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
260	INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a);	292	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
261		293
262	INTERFACE uint32_t	294	INTERFACE int
263	vector_length (pointer vec)	295	is_integer (pointer p)
264	{	296	{
265	return vec->object.vector.length;	297	return type (p) == T_INTEGER;
		298	}
		299
		300	/* not the same as in scheme, where integers are (correctly :) reals */
		301	INTERFACE int
		302	is_real (pointer p)
		303	{
		304	return type (p) == T_REAL;
266	}	305	}
267		306
268	INTERFACE int	307	INTERFACE int
269	is_number (pointer p)	308	is_number (pointer p)
270	{	309	{
271	return type (p) == T_NUMBER;	310	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	}	311	}
291		312
292	INTERFACE int	313	INTERFACE int
293	is_character (pointer p)	314	is_character (pointer p)
294	{	315	{
…		…
299	string_value (pointer p)	320	string_value (pointer p)
300	{	321	{
301	return strvalue (p);	322	return strvalue (p);
302	}	323	}
303		324
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)	325	#define ivalue_unchecked(p) (p)->object.ivalue
		326	#define set_ivalue(p,v) (p)->object.ivalue = (v)
		327
335	#if USE_REAL	328	#if USE_REAL
336	# define rvalue_unchecked(p) ((p)->object.number.value.rvalue)	329	#define rvalue_unchecked(p) (p)->object.rvalue
337	# define set_num_integer(p) (p)->object.number.is_fixnum=1;	330	#define set_rvalue(p,v) (p)->object.rvalue = (v)
338	# define set_num_real(p) (p)->object.number.is_fixnum=0;
339	#else	331	#else
340	# define rvalue_unchecked(p) ((p)->object.number.value.ivalue)	332	#define rvalue_unchecked(p) (p)->object.ivalue
341	# define set_num_integer(p) 0	333	#define set_rvalue(p,v) (p)->object.ivalue = (v)
342	# define set_num_real(p) 0
343	#endif	334	#endif
344		335
345	INTERFACE long	336	INTERFACE long
346	charvalue (pointer p)	337	charvalue (pointer p)
347	{	338	{
…		…
452	syntaxname (pointer p)	443	syntaxname (pointer p)
453	{	444	{
454	return strvalue (car (p));	445	return strvalue (car (p));
455	}	446	}
456		447
457	#define procnum(p) ivalue (p)	448	#define procnum(p) ivalue_unchecked (p)
458	static const char *procname (pointer x);	449	static const char *procname (pointer x);
459		450
460	INTERFACE int	451	INTERFACE int
461	is_closure (pointer p)	452	is_closure (pointer p)
462	{	453	{
…		…
523	setimmutable (pointer p)	514	setimmutable (pointer p)
524	{	515	{
525	#if USE_ERROR_CHECKING	516	#if USE_ERROR_CHECKING
526	set_typeflag (p, typeflag (p) | T_IMMUTABLE);	517	set_typeflag (p, typeflag (p) | T_IMMUTABLE);
527	#endif	518	#endif
		519	}
		520
		521	/* Result is:
		522	proper list: length
		523	circular list: -1
		524	not even a pair: -2
		525	dotted list: -2 minus length before dot
		526	*/
		527	INTERFACE int
		528	list_length (SCHEME_P_ pointer a)
		529	{
		530	int i = 0;
		531	pointer slow, fast;
		532
		533	slow = fast = a;
		534
		535	while (1)
		536	{
		537	if (fast == NIL)
		538	return i;
		539
		540	if (!is_pair (fast))
		541	return -2 - i;
		542
		543	fast = cdr (fast);
		544	++i;
		545
		546	if (fast == NIL)
		547	return i;
		548
		549	if (!is_pair (fast))
		550	return -2 - i;
		551
		552	++i;
		553	fast = cdr (fast);
		554
		555	/* Safe because we would have already returned if `fast'
		556	encountered a non-pair. */
		557	slow = cdr (slow);
		558
		559	if (fast == slow)
		560	{
		561	/* the fast pointer has looped back around and caught up
		562	with the slow pointer, hence the structure is circular,
		563	not of finite length, and therefore not a list */
		564	return -1;
		565	}
		566	}
		567	}
		568
		569	INTERFACE int
		570	is_list (SCHEME_P_ pointer a)
		571	{
		572	return list_length (SCHEME_A_ a) >= 0;
528	}	573	}
529		574
530	#if USE_CHAR_CLASSIFIERS	575	#if USE_CHAR_CLASSIFIERS
531	ecb_inline int	576	ecb_inline int
532	Cisalpha (int c)	577	Cisalpha (int c)
…		…
621	#endif	666	#endif
622		667
623	static int file_push (SCHEME_P_ const char *fname);	668	static int file_push (SCHEME_P_ const char *fname);
624	static void file_pop (SCHEME_P);	669	static void file_pop (SCHEME_P);
625	static int file_interactive (SCHEME_P);	670	static int file_interactive (SCHEME_P);
626	ecb_inline int is_one_of (char *s, int c);	671	ecb_inline int is_one_of (const char *s, int c);
627	static int alloc_cellseg (SCHEME_P_ int n);	672	static int alloc_cellseg (SCHEME_P_ int n);
628	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);	673	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
629	static void finalize_cell (SCHEME_P_ pointer a);	674	static void finalize_cell (SCHEME_P_ pointer a);
630	static int count_consecutive_cells (pointer x, int needed);	675	static int count_consecutive_cells (pointer x, int needed);
631	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);	676	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
…		…
648	static void mark (pointer a);	693	static void mark (pointer a);
649	static void gc (SCHEME_P_ pointer a, pointer b);	694	static void gc (SCHEME_P_ pointer a, pointer b);
650	static int basic_inchar (port *pt);	695	static int basic_inchar (port *pt);
651	static int inchar (SCHEME_P);	696	static int inchar (SCHEME_P);
652	static void backchar (SCHEME_P_ int c);	697	static void backchar (SCHEME_P_ int c);
653	static char *readstr_upto (SCHEME_P_ char *delim);	698	static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
654	static pointer readstrexp (SCHEME_P);	699	static pointer readstrexp (SCHEME_P_ char delim);
655	ecb_inline int skipspace (SCHEME_P);	700	ecb_inline int skipspace (SCHEME_P);
656	static int token (SCHEME_P);	701	static int token (SCHEME_P);
657	static void printslashstring (SCHEME_P_ char *s, int len);	702	static void printslashstring (SCHEME_P_ char *s, int len);
658	static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);	703	static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
659	static void printatom (SCHEME_P_ pointer l, int f);	704	static void printatom (SCHEME_P_ pointer l, int f);
…		…
676	static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);	721	static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
677	static void assign_syntax (SCHEME_P_ const char *name);	722	static void assign_syntax (SCHEME_P_ const char *name);
678	static int syntaxnum (pointer p);	723	static int syntaxnum (pointer p);
679	static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);	724	static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
680		725
		726	static IVALUE
		727	ivalue (pointer x)
		728	{
		729	return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
		730	}
		731
		732	static RVALUE
		733	rvalue (pointer x)
		734	{
		735	return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
		736	}
		737
		738	INTERFACE num
		739	nvalue (pointer x)
		740	{
		741	num n;
		742
		743	num_set_fixnum (n, is_integer (x));
		744
		745	if (num_is_fixnum (n))
		746	num_set_ivalue (n, ivalue_unchecked (x));
		747	else
		748	num_set_rvalue (n, rvalue_unchecked (x));
		749
		750	return n;
		751	}
		752
681	static num	753	static num
682	num_op (enum num_op op, num a, num b)	754	num_op (enum num_op op, num a, num b)
683	{	755	{
684	num ret;	756	num ret;
685		757
686	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	758	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
687		759
688	if (num_is_fixnum (ret))	760	if (num_is_fixnum (ret))
689	{	761	{
690	IVALUE av = num_get_ivalue (a);
691	IVALUE bv = num_get_ivalue (b);
692
693	switch (op)	762	switch (op)
694	{	763	{
695	case NUM_ADD: av += bv; break;	764	case NUM_ADD: a.ivalue += b.ivalue; break;
696	case NUM_SUB: av -= bv; break;	765	case NUM_SUB: a.ivalue -= b.ivalue; break;
697	case NUM_MUL: av *= bv; break;	766	case NUM_MUL: a.ivalue *= b.ivalue; break;
698	case NUM_INTDIV: av /= bv; break;	767	case NUM_INTDIV: a.ivalue /= b.ivalue; break;
699	}	768	}
700		769
701	num_set_ivalue (ret, av);	770	num_set_ivalue (ret, a.ivalue);
702	}	771	}
		772	#if USE_REAL
703	else	773	else
704	{	774	{
705	RVALUE av = num_get_rvalue (a);
706	RVALUE bv = num_get_rvalue (b);
707
708	switch (op)	775	switch (op)
709	{	776	{
710	case NUM_ADD: av += bv; break;	777	case NUM_ADD: a.rvalue += b.rvalue; break;
711	case NUM_SUB: av -= bv; break;	778	case NUM_SUB: a.rvalue -= b.rvalue; break;
712	case NUM_MUL: av *= bv; break;	779	case NUM_MUL: a.rvalue *= b.rvalue; break;
713	case NUM_INTDIV: av /= bv; break;	780	case NUM_INTDIV: a.rvalue /= b.rvalue; break;
714	}	781	}
715		782
716	num_set_rvalue (ret, av);	783	num_set_rvalue (ret, a.rvalue);
717	}	784	}
		785	#endif
718		786
719	return ret;	787	return ret;
720	}	788	}
721		789
722	static num	790	static num
723	num_div (num a, num b)	791	num_div (num a, num b)
724	{	792	{
725	num ret;	793	num ret;
726		794
727	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0);	795	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
728		796
729	if (num_is_fixnum (ret))	797	if (num_is_fixnum (ret))
730	num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));	798	num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
731	else	799	else
732	num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));	800	num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
733		801
734	return ret;	802	return ret;
735	}	803	}
736		804
737	static num	805	static num
…		…
739	{	807	{
740	num ret;	808	num ret;
741	long e1, e2, res;	809	long e1, e2, res;
742		810
743	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	811	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
744	e1 = num_get_ivalue (a);	812	e1 = num_ivalue (a);
745	e2 = num_get_ivalue (b);	813	e2 = num_ivalue (b);
746	res = e1 % e2;	814	res = e1 % e2;
747		815
748	/* remainder should have same sign as second operand */	816	/* remainder should have same sign as second operand */
749	if (res > 0)	817	if (res > 0)
750	{	818	{
…		…
766	{	834	{
767	num ret;	835	num ret;
768	long e1, e2, res;	836	long e1, e2, res;
769		837
770	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	838	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
771	e1 = num_get_ivalue (a);	839	e1 = num_ivalue (a);
772	e2 = num_get_ivalue (b);	840	e2 = num_ivalue (b);
773	res = e1 % e2;	841	res = e1 % e2;
774		842
775	/* modulo should have same sign as second operand */	843	/* modulo should have same sign as second operand */
776	if (res * e2 < 0)	844	if (res * e2 < 0)
777	res += e2;	845	res += e2;
…		…
787	int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);	855	int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
788	int ret;	856	int ret;
789		857
790	if (is_fixnum)	858	if (is_fixnum)
791	{	859	{
792	IVALUE av = num_get_ivalue (a);	860	IVALUE av = num_ivalue (a);
793	IVALUE bv = num_get_ivalue (b);	861	IVALUE bv = num_ivalue (b);
794		862
795	ret = av == bv ? 0 : av < bv ? -1 : +1;	863	ret = av == bv ? 0 : av < bv ? -1 : +1;
796	}	864	}
797	else	865	else
798	{	866	{
799	RVALUE av = num_get_rvalue (a);	867	RVALUE av = num_rvalue (a);
800	RVALUE bv = num_get_rvalue (b);	868	RVALUE bv = num_rvalue (b);
801		869
802	ret = av == bv ? 0 : av < bv ? -1 : +1;	870	ret = av == bv ? 0 : av < bv ? -1 : +1;
803	}	871	}
804		872
805	return ret;	873	return ret;
…		…
868	return k;	936	return k;
869		937
870	i = ++SCHEME_V->last_cell_seg;	938	i = ++SCHEME_V->last_cell_seg;
871	SCHEME_V->alloc_seg[i] = cp;	939	SCHEME_V->alloc_seg[i] = cp;
872		940
873	/* insert new segment in address order */
874	newp = (pointer)cp;	941	newp = (pointer)cp;
875	SCHEME_V->cell_seg[i] = newp;	942	SCHEME_V->cell_seg[i] = newp;
876	SCHEME_V->cell_segsize[i] = segsize;	943	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;	944	SCHEME_V->fcells += segsize;
893	last = newp + segsize - 1;	945	last = newp + segsize - 1;
894		946
895	for (p = newp; p <= last; p++)	947	for (p = newp; p <= last; p++)
896	{	948	{
897	set_typeflag (p, T_FREE);	949	set_typeflag (p, T_PAIR);
898	set_car (p, NIL);	950	set_car (p, NIL);
899	set_cdr (p, p + 1);	951	set_cdr (p, p + 1);
900	}	952	}
901		953
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);	954	set_cdr (last, SCHEME_V->free_cell);
906	SCHEME_V->free_cell = newp;	955	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	}	956	}
919		957
920	return n;	958	return n;
921	}	959	}
922		960
…		…
1001	/* Record it as a vector so that gc understands it. */	1039	/* Record it as a vector so that gc understands it. */
1002	set_typeflag (v, T_VECTOR | T_ATOM);	1040	set_typeflag (v, T_VECTOR | T_ATOM);
1003		1041
1004	v->object.vector.vvalue = e;	1042	v->object.vector.vvalue = e;
1005	v->object.vector.length = len;	1043	v->object.vector.length = len;
1006	fill_vector (v, init);	1044	fill_vector (v, 0, init);
1007	push_recent_alloc (SCHEME_A_ v, NIL);	1045	push_recent_alloc (SCHEME_A_ v, NIL);
1008		1046
1009	return v;	1047	return v;
1010	}	1048	}
1011		1049
…		…
1056	return x;	1094	return x;
1057	}	1095	}
1058		1096
1059	/* ========== oblist implementation ========== */	1097	/* ========== oblist implementation ========== */
1060		1098
		1099	static pointer
		1100	generate_symbol (SCHEME_P_ const char *name)
		1101	{
		1102	pointer x = mk_string (SCHEME_A_ name);
		1103	setimmutable (x);
		1104	x = immutable_cons (x, NIL);
		1105	set_typeflag (x, T_SYMBOL);
		1106	return x;
		1107	}
		1108
1061	#ifndef USE_OBJECT_LIST	1109	#ifndef USE_OBJECT_LIST
1062		1110
		1111	static int
1063	static int hash_fn (const char *key, int table_size);	1112	hash_fn (const char *key, int table_size)
		1113	{
		1114	const unsigned char *p = key;
		1115	uint32_t hash = 2166136261;
		1116
		1117	while (*p)
		1118	hash = (hash ^ *p++) * 16777619;
		1119
		1120	return hash % table_size;
		1121	}
1064		1122
1065	static pointer	1123	static pointer
1066	oblist_initial_value (SCHEME_P)	1124	oblist_initial_value (SCHEME_P)
1067	{	1125	{
1068	return mk_vector (SCHEME_A_ 461); /* probably should be bigger */	1126	return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
…		…
1070		1128
1071	/* returns the new symbol */	1129	/* returns the new symbol */
1072	static pointer	1130	static pointer
1073	oblist_add_by_name (SCHEME_P_ const char *name)	1131	oblist_add_by_name (SCHEME_P_ const char *name)
1074	{	1132	{
1075	int location;	1133	pointer x = generate_symbol (SCHEME_A_ name);
1076
1077	pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1078	set_typeflag (x, T_SYMBOL);
1079	setimmutable (car (x));
1080
1081	location = hash_fn (name, veclength (SCHEME_V->oblist));	1134	int 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)));	1135	vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1083	return x;	1136	return x;
1084	}	1137	}
1085		1138
1086	ecb_inline pointer	1139	ecb_inline pointer
1087	oblist_find_by_name (SCHEME_P_ const char *name)	1140	oblist_find_by_name (SCHEME_P_ const char *name)
…		…
1090	pointer x;	1143	pointer x;
1091	char *s;	1144	char *s;
1092		1145
1093	location = hash_fn (name, veclength (SCHEME_V->oblist));	1146	location = hash_fn (name, veclength (SCHEME_V->oblist));
1094		1147
1095	for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x))	1148	for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1096	{	1149	{
1097	s = symname (car (x));	1150	s = symname (car (x));
1098		1151
1099	/* case-insensitive, per R5RS section 2 */	1152	/* case-insensitive, per R5RS section 2 */
1100	if (stricmp (name, s) == 0)	1153	if (stricmp (name, s) == 0)
…		…
1110	int i;	1163	int i;
1111	pointer x;	1164	pointer x;
1112	pointer ob_list = NIL;	1165	pointer ob_list = NIL;
1113		1166
1114	for (i = 0; i < veclength (SCHEME_V->oblist); i++)	1167	for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1115	for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x))	1168	for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1116	ob_list = cons (x, ob_list);	1169	ob_list = cons (x, ob_list);
1117		1170
1118	return ob_list;	1171	return ob_list;
1119	}	1172	}
1120		1173
…		…
1146		1199
1147	/* returns the new symbol */	1200	/* returns the new symbol */
1148	static pointer	1201	static pointer
1149	oblist_add_by_name (SCHEME_P_ const char *name)	1202	oblist_add_by_name (SCHEME_P_ const char *name)
1150	{	1203	{
1151	pointer x;	1204	pointer x = mk_string (SCHEME_A_ name);
1152
1153	x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1154	set_typeflag (x, T_SYMBOL);	1205	set_typeflag (x, T_SYMBOL);
1155	setimmutable (car (x));	1206	setimmutable (x);
1156	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);	1207	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1157	return x;	1208	return x;
1158	}	1209	}
1159		1210
1160	static pointer	1211	static pointer
…		…
1193	mk_character (SCHEME_P_ int c)	1244	mk_character (SCHEME_P_ int c)
1194	{	1245	{
1195	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1246	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196		1247
1197	set_typeflag (x, (T_CHARACTER | T_ATOM));	1248	set_typeflag (x, (T_CHARACTER | T_ATOM));
1198	ivalue_unchecked (x) = c & 0xff;	1249	set_ivalue (x, c & 0xff);
1199	set_num_integer (x);	1250
1200	return x;	1251	return x;
1201	}	1252	}
1202		1253
1203	/* get number atom (integer) */	1254	/* get number atom (integer) */
1204	INTERFACE pointer	1255	INTERFACE pointer
1205	mk_integer (SCHEME_P_ long num)	1256	mk_integer (SCHEME_P_ long n)
1206	{	1257	{
1207	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1258	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1208		1259
1209	set_typeflag (x, (T_NUMBER | T_ATOM));	1260	set_typeflag (x, (T_INTEGER | T_ATOM));
1210	ivalue_unchecked (x) = num;	1261	set_ivalue (x, n);
1211	set_num_integer (x);	1262
1212	return x;	1263	return x;
1213	}	1264	}
1214		1265
1215	INTERFACE pointer	1266	INTERFACE pointer
1216	mk_real (SCHEME_P_ RVALUE n)	1267	mk_real (SCHEME_P_ RVALUE n)
1217	{	1268	{
		1269	#if USE_REAL
1218	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1270	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1219		1271
1220	set_typeflag (x, (T_NUMBER | T_ATOM));	1272	set_typeflag (x, (T_REAL | T_ATOM));
1221	rvalue_unchecked (x) = n;	1273	set_rvalue (x, n);
1222	set_num_real (x);	1274
1223	return x;	1275	return x;
		1276	#else
		1277	return mk_integer (SCHEME_A_ n);
		1278	#endif
1224	}	1279	}
1225		1280
1226	static pointer	1281	static pointer
1227	mk_number (SCHEME_P_ const num n)	1282	mk_number (SCHEME_P_ const num n)
1228	{	1283	{
		1284	#if USE_REAL
1229	if (num_is_fixnum (n))	1285	return num_is_fixnum (n)
		1286	? mk_integer (SCHEME_A_ num_ivalue (n))
		1287	: mk_real (SCHEME_A_ num_rvalue (n));
		1288	#else
1230	return mk_integer (SCHEME_A_ num_get_ivalue (n));	1289	return mk_integer (SCHEME_A_ num_ivalue (n));
1231	else	1290	#endif
1232	return mk_real (SCHEME_A_ num_get_rvalue (n));
1233	}	1291	}
1234		1292
1235	/* allocate name to string area */	1293	/* allocate name to string area */
1236	static char *	1294	static char *
1237	store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)	1295	store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
…		…
1243	SCHEME_V->no_memory = 1;	1301	SCHEME_V->no_memory = 1;
1244	return SCHEME_V->strbuff;	1302	return SCHEME_V->strbuff;
1245	}	1303	}
1246		1304
1247	if (str)	1305	if (str)
1248	{	1306	memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1249	int l = strlen (str);
1250
1251	if (l > len_str)
1252	l = len_str;
1253
1254	memcpy (q, str, l);
1255	q[l] = 0;
1256	}
1257	else	1307	else
1258	{
1259	memset (q, fill, len_str);	1308	memset (q, fill, len_str);
		1309
1260	q[len_str] = 0;	1310	q[len_str] = 0;
1261	}
1262		1311
1263	return q;	1312	return q;
1264	}	1313	}
1265		1314
1266	INTERFACE pointer	1315	INTERFACE pointer
…		…
1280	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1329	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1281		1330
1282	set_typeflag (x, T_STRING | T_ATOM);	1331	set_typeflag (x, T_STRING | T_ATOM);
1283	strvalue (x) = store_string (SCHEME_A_ len, str, 0);	1332	strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1284	strlength (x) = len;	1333	strlength (x) = len;
		1334
1285	return x;	1335	return x;
1286	}	1336	}
1287		1337
1288	INTERFACE pointer	1338	INTERFACE pointer
1289	mk_string (SCHEME_P_ const char *str)	1339	mk_string (SCHEME_P_ const char *str)
…		…
1296	{	1346	{
1297	return get_vector_object (SCHEME_A_ len, NIL);	1347	return get_vector_object (SCHEME_A_ len, NIL);
1298	}	1348	}
1299		1349
1300	INTERFACE void	1350	INTERFACE void
1301	fill_vector (pointer vec, pointer obj)	1351	fill_vector (pointer vec, uint32_t start, pointer obj)
1302	{	1352	{
1303	int i;	1353	int i;
1304		1354
1305	for (i = 0; i < vec->object.vector.length; i++)	1355	for (i = start; i < veclength (vec); i++)
1306	vecvalue (vec)[i] = obj;	1356	vecvalue (vec)[i] = obj;
1307	}	1357	}
1308		1358
		1359	INTERFACE void
		1360	vector_resize (pointer vec, uint32_t newsize, pointer fill)
		1361	{
		1362	uint32_t oldsize = veclength (vec);
		1363	vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
		1364	veclength (vec) = newsize;
		1365	fill_vector (vec, oldsize, fill);
		1366	}
		1367
1309	INTERFACE pointer	1368	INTERFACE pointer
1310	vector_elem (pointer vec, uint32_t ielem)	1369	vector_get (pointer vec, uint32_t ielem)
1311	{	1370	{
1312	return vecvalue(vec)[ielem];	1371	return vecvalue(vec)[ielem];
1313	}	1372	}
1314		1373
1315	INTERFACE void	1374	INTERFACE void
1316	set_vector_elem (pointer vec, uint32_t ielem, pointer a)	1375	vector_set (pointer vec, uint32_t ielem, pointer a)
1317	{	1376	{
1318	vecvalue(vec)[ielem] = a;	1377	vecvalue(vec)[ielem] = a;
1319	}	1378	}
1320		1379
1321	/* get new symbol */	1380	/* get new symbol */
…		…
1333		1392
1334	INTERFACE pointer	1393	INTERFACE pointer
1335	gensym (SCHEME_P)	1394	gensym (SCHEME_P)
1336	{	1395	{
1337	pointer x;	1396	pointer x;
1338
1339	for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1340	{
1341	char name[40] = "gensym-";	1397	char name[40] = "gensym-";
1342	xnum (name + 7, SCHEME_V->gensym_cnt);	1398	xnum (name + 7, SCHEME_V->gensym_cnt);
1343		1399
1344	/* first check oblist */	1400	return generate_symbol (SCHEME_A_ name);
1345	x = oblist_find_by_name (SCHEME_A_ name);
1346
1347	if (x == NIL)
1348	{
1349	x = oblist_add_by_name (SCHEME_A_ name);
1350	return x;
1351	}
1352	}
1353
1354	return NIL;
1355	}	1401	}
1356		1402
1357	/* make symbol or number atom from string */	1403	/* make symbol or number atom from string */
1358	static pointer	1404	static pointer
1359	mk_atom (SCHEME_P_ char *q)	1405	mk_atom (SCHEME_P_ char *q)
…		…
1413	}	1459	}
1414	else if ((c == 'e') || (c == 'E'))	1460	else if ((c == 'e') || (c == 'E'))
1415	{	1461	{
1416	if (!has_fp_exp)	1462	if (!has_fp_exp)
1417	{	1463	{
1418	has_dec_point = 1; /* decimal point illegal	1464	has_dec_point = 1; /* decimal point illegal from now on */
1419	from now on */
1420	p++;	1465	p++;
1421		1466
1422	if ((*p == '-') || (*p == '+') || isdigit (*p))	1467	if ((*p == '-') || (*p == '+') || isdigit (*p))
1423	continue;	1468	continue;
1424	}	1469	}
…		…
1512		1557
1513	if (ecb_expect_false (is_vector (p)))	1558	if (ecb_expect_false (is_vector (p)))
1514	{	1559	{
1515	int i;	1560	int i;
1516		1561
1517	for (i = 0; i < p->object.vector.length; i++)	1562	for (i = 0; i < veclength (p); i++)
1518	mark (vecvalue (p)[i]);	1563	mark (vecvalue (p)[i]);
1519	}	1564	}
1520		1565
1521	if (is_atom (p))	1566	if (is_atom (p))
1522	goto E6;	1567	goto E6;
…		…
1620	if (is_mark (p))	1665	if (is_mark (p))
1621	clrmark (p);	1666	clrmark (p);
1622	else	1667	else
1623	{	1668	{
1624	/* reclaim cell */	1669	/* reclaim cell */
1625	if (typeflag (p) != T_FREE)	1670	if (typeflag (p) != T_PAIR)
1626	{	1671	{
1627	finalize_cell (SCHEME_A_ p);	1672	finalize_cell (SCHEME_A_ p);
1628	set_typeflag (p, T_FREE);	1673	set_typeflag (p, T_PAIR);
1629	set_car (p, NIL);	1674	set_car (p, NIL);
1630	}	1675	}
1631		1676
1632	++SCHEME_V->fcells;	1677	++SCHEME_V->fcells;
1633	set_cdr (p, SCHEME_V->free_cell);	1678	set_cdr (p, SCHEME_V->free_cell);
…		…
1635	}	1680	}
1636	}	1681	}
1637	}	1682	}
1638		1683
1639	if (SCHEME_V->gc_verbose)	1684	if (SCHEME_V->gc_verbose)
		1685	{
1640	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");	1686	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
		1687	}
1641	}	1688	}
1642		1689
1643	static void	1690	static void
1644	finalize_cell (SCHEME_P_ pointer a)	1691	finalize_cell (SCHEME_P_ pointer a)
1645	{	1692	{
…		…
2074	#endif	2121	#endif
2075	}	2122	}
2076		2123
2077	/* read characters up to delimiter, but cater to character constants */	2124	/* read characters up to delimiter, but cater to character constants */
2078	static char *	2125	static char *
2079	readstr_upto (SCHEME_P_ char *delim)	2126	readstr_upto (SCHEME_P_ int skip, const char *delim)
2080	{	2127	{
2081	char *p = SCHEME_V->strbuff;	2128	char *p = SCHEME_V->strbuff + skip;
2082		2129
2083	while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));	2130	while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2084		2131
2085	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')	2132	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2086	*p = 0;	2133	*p = 0;
…		…
2093	return SCHEME_V->strbuff;	2140	return SCHEME_V->strbuff;
2094	}	2141	}
2095		2142
2096	/* read string expression "xxx...xxx" */	2143	/* read string expression "xxx...xxx" */
2097	static pointer	2144	static pointer
2098	readstrexp (SCHEME_P)	2145	readstrexp (SCHEME_P_ char delim)
2099	{	2146	{
2100	char *p = SCHEME_V->strbuff;	2147	char *p = SCHEME_V->strbuff;
2101	int c;	2148	int c;
2102	int c1 = 0;	2149	int c1 = 0;
2103	enum
2104	{ st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;	2150	enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2105		2151
2106	for (;;)	2152	for (;;)
2107	{	2153	{
2108	c = inchar (SCHEME_A);	2154	c = inchar (SCHEME_A);
2109		2155
…		…
2111	return S_F;	2157	return S_F;
2112		2158
2113	switch (state)	2159	switch (state)
2114	{	2160	{
2115	case st_ok:	2161	case st_ok:
2116	switch (c)	2162	if (ecb_expect_false (c == delim))
2117	{
2118	case '\\':
2119	state = st_bsl;
2120	break;
2121
2122	case '"':
2123	*p = 0;
2124	return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);	2163	return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2125		2164
2126	default:	2165	if (ecb_expect_false (c == '\\'))
		2166	state = st_bsl;
		2167	else
2127	*p++ = c;	2168	*p++ = c;
2128	break;
2129	}
2130		2169
2131	break;	2170	break;
2132		2171
2133	case st_bsl:	2172	case st_bsl:
2134	switch (c)	2173	switch (c)
…		…
2164	case 'r':	2203	case 'r':
2165	*p++ = '\r';	2204	*p++ = '\r';
2166	state = st_ok;	2205	state = st_ok;
2167	break;	2206	break;
2168		2207
2169	case '"':
2170	*p++ = '"';
2171	state = st_ok;
2172	break;
2173
2174	default:	2208	default:
2175	*p++ = c;	2209	*p++ = c;
2176	state = st_ok;	2210	state = st_ok;
2177	break;	2211	break;
2178	}	2212	}
2179		2213
2180	break;	2214	break;
2181		2215
2182	case st_x1:	2216	case st_x1:
2183	case st_x2:	2217	case st_x2:
2184	c = toupper (c);	2218	c = tolower (c);
2185		2219
2186	if (c >= '0' && c <= 'F')	2220	if (c >= '0' && c <= '9')
2187	{
2188	if (c <= '9')
2189	c1 = (c1 << 4) + c - '0';	2221	c1 = (c1 << 4) + c - '0';
2190	else	2222	else if (c >= 'a' && c <= 'f')
2191	c1 = (c1 << 4) + c - 'A' + 10;	2223	c1 = (c1 << 4) + c - 'a' + 10;
2192
2193	if (state == st_x1)
2194	state = st_x2;
2195	else
2196	{
2197	*p++ = c1;
2198	state = st_ok;
2199	}
2200	}
2201	else	2224	else
2202	return S_F;	2225	return S_F;
		2226
		2227	if (state == st_x1)
		2228	state = st_x2;
		2229	else
		2230	{
		2231	*p++ = c1;
		2232	state = st_ok;
		2233	}
2203		2234
2204	break;	2235	break;
2205		2236
2206	case st_oct1:	2237	case st_oct1:
2207	case st_oct2:	2238	case st_oct2:
…		…
2211	backchar (SCHEME_A_ c);	2242	backchar (SCHEME_A_ c);
2212	state = st_ok;	2243	state = st_ok;
2213	}	2244	}
2214	else	2245	else
2215	{	2246	{
2216	if (state == st_oct2 && c1 >= 32)	2247	if (state == st_oct2 && c1 >= ' ')
2217	return S_F;	2248	return S_F;
2218		2249
2219	c1 = (c1 << 3) + (c - '0');	2250	c1 = (c1 << 3) + (c - '0');
2220		2251
2221	if (state == st_oct1)	2252	if (state == st_oct1)
…		…
2226	state = st_ok;	2257	state = st_ok;
2227	}	2258	}
2228	}	2259	}
2229		2260
2230	break;	2261	break;
2231
2232	}	2262	}
2233	}	2263	}
2234	}	2264	}
2235		2265
2236	/* check c is in chars */	2266	/* check c is in chars */
2237	ecb_inline int	2267	ecb_inline int
2238	is_one_of (char *s, int c)	2268	is_one_of (const char *s, int c)
2239	{	2269	{
2240	if (c == EOF)	2270	if (c == EOF)
2241	return 1;	2271	return 1;
2242		2272
2243	return !!strchr (s, c);	2273	return !!strchr (s, c);
…		…
2299		2329
2300	if (is_one_of (" \n\t", c))	2330	if (is_one_of (" \n\t", c))
2301	return TOK_DOT;	2331	return TOK_DOT;
2302	else	2332	else
2303	{	2333	{
2304	//TODO: ungetc twice in a row is not supported in C
2305	backchar (SCHEME_A_ c);	2334	backchar (SCHEME_A_ c);
2306	backchar (SCHEME_A_ '.');
2307	return TOK_ATOM;	2335	return TOK_DOTATOM;
2308	}	2336	}
		2337
		2338	case '|':
		2339	return TOK_STRATOM;
2309		2340
2310	case '\'':	2341	case '\'':
2311	return TOK_QUOTE;	2342	return TOK_QUOTE;
2312		2343
2313	case ';':	2344	case ';':
…		…
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	{
…		…
2782	/* () is #t in R5RS */	2812	/* () is #t in R5RS */
2783	#define is_true(p) ((p) != S_F)	2813	#define is_true(p) ((p) != S_F)
2784	#define is_false(p) ((p) == S_F)	2814	#define is_false(p) ((p) == S_F)
2785		2815
2786	/* ========== Environment implementation ========== */	2816	/* ========== Environment implementation ========== */
2787
2788	#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2789
2790	static int
2791	hash_fn (const char *key, int table_size)
2792	{
2793	const unsigned char *p = key;
2794	uint32_t hash = 2166136261;
2795
2796	while (*p)
2797	hash = (hash ^ *p++) * 16777619;
2798
2799	return hash % table_size;
2800	}
2801	#endif
2802		2817
2803	#ifndef USE_ALIST_ENV	2818	#ifndef USE_ALIST_ENV
2804		2819
2805	/*	2820	/*
2806	* In this implementation, each frame of the environment may be	2821	* In this implementation, each frame of the environment may be
…		…
2823		2838
2824	SCHEME_V->envir = immutable_cons (new_frame, old_env);	2839	SCHEME_V->envir = immutable_cons (new_frame, old_env);
2825	setenvironment (SCHEME_V->envir);	2840	setenvironment (SCHEME_V->envir);
2826	}	2841	}
2827		2842
		2843	static uint32_t
		2844	sym_hash (pointer sym, uint32_t size)
		2845	{
		2846	uintptr_t ptr = (uintptr_t)sym;
		2847
		2848	#if 0
		2849	/* table size is prime, so why mix */
		2850	ptr += ptr >> 32;
		2851	ptr += ptr >> 16;
		2852	ptr += ptr >> 8;
		2853	#endif
		2854
		2855	return ptr % size;
		2856	}
		2857
2828	ecb_inline void	2858	ecb_inline void
2829	new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)	2859	new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2830	{	2860	{
2831	pointer slot = immutable_cons (variable, value);	2861	pointer slot = immutable_cons (variable, value);
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 = sym_hash (variable, veclength (car (env)));
2836
2837	set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location)));	2866	vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2838	}	2867	}
2839	else	2868	else
2840	set_car (env, immutable_cons (slot, car (env)));	2869	set_car (env, immutable_cons (slot, car (env)));
2841	}	2870	}
2842		2871
2843	static pointer	2872	static pointer
2844	find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)	2873	find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2845	{	2874	{
2846	pointer x, y;	2875	pointer x, y;
2847	int location;
2848		2876
2849	for (x = env; x != NIL; x = cdr (x))	2877	for (x = env; x != NIL; x = cdr (x))
2850	{	2878	{
2851	if (is_vector (car (x)))	2879	if (is_vector (car (x)))
2852	{	2880	{
2853	location = hash_fn (symname (hdl), veclength (car (x)));	2881	int location = sym_hash (hdl, veclength (car (x)));
2854	y = vector_elem (car (x), location);	2882	y = vector_get (car (x), location);
2855	}	2883	}
2856	else	2884	else
2857	y = car (x);	2885	y = car (x);
2858		2886
2859	for (; y != NIL; y = cdr (y))	2887	for (; y != NIL; y = cdr (y))
2860	if (caar (y) == hdl)	2888	if (caar (y) == hdl)
2861	break;	2889	break;
2862		2890
2863	if (y != NIL)	2891	if (y != NIL)
		2892	return car (y);
		2893
		2894	if (!all)
2864	break;	2895	break;
2865
2866	if (!all)
2867	return NIL;
2868	}	2896	}
2869
2870	if (x != NIL)
2871	return car (y);
2872		2897
2873	return NIL;	2898	return NIL;
2874	}	2899	}
2875		2900
2876	#else /* USE_ALIST_ENV */	2901	#else /* USE_ALIST_ENV */
…		…
2898	for (y = car (x); y != NIL; y = cdr (y))	2923	for (y = car (x); y != NIL; y = cdr (y))
2899	if (caar (y) == hdl)	2924	if (caar (y) == hdl)
2900	break;	2925	break;
2901		2926
2902	if (y != NIL)	2927	if (y != NIL)
		2928	return car (y);
2903	break;	2929	break;
2904		2930
2905	if (!all)	2931	if (!all)
2906	return NIL;	2932	break;
2907	}	2933	}
2908
2909	if (x != NIL)
2910	return car (y);
2911		2934
2912	return NIL;	2935	return NIL;
2913	}	2936	}
2914		2937
2915	#endif /* USE_ALIST_ENV else */	2938	#endif /* USE_ALIST_ENV else */
…		…
3132	int i = 0;	3155	int i = 0;
3133	struct dump_stack_frame *frame = SCHEME_V->dump_base;	3156	struct dump_stack_frame *frame = SCHEME_V->dump_base;
3134		3157
3135	while (cont != NIL)	3158	while (cont != NIL)
3136	{	3159	{
3137	frame->op = ivalue (car (cont)); cont = cdr (cont);	3160	frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3138	frame->args = car (cont) ; cont = cdr (cont);	3161	frame->args = car (cont) ; cont = cdr (cont);
3139	frame->envir = car (cont) ; cont = cdr (cont);	3162	frame->envir = car (cont) ; cont = cdr (cont);
3140	frame->code = car (cont) ; cont = cdr (cont);	3163	frame->code = car (cont) ; cont = cdr (cont);
3141		3164
3142	++frame;	3165	++frame;
3143	++i;	3166	++i;
3144	}	3167	}
3145		3168
…		…
3174	SCHEME_V->value = a;	3197	SCHEME_V->value = a;
3175		3198
3176	if (dump == NIL)	3199	if (dump == NIL)
3177	return -1;	3200	return -1;
3178		3201
3179	SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump);	3202	SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3180	SCHEME_V->args = car (dump) ; dump = cdr (dump);	3203	SCHEME_V->args = car (dump) ; dump = cdr (dump);
3181	SCHEME_V->envir = car (dump) ; dump = cdr (dump);	3204	SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3182	SCHEME_V->code = car (dump) ; dump = cdr (dump);	3205	SCHEME_V->code = car (dump) ; dump = cdr (dump);
3183		3206
3184	SCHEME_V->dump = dump;	3207	SCHEME_V->dump = dump;
3185		3208
3186	return 0;	3209	return 0;
3187	}	3210	}
…		…
3393		3416
3394	case OP_TRACING:	3417	case OP_TRACING:
3395	{	3418	{
3396	int tr = SCHEME_V->tracing;	3419	int tr = SCHEME_V->tracing;
3397		3420
3398	SCHEME_V->tracing = ivalue (car (args));	3421	SCHEME_V->tracing = ivalue_unchecked (car (args));
3399	s_return (mk_integer (SCHEME_A_ tr));	3422	s_return (mk_integer (SCHEME_A_ tr));
3400	}	3423	}
3401		3424
3402	#endif	3425	#endif
3403		3426
…		…
3922	{	3945	{
3923	pointer args = SCHEME_V->args;	3946	pointer args = SCHEME_V->args;
3924	pointer x = car (args);	3947	pointer x = car (args);
3925	num v;	3948	num v;
3926		3949
3927	#if USE_MATH
3928	RVALUE dd;
3929	#endif
3930
3931	switch (op)	3950	switch (op)
3932	{	3951	{
3933	#if USE_MATH	3952	#if USE_MATH
3934	case OP_INEX2EX: /* inexact->exact */	3953	case OP_INEX2EX: /* inexact->exact */
		3954	{
3935	if (num_is_integer (x))	3955	if (is_integer (x))
3936	s_return (x);	3956	s_return (x);
3937	else if (modf (rvalue_unchecked (x), &dd) == 0)	3957
		3958	RVALUE r = rvalue_unchecked (x);
		3959
		3960	if (r == (RVALUE)(IVALUE)r)
3938	s_return (mk_integer (SCHEME_A_ ivalue (x)));	3961	s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3939	else	3962	else
3940	Error_1 ("inexact->exact: not integral:", x);	3963	Error_1 ("inexact->exact: not integral:", x);
		3964	}
3941		3965
3942	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));	3966	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))));	3967	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))));	3968	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))));	3969	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
…		…
3963	{	3987	{
3964	RVALUE result;	3988	RVALUE result;
3965	int real_result = 1;	3989	int real_result = 1;
3966	pointer y = cadr (args);	3990	pointer y = cadr (args);
3967		3991
3968	if (num_is_integer (x) && num_is_integer (y))	3992	if (is_integer (x) && is_integer (y))
3969	real_result = 0;	3993	real_result = 0;
3970		3994
3971	/* This 'if' is an R5RS compatibility fix. */	3995	/* This 'if' is an R5RS compatibility fix. */
3972	/* NOTE: Remove this 'if' fix for R6RS. */	3996	/* NOTE: Remove this 'if' fix for R6RS. */
3973	if (rvalue (x) == 0 && rvalue (y) < 0)	3997	if (rvalue (x) == 0 && rvalue (y) < 0)
…		…
3979	/* If the test fails, result is too big for integer. */	4003	/* If the test fails, result is too big for integer. */
3980	if (!real_result)	4004	if (!real_result)
3981	{	4005	{
3982	long result_as_long = result;	4006	long result_as_long = result;
3983		4007
3984	if (result != (RVALUE) result_as_long)	4008	if (result != result_as_long)
3985	real_result = 1;	4009	real_result = 1;
3986	}	4010	}
3987		4011
3988	if (real_result)	4012	if (real_result)
3989	s_return (mk_real (SCHEME_A_ result));	4013	s_return (mk_real (SCHEME_A_ result));
…		…
3994	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));	4018	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))));	4019	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3996		4020
3997	case OP_TRUNCATE:	4021	case OP_TRUNCATE:
3998	{	4022	{
3999	RVALUE rvalue_of_x;	4023	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)));	4024	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	}	4025	}
4008		4026
4009	case OP_ROUND:	4027	case OP_ROUND:
4010	if (num_is_integer (x))	4028	if (is_integer (x))
4011	s_return (x);	4029	s_return (x);
4012		4030
4013	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));	4031	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4014	#endif	4032	#endif
4015		4033
…		…
4135	}	4153	}
4136	else	4154	else
4137	Error_0 ("set-cdr!: unable to alter immutable pair");	4155	Error_0 ("set-cdr!: unable to alter immutable pair");
4138		4156
4139	case OP_CHAR2INT: /* char->integer */	4157	case OP_CHAR2INT: /* char->integer */
4140	s_return (mk_integer (SCHEME_A_ ivalue (x)));	4158	s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4141		4159
4142	case OP_INT2CHAR: /* integer->char */	4160	case OP_INT2CHAR: /* integer->char */
4143	s_return (mk_character (SCHEME_A_ ivalue (x)));	4161	s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4144		4162
4145	case OP_CHARUPCASE:	4163	case OP_CHARUPCASE:
4146	{	4164	{
4147	unsigned char c = ivalue (x);	4165	unsigned char c = ivalue_unchecked (x);
4148	c = toupper (c);	4166	c = toupper (c);
4149	s_return (mk_character (SCHEME_A_ c));	4167	s_return (mk_character (SCHEME_A_ c));
4150	}	4168	}
4151		4169
4152	case OP_CHARDNCASE:	4170	case OP_CHARDNCASE:
4153	{	4171	{
4154	unsigned char c = ivalue (x);	4172	unsigned char c = ivalue_unchecked (x);
4155	c = tolower (c);	4173	c = tolower (c);
4156	s_return (mk_character (SCHEME_A_ c));	4174	s_return (mk_character (SCHEME_A_ c));
4157	}	4175	}
4158		4176
4159	case OP_STR2SYM: /* string->symbol */	4177	case OP_STR2SYM: /* string->symbol */
…		…
4236	Error_1 ("atom->string: not an atom:", x);	4254	Error_1 ("atom->string: not an atom:", x);
4237	}	4255	}
4238		4256
4239	case OP_MKSTRING: /* make-string */	4257	case OP_MKSTRING: /* make-string */
4240	{	4258	{
4241	int fill = ' ';	4259	int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4242	int len;
4243
4244	len = ivalue (x);	4260	int len = ivalue_unchecked (x);
4245
4246	if (cdr (args) != NIL)
4247	fill = charvalue (cadr (args));
4248		4261
4249	s_return (mk_empty_string (SCHEME_A_ len, fill));	4262	s_return (mk_empty_string (SCHEME_A_ len, fill));
4250	}	4263	}
4251		4264
4252	case OP_STRLEN: /* string-length */	4265	case OP_STRLEN: /* string-length */
4253	s_return (mk_integer (SCHEME_A_ strlength (x)));	4266	s_return (mk_integer (SCHEME_A_ strlength (x)));
4254		4267
4255	case OP_STRREF: /* string-ref */	4268	case OP_STRREF: /* string-ref */
4256	{	4269	{
4257	char *str;
4258	int index;
4259
4260	str = strvalue (x);	4270	char *str = strvalue (x);
4261
4262	index = ivalue (cadr (args));	4271	int index = ivalue_unchecked (cadr (args));
4263		4272
4264	if (index >= strlength (x))	4273	if (index >= strlength (x))
4265	Error_1 ("string-ref: out of bounds:", cadr (args));	4274	Error_1 ("string-ref: out of bounds:", cadr (args));
4266		4275
4267	s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));	4276	s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4268	}	4277	}
4269		4278
4270	case OP_STRSET: /* string-set! */	4279	case OP_STRSET: /* string-set! */
4271	{	4280	{
4272	char *str;	4281	char *str = strvalue (x);
4273	int index;	4282	int index = ivalue_unchecked (cadr (args));
4274	int c;	4283	int c;
4275		4284
4276	if (is_immutable (x))	4285	if (is_immutable (x))
4277	Error_1 ("string-set!: unable to alter immutable string:", x);	4286	Error_1 ("string-set!: unable to alter immutable string:", x);
4278
4279	str = strvalue (x);
4280
4281	index = ivalue (cadr (args));
4282		4287
4283	if (index >= strlength (x))	4288	if (index >= strlength (x))
4284	Error_1 ("string-set!: out of bounds:", cadr (args));	4289	Error_1 ("string-set!: out of bounds:", cadr (args));
4285		4290
4286	c = charvalue (caddr (args));	4291	c = charvalue (caddr (args));
…		…
4309	s_return (newstr);	4314	s_return (newstr);
4310	}	4315	}
4311		4316
4312	case OP_SUBSTR: /* substring */	4317	case OP_SUBSTR: /* substring */
4313	{	4318	{
4314	char *str;	4319	char *str = strvalue (x);
4315	int index0;	4320	int index0 = ivalue_unchecked (cadr (args));
4316	int index1;	4321	int index1;
4317	int len;	4322	int len;
4318		4323
4319	str = strvalue (x);
4320
4321	index0 = ivalue (cadr (args));
4322
4323	if (index0 > strlength (x))	4324	if (index0 > strlength (x))
4324	Error_1 ("substring: start out of bounds:", cadr (args));	4325	Error_1 ("substring: start out of bounds:", cadr (args));
4325		4326
4326	if (cddr (args) != NIL)	4327	if (cddr (args) != NIL)
4327	{	4328	{
4328	index1 = ivalue (caddr (args));	4329	index1 = ivalue_unchecked (caddr (args));
4329		4330
4330	if (index1 > strlength (x) || index1 < index0)	4331	if (index1 > strlength (x) || index1 < index0)
4331	Error_1 ("substring: end out of bounds:", caddr (args));	4332	Error_1 ("substring: end out of bounds:", caddr (args));
4332	}	4333	}
4333	else	4334	else
…		…
4356	if (SCHEME_V->no_memory)	4357	if (SCHEME_V->no_memory)
4357	s_return (S_SINK);	4358	s_return (S_SINK);
4358	#endif	4359	#endif
4359		4360
4360	for (x = args, i = 0; is_pair (x); x = cdr (x), i++)	4361	for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4361	set_vector_elem (vec, i, car (x));	4362	vector_set (vec, i, car (x));
4362		4363
4363	s_return (vec);	4364	s_return (vec);
4364	}	4365	}
4365		4366
4366	case OP_MKVECTOR: /* make-vector */	4367	case OP_MKVECTOR: /* make-vector */
4367	{	4368	{
4368	pointer fill = NIL;	4369	pointer fill = NIL;
4369	int len;
4370	pointer vec;	4370	pointer vec;
4371
4372	len = ivalue (x);	4371	int len = ivalue_unchecked (x);
4373		4372
4374	if (cdr (args) != NIL)	4373	if (cdr (args) != NIL)
4375	fill = cadr (args);	4374	fill = cadr (args);
4376		4375
4377	vec = mk_vector (SCHEME_A_ len);	4376	vec = mk_vector (SCHEME_A_ len);
…		…
4380	if (SCHEME_V->no_memory)	4379	if (SCHEME_V->no_memory)
4381	s_return (S_SINK);	4380	s_return (S_SINK);
4382	#endif	4381	#endif
4383		4382
4384	if (fill != NIL)	4383	if (fill != NIL)
4385	fill_vector (vec, fill);	4384	fill_vector (vec, 0, fill);
4386		4385
4387	s_return (vec);	4386	s_return (vec);
4388	}	4387	}
4389		4388
4390	case OP_VECLEN: /* vector-length */	4389	case OP_VECLEN: /* vector-length */
4391	s_return (mk_integer (SCHEME_A_ veclength (x)));	4390	s_return (mk_integer (SCHEME_A_ veclength (x)));
4392		4391
		4392	case OP_VECRESIZE:
		4393	vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
		4394	s_return (x);
		4395
4393	case OP_VECREF: /* vector-ref */	4396	case OP_VECREF: /* vector-ref */
4394	{	4397	{
4395	int index;
4396
4397	index = ivalue (cadr (args));	4398	int index = ivalue_unchecked (cadr (args));
4398		4399
4399	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)	4400	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4400	Error_1 ("vector-ref: out of bounds:", cadr (args));	4401	Error_1 ("vector-ref: out of bounds:", cadr (args));
4401		4402
4402	s_return (vector_elem (x, index));	4403	s_return (vector_get (x, index));
4403	}	4404	}
4404		4405
4405	case OP_VECSET: /* vector-set! */	4406	case OP_VECSET: /* vector-set! */
4406	{	4407	{
4407	int index;	4408	int index = ivalue_unchecked (cadr (args));
4408		4409
4409	if (is_immutable (x))	4410	if (is_immutable (x))
4410	Error_1 ("vector-set!: unable to alter immutable vector:", x);	4411	Error_1 ("vector-set!: unable to alter immutable vector:", x);
4411		4412
4412	index = ivalue (cadr (args));
4413
4414	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)	4413	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4415	Error_1 ("vector-set!: out of bounds:", cadr (args));	4414	Error_1 ("vector-set!: out of bounds:", cadr (args));
4416		4415
4417	set_vector_elem (x, index, caddr (args));	4416	vector_set (x, index, caddr (args));
4418	s_return (x);	4417	s_return (x);
4419	}	4418	}
4420	}	4419	}
4421		4420
4422	if (USE_ERROR_CHECKING) abort ();	4421	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	}	4422	}
4478		4423
4479	static int	4424	static int
4480	opexe_2 (SCHEME_P_ enum scheme_opcodes op)	4425	opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4481	{	4426	{
…		…
4527	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;	4472	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4528	case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */	4473	case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4529	case OP_CHARP: /* char? */ r = is_character (a) ; break;	4474	case OP_CHARP: /* char? */ r = is_character (a) ; break;
4530		4475
4531	#if USE_CHAR_CLASSIFIERS	4476	#if USE_CHAR_CLASSIFIERS
4532	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;	4477	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4533	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;	4478	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4534	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;	4479	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4535	case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;	4480	case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4536	case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;	4481	case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4537	#endif	4482	#endif
4538		4483
4539	#if USE_PORTS	4484	#if USE_PORTS
4540	case OP_PORTP: /* port? */ r = is_port (a) ; break;	4485	case OP_PORTP: /* port? */ r = is_port (a) ; break;
4541	case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;	4486	case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
…		…
4742		4687
4743	case OP_NEWSEGMENT: /* new-segment */	4688	case OP_NEWSEGMENT: /* new-segment */
4744	if (!is_pair (args) || !is_number (a))	4689	if (!is_pair (args) || !is_number (a))
4745	Error_0 ("new-segment: argument must be a number");	4690	Error_0 ("new-segment: argument must be a number");
4746		4691
4747	alloc_cellseg (SCHEME_A_ (int)ivalue (a));	4692	alloc_cellseg (SCHEME_A_ ivalue (a));
4748		4693
4749	s_return (S_T);	4694	s_return (S_T);
4750		4695
4751	case OP_OBLIST: /* oblist */	4696	case OP_OBLIST: /* oblist */
4752	s_return (oblist_all_symbols (SCHEME_A));	4697	s_return (oblist_all_symbols (SCHEME_A));
…		…
5010	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);	4955	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5011	SCHEME_V->tok = token (SCHEME_A);	4956	SCHEME_V->tok = token (SCHEME_A);
5012	s_goto (OP_RDSEXPR);	4957	s_goto (OP_RDSEXPR);
5013		4958
5014	case TOK_ATOM:	4959	case TOK_ATOM:
5015	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS)));	4960	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
		4961
		4962	case TOK_DOTATOM:
		4963	SCHEME_V->strbuff[0] = '.';
		4964	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
		4965
		4966	case TOK_STRATOM:
		4967	x = readstrexp (SCHEME_A_ '|');
		4968	//TODO: haven't checked whether the garbage collector could interfere
		4969	s_return (mk_atom (SCHEME_A_ strvalue (x)));
5016		4970
5017	case TOK_DQUOTE:	4971	case TOK_DQUOTE:
5018	x = readstrexp (SCHEME_A);	4972	x = readstrexp (SCHEME_A_ '"');
5019		4973
5020	if (x == S_F)	4974	if (x == S_F)
5021	Error_0 ("Error reading string");	4975	Error_0 ("Error reading string");
5022		4976
5023	setimmutable (x);	4977	setimmutable (x);
…		…
5035	s_goto (OP_EVAL);	4989	s_goto (OP_EVAL);
5036	}	4990	}
5037	}	4991	}
5038		4992
5039	case TOK_SHARP_CONST:	4993	case TOK_SHARP_CONST:
5040	if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL)	4994	if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5041	Error_0 ("undefined sharp expression");	4995	Error_0 ("undefined sharp expression");
5042	else	4996	else
5043	s_return (x);	4997	s_return (x);
5044		4998
5045	default:	4999	default:
…		…
5197	putstr (SCHEME_A_ ")");	5151	putstr (SCHEME_A_ ")");
5198	s_return (S_T);	5152	s_return (S_T);
5199	}	5153	}
5200	else	5154	else
5201	{	5155	{
5202	pointer elem = vector_elem (vec, i);	5156	pointer elem = vector_get (vec, i);
5203		5157
5204	ivalue_unchecked (cdr (args)) = i + 1;	5158	ivalue_unchecked (cdr (args)) = i + 1;
5205	s_save (SCHEME_A_ OP_PVECFROM, args, NIL);	5159	s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5206	SCHEME_V->args = elem;	5160	SCHEME_V->args = elem;
5207		5161
…		…
5282	/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */	5236	/* 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);	5237	typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5284		5238
5285	typedef int (*test_predicate)(pointer);	5239	typedef int (*test_predicate)(pointer);
5286	static int	5240	static int
5287	is_any (pointer p)	5241	tst_any (pointer p)
5288	{	5242	{
5289	return 1;	5243	return 1;
5290	}	5244	}
5291		5245
5292	static int	5246	static int
5293	is_nonneg (pointer p)	5247	tst_inonneg (pointer p)
5294	{	5248	{
5295	return ivalue (p) >= 0 && is_integer (p);	5249	return is_integer (p) && ivalue_unchecked (p) >= 0;
5296	}	5250	}
5297		5251
5298	static int	5252	static int
5299	tst_is_list (pointer p)	5253	tst_is_list (SCHEME_P_ pointer p)
5300	{	5254	{
5301	return p == NIL || is_pair (p);	5255	return p == NIL || is_pair (p);
5302	}	5256	}
5303		5257
5304	/* Correspond carefully with following defines! */	5258	/* Correspond carefully with following defines! */
5305	static struct	5259	static struct
5306	{	5260	{
5307	test_predicate fct;	5261	test_predicate fct;
5308	const char *kind;	5262	const char *kind;
5309	} tests[] =	5263	} tests[] = {
5310	{
5311	{ is_any, 0 },	5264	{ tst_any , 0 },
5312	{ is_string, "string" },	5265	{ is_string , "string" },
5313	{ is_symbol, "symbol" },	5266	{ is_symbol , "symbol" },
5314	{ is_port, "port" },	5267	{ is_port , "port" },
5315	{ is_inport, "input port" },	5268	{ is_inport , "input port" },
5316	{ is_outport, "output port" },	5269	{ is_outport , "output port" },
5317	{ is_environment, "environment" },	5270	{ is_environment, "environment" },
5318	{ is_pair, "pair" },	5271	{ is_pair , "pair" },
5319	{ tst_is_list, "pair or '()" },	5272	{ 0 , "pair or '()" },
5320	{ is_character, "character" },	5273	{ is_character , "character" },
5321	{ is_vector, "vector" },	5274	{ is_vector , "vector" },
5322	{ is_number, "number" },	5275	{ is_number , "number" },
5323	{ is_integer, "integer" },	5276	{ is_integer , "integer" },
5324	{ is_nonneg, "non-negative integer" }	5277	{ tst_inonneg , "non-negative integer" }
5325	};	5278	};
5326		5279
5327	#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */	5280	#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5328	#define TST_ANY "\001"	5281	#define TST_ANY "\001"
5329	#define TST_STRING "\002"	5282	#define TST_STRING "\002"
…		…
5370	typedef struct	5323	typedef struct
5371	{	5324	{
5372	uint8_t func;	5325	uint8_t func;
5373	/*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */	5326	/*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5374	uint8_t builtin;	5327	uint8_t builtin;
		5328	#if USE_ERROR_CHECKING
5375	uint8_t min_arity;	5329	uint8_t min_arity;
5376	uint8_t max_arity;	5330	uint8_t max_arity;
5377	char arg_tests_encoding[3];	5331	char arg_tests_encoding[3];
		5332	#endif
5378	} op_code_info;	5333	} op_code_info;
5379		5334
5380	static const op_code_info dispatch_table[] = {	5335	static const op_code_info dispatch_table[] = {
		5336	#if USE_ERROR_CHECKING
5381	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },	5337	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
		5338	#else
		5339	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
		5340	#endif
5382	#include "opdefines.h"	5341	#include "opdefines.h"
5383	#undef OP_DEF	5342	#undef OP_DEF
5384	{0}	5343	{0}
5385	};	5344	};
5386		5345
…		…
5428	{	5387	{
5429	pointer arg = car (arglist);	5388	pointer arg = car (arglist);
5430		5389
5431	j = t[0];	5390	j = t[0];
5432		5391
		5392	/*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
		5393	if (j == TST_LIST[0])
		5394	{
		5395	if (!tst_is_list (SCHEME_A_ arg))
		5396	break;
		5397	}
		5398	else
		5399	{
5433	if (!tests[j - 1].fct (arg))	5400	if (!tests[j - 1].fct (arg))
5434	break;	5401	break;
		5402	}
5435		5403
5436	if (t[1]) /* last test is replicated as necessary */	5404	if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5437	t++;	5405	t++;
5438		5406
5439	arglist = cdr (arglist);	5407	arglist = cdr (arglist);
5440	i++;	5408	i++;
5441	}	5409	}
…		…
5496	mk_proc (SCHEME_P_ enum scheme_opcodes op)	5464	mk_proc (SCHEME_P_ enum scheme_opcodes op)
5497	{	5465	{
5498	pointer y = get_cell (SCHEME_A_ NIL, NIL);	5466	pointer y = get_cell (SCHEME_A_ NIL, NIL);
5499	set_typeflag (y, (T_PROC | T_ATOM));	5467	set_typeflag (y, (T_PROC | T_ATOM));
5500	ivalue_unchecked (y) = op;	5468	ivalue_unchecked (y) = op;
5501	set_num_integer (y);
5502	return y;	5469	return y;
5503	}	5470	}
5504		5471
5505	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */	5472	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5506	static int	5473	static int

Diff Legend

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