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.44 by root, Mon Nov 30 06:49:11 2015 UTC

…		…
16	* (MINISCM) This is a revised and modified version by Akira KIDA.	16	* (MINISCM) This is a revised and modified version by Akira KIDA.
17	* (MINISCM) current version is 0.85k4 (15 May 1994)	17	* (MINISCM) current version is 0.85k4 (15 May 1994)
18	*	18	*
19	*/	19	*/
20		20
		21	#define EXPERIMENT 1
		22
21	#define PAGE_SIZE 4096 /* does not work on sparc/alpha */	23	#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22	#include "malloc.c"	24	#include "malloc.c"
23		25
24	#define SCHEME_SOURCE	26	#define SCHEME_SOURCE
25	#include "scheme-private.h"	27	#include "scheme-private.h"
…		…
34		36
35	#include <sys/types.h>	37	#include <sys/types.h>
36	#include <sys/stat.h>	38	#include <sys/stat.h>
37	#include <fcntl.h>	39	#include <fcntl.h>
38		40
		41	#if !USE_ERROR_CHECKING
		42	# define NDEBUG
		43	#endif
		44
		45	#include <assert.h>
		46	#include <stdlib.h>
39	#include <string.h>	47	#include <string.h>
40	#include <stdlib.h>
41		48
42	#include <limits.h>	49	#include <limits.h>
43	#include <inttypes.h>	50	#include <inttypes.h>
44	#include <float.h>	51	#include <float.h>
45	//#include <ctype.h>	52	//#include <ctype.h>
		53
		54	#if '1' != '0' + 1 \
		55	|| '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
		56	|| '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
		57	|| 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
		58	|| 'f' != 'a' + 5
		59	# error "execution character set digits not consecutive"
		60	#endif
46		61
47	enum {	62	enum {
48	TOK_EOF,	63	TOK_EOF,
49	TOK_LPAREN,	64	TOK_LPAREN,
50	TOK_RPAREN,	65	TOK_RPAREN,
51	TOK_DOT,	66	TOK_DOT,
52	TOK_ATOM,	67	TOK_ATOM,
		68	TOK_DOTATOM, /* atom name starting with '.' */
		69	TOK_STRATOM, /* atom name enclosed in | */
53	TOK_QUOTE,	70	TOK_QUOTE,
54	TOK_DQUOTE,	71	TOK_DQUOTE,
55	TOK_BQUOTE,	72	TOK_BQUOTE,
56	TOK_COMMA,	73	TOK_COMMA,
57	TOK_ATMARK,	74	TOK_ATMARK,
…		…
59	TOK_SHARP_CONST,	76	TOK_SHARP_CONST,
60	TOK_VEC	77	TOK_VEC
61	};	78	};
62		79
63	#define BACKQUOTE '`'	80	#define BACKQUOTE '`'
64	#define DELIMITERS "()\";\f\t\v\n\r "	81	#define WHITESPACE " \t\r\n\v\f"
		82	#define DELIMITERS "()\";" WHITESPACE
65		83
66	#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?	84	#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?
67	#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?	85	#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
68	#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?	86	#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
69	#define S_SINK (&SCHEME_V->xsink)	87	#define S_SINK (&SCHEME_V->xsink)
…		…
182	# define FIRST_CELLSEGS 3	200	# define FIRST_CELLSEGS 3
183	#endif	201	#endif
184		202
185	enum scheme_types	203	enum scheme_types
186	{	204	{
		205	T_INTEGER,
187	T_FREE,	206	T_REAL,
188	T_STRING,	207	T_STRING,
189	T_NUMBER,
190	T_SYMBOL,	208	T_SYMBOL,
191	T_PROC,	209	T_PROC,
192	T_PAIR,	210	T_PAIR, /* also used for free cells */
193	T_CLOSURE,	211	T_CLOSURE,
194	T_CONTINUATION,	212	T_CONTINUATION,
195	T_FOREIGN,	213	T_FOREIGN,
196	T_CHARACTER,	214	T_CHARACTER,
197	T_PORT,	215	T_PORT,
…		…
207	#define T_SYNTAX 0x0010	225	#define T_SYNTAX 0x0010
208	#define T_IMMUTABLE 0x0020	226	#define T_IMMUTABLE 0x0020
209	#define T_ATOM 0x0040 /* only for gc */	227	#define T_ATOM 0x0040 /* only for gc */
210	#define T_MARK 0x0080 /* only for gc */	228	#define T_MARK 0x0080 /* only for gc */
211		229
		230	/* num, for generic arithmetic */
		231	struct num
		232	{
		233	IVALUE ivalue;
		234	#if USE_REAL
		235	RVALUE rvalue;
		236	char is_fixnum;
		237	#endif
		238	};
		239
		240	#if USE_REAL
		241	# define num_is_fixnum(n) (n).is_fixnum
		242	# define num_set_fixnum(n,f) (n).is_fixnum = (f)
		243	# define num_ivalue(n) (n).ivalue
		244	# define num_rvalue(n) (n).rvalue
		245	# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
		246	# define num_set_rvalue(n,r) (n).rvalue = (r)
		247	#else
		248	# define num_is_fixnum(n) 1
		249	# define num_set_fixnum(n,f) 0
		250	# define num_ivalue(n) (n).ivalue
		251	# define num_rvalue(n) (n).ivalue
		252	# define num_set_ivalue(n,i) (n).ivalue = (i)
		253	# define num_set_rvalue(n,r) (n).ivalue = (r)
		254	#endif
		255
212	enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };	256	enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
213		257
214	static num num_op (enum num_op op, num a, num b);	258	static num num_op (enum num_op op, num a, num b);
215	static num num_intdiv (num a, num b);	259	static num num_intdiv (num a, num b);
216	static num num_rem (num a, num b);	260	static num num_rem (num a, num b);
…		…
219	#if USE_MATH	263	#if USE_MATH
220	static double round_per_R5RS (double x);	264	static double round_per_R5RS (double x);
221	#endif	265	#endif
222	static int is_zero_rvalue (RVALUE x);	266	static int is_zero_rvalue (RVALUE x);
223		267
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;	268	static num num_zero;
231	static num num_one;	269	static num num_one;
232		270
233	/* macros for cell operations */	271	/* macros for cell operations */
234	#define typeflag(p) ((p)->flag + 0)	272	#define typeflag(p) ((p)->flag + 0)
…		…
242	}	280	}
243		281
244	#define strvalue(p) ((p)->object.string.svalue)	282	#define strvalue(p) ((p)->object.string.svalue)
245	#define strlength(p) ((p)->object.string.length)	283	#define strlength(p) ((p)->object.string.length)
246		284
247	INTERFACE int is_list (SCHEME_P_ pointer p);
248
249	INTERFACE int	285	INTERFACE int
250	is_vector (pointer p)	286	is_vector (pointer p)
251	{	287	{
252	return type (p) == T_VECTOR;	288	return type (p) == T_VECTOR;
253	}	289	}
254		290
255	#define vecvalue(p) ((p)->object.vector.vvalue)	291	#define vecvalue(p) ((p)->object.vector.vvalue)
256	#define veclength(p) ((p)->object.vector.length)	292	#define veclength(p) ((p)->object.vector.length)
257	INTERFACE void fill_vector (pointer vec, pointer obj);	293	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);	294	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
260	INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a);	295	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
261		296
262	INTERFACE uint32_t	297	INTERFACE int
263	vector_length (pointer vec)	298	is_integer (pointer p)
264	{	299	{
265	return vec->object.vector.length;	300	return type (p) == T_INTEGER;
		301	}
		302
		303	/* not the same as in scheme, where integers are (correctly :) reals */
		304	INTERFACE int
		305	is_real (pointer p)
		306	{
		307	return type (p) == T_REAL;
266	}	308	}
267		309
268	INTERFACE int	310	INTERFACE int
269	is_number (pointer p)	311	is_number (pointer p)
270	{	312	{
271	return type (p) == T_NUMBER;	313	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	}	314	}
291		315
292	INTERFACE int	316	INTERFACE int
293	is_character (pointer p)	317	is_character (pointer p)
294	{	318	{
…		…
299	string_value (pointer p)	323	string_value (pointer p)
300	{	324	{
301	return strvalue (p);	325	return strvalue (p);
302	}	326	}
303		327
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)	328	#define ivalue_unchecked(p) (p)->object.ivalue
		329	#define set_ivalue(p,v) (p)->object.ivalue = (v)
		330
335	#if USE_REAL	331	#if USE_REAL
336	# define rvalue_unchecked(p) ((p)->object.number.value.rvalue)	332	#define rvalue_unchecked(p) (p)->object.rvalue
337	# define set_num_integer(p) (p)->object.number.is_fixnum=1;	333	#define set_rvalue(p,v) (p)->object.rvalue = (v)
338	# define set_num_real(p) (p)->object.number.is_fixnum=0;
339	#else	334	#else
340	# define rvalue_unchecked(p) ((p)->object.number.value.ivalue)	335	#define rvalue_unchecked(p) (p)->object.ivalue
341	# define set_num_integer(p) 0	336	#define set_rvalue(p,v) (p)->object.ivalue = (v)
342	# define set_num_real(p) 0
343	#endif	337	#endif
344		338
345	INTERFACE long	339	INTERFACE long
346	charvalue (pointer p)	340	charvalue (pointer p)
347	{	341	{
…		…
415	}	409	}
416		410
417	INTERFACE char *	411	INTERFACE char *
418	symname (pointer p)	412	symname (pointer p)
419	{	413	{
420	return strvalue (car (p));	414	return strvalue (p);
421	}	415	}
422		416
423	#if USE_PLIST	417	#if USE_PLIST
		418	#define symprop(p) cdr(p)
424	SCHEME_EXPORT int	419	SCHEME_EXPORT int
425	hasprop (pointer p)	420	hasprop (pointer p)
426	{	421	{
427	return typeflag (p) & T_SYMBOL;	422	return typeflag (p) & T_SYMBOL;
428	}	423	}
429
430	# define symprop(p) cdr(p)
431	#endif	424	#endif
432		425
433	INTERFACE int	426	INTERFACE int
434	is_syntax (pointer p)	427	is_syntax (pointer p)
435	{	428	{
…		…
449	}	442	}
450		443
451	INTERFACE char *	444	INTERFACE char *
452	syntaxname (pointer p)	445	syntaxname (pointer p)
453	{	446	{
454	return strvalue (car (p));	447	return strvalue (p);
455	}	448	}
456		449
457	#define procnum(p) ivalue (p)	450	#define procnum(p) ivalue_unchecked (p)
458	static const char *procname (pointer x);	451	static const char *procname (pointer x);
459		452
460	INTERFACE int	453	INTERFACE int
461	is_closure (pointer p)	454	is_closure (pointer p)
462	{	455	{
…		…
523	setimmutable (pointer p)	516	setimmutable (pointer p)
524	{	517	{
525	#if USE_ERROR_CHECKING	518	#if USE_ERROR_CHECKING
526	set_typeflag (p, typeflag (p) | T_IMMUTABLE);	519	set_typeflag (p, typeflag (p) | T_IMMUTABLE);
527	#endif	520	#endif
		521	}
		522
		523	/* Result is:
		524	proper list: length
		525	circular list: -1
		526	not even a pair: -2
		527	dotted list: -2 minus length before dot
		528	*/
		529	INTERFACE int
		530	list_length (SCHEME_P_ pointer a)
		531	{
		532	int i = 0;
		533	pointer slow, fast;
		534
		535	slow = fast = a;
		536
		537	while (1)
		538	{
		539	if (fast == NIL)
		540	return i;
		541
		542	if (!is_pair (fast))
		543	return -2 - i;
		544
		545	fast = cdr (fast);
		546	++i;
		547
		548	if (fast == NIL)
		549	return i;
		550
		551	if (!is_pair (fast))
		552	return -2 - i;
		553
		554	++i;
		555	fast = cdr (fast);
		556
		557	/* Safe because we would have already returned if `fast'
		558	encountered a non-pair. */
		559	slow = cdr (slow);
		560
		561	if (fast == slow)
		562	{
		563	/* the fast pointer has looped back around and caught up
		564	with the slow pointer, hence the structure is circular,
		565	not of finite length, and therefore not a list */
		566	return -1;
		567	}
		568	}
		569	}
		570
		571	INTERFACE int
		572	is_list (SCHEME_P_ pointer a)
		573	{
		574	return list_length (SCHEME_A_ a) >= 0;
528	}	575	}
529		576
530	#if USE_CHAR_CLASSIFIERS	577	#if USE_CHAR_CLASSIFIERS
531	ecb_inline int	578	ecb_inline int
532	Cisalpha (int c)	579	Cisalpha (int c)
…		…
621	#endif	668	#endif
622		669
623	static int file_push (SCHEME_P_ const char *fname);	670	static int file_push (SCHEME_P_ const char *fname);
624	static void file_pop (SCHEME_P);	671	static void file_pop (SCHEME_P);
625	static int file_interactive (SCHEME_P);	672	static int file_interactive (SCHEME_P);
626	ecb_inline int is_one_of (char *s, int c);	673	ecb_inline int is_one_of (const char *s, int c);
627	static int alloc_cellseg (SCHEME_P_ int n);	674	static int alloc_cellseg (SCHEME_P_ int n);
628	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);	675	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
629	static void finalize_cell (SCHEME_P_ pointer a);	676	static void finalize_cell (SCHEME_P_ pointer a);
630	static int count_consecutive_cells (pointer x, int needed);	677	static int count_consecutive_cells (pointer x, int needed);
631	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);	678	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
…		…
648	static void mark (pointer a);	695	static void mark (pointer a);
649	static void gc (SCHEME_P_ pointer a, pointer b);	696	static void gc (SCHEME_P_ pointer a, pointer b);
650	static int basic_inchar (port *pt);	697	static int basic_inchar (port *pt);
651	static int inchar (SCHEME_P);	698	static int inchar (SCHEME_P);
652	static void backchar (SCHEME_P_ int c);	699	static void backchar (SCHEME_P_ int c);
653	static char *readstr_upto (SCHEME_P_ char *delim);	700	static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
654	static pointer readstrexp (SCHEME_P);	701	static pointer readstrexp (SCHEME_P_ char delim);
655	ecb_inline int skipspace (SCHEME_P);	702	ecb_inline int skipspace (SCHEME_P);
656	static int token (SCHEME_P);	703	static int token (SCHEME_P);
657	static void printslashstring (SCHEME_P_ char *s, int len);	704	static void printslashstring (SCHEME_P_ char *s, int len);
658	static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);	705	static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
659	static void printatom (SCHEME_P_ pointer l, int f);	706	static void printatom (SCHEME_P_ pointer l, int f);
…		…
676	static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);	723	static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
677	static void assign_syntax (SCHEME_P_ const char *name);	724	static void assign_syntax (SCHEME_P_ const char *name);
678	static int syntaxnum (pointer p);	725	static int syntaxnum (pointer p);
679	static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);	726	static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
680		727
		728	static IVALUE
		729	ivalue (pointer x)
		730	{
		731	return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
		732	}
		733
		734	static RVALUE
		735	rvalue (pointer x)
		736	{
		737	return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
		738	}
		739
		740	INTERFACE num
		741	nvalue (pointer x)
		742	{
		743	num n;
		744
		745	num_set_fixnum (n, is_integer (x));
		746
		747	if (num_is_fixnum (n))
		748	num_set_ivalue (n, ivalue_unchecked (x));
		749	else
		750	num_set_rvalue (n, rvalue_unchecked (x));
		751
		752	return n;
		753	}
		754
681	static num	755	static num
682	num_op (enum num_op op, num a, num b)	756	num_op (enum num_op op, num a, num b)
683	{	757	{
684	num ret;	758	num ret;
685		759
686	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	760	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
687		761
688	if (num_is_fixnum (ret))	762	if (num_is_fixnum (ret))
689	{	763	{
690	IVALUE av = num_get_ivalue (a);
691	IVALUE bv = num_get_ivalue (b);
692
693	switch (op)	764	switch (op)
694	{	765	{
695	case NUM_ADD: av += bv; break;	766	case NUM_ADD: a.ivalue += b.ivalue; break;
696	case NUM_SUB: av -= bv; break;	767	case NUM_SUB: a.ivalue -= b.ivalue; break;
697	case NUM_MUL: av *= bv; break;	768	case NUM_MUL: a.ivalue *= b.ivalue; break;
698	case NUM_INTDIV: av /= bv; break;	769	case NUM_INTDIV: a.ivalue /= b.ivalue; break;
699	}	770	}
700		771
701	num_set_ivalue (ret, av);	772	num_set_ivalue (ret, a.ivalue);
702	}	773	}
		774	#if USE_REAL
703	else	775	else
704	{	776	{
705	RVALUE av = num_get_rvalue (a);
706	RVALUE bv = num_get_rvalue (b);
707
708	switch (op)	777	switch (op)
709	{	778	{
710	case NUM_ADD: av += bv; break;	779	case NUM_ADD: a.rvalue += b.rvalue; break;
711	case NUM_SUB: av -= bv; break;	780	case NUM_SUB: a.rvalue -= b.rvalue; break;
712	case NUM_MUL: av *= bv; break;	781	case NUM_MUL: a.rvalue *= b.rvalue; break;
713	case NUM_INTDIV: av /= bv; break;	782	case NUM_INTDIV: a.rvalue /= b.rvalue; break;
714	}	783	}
715		784
716	num_set_rvalue (ret, av);	785	num_set_rvalue (ret, a.rvalue);
717	}	786	}
		787	#endif
718		788
719	return ret;	789	return ret;
720	}	790	}
721		791
722	static num	792	static num
723	num_div (num a, num b)	793	num_div (num a, num b)
724	{	794	{
725	num ret;	795	num ret;
726		796
727	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0);	797	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
728		798
729	if (num_is_fixnum (ret))	799	if (num_is_fixnum (ret))
730	num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));	800	num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
731	else	801	else
732	num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));	802	num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
733		803
734	return ret;	804	return ret;
735	}	805	}
736		806
737	static num	807	static num
…		…
739	{	809	{
740	num ret;	810	num ret;
741	long e1, e2, res;	811	long e1, e2, res;
742		812
743	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	813	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
744	e1 = num_get_ivalue (a);	814	e1 = num_ivalue (a);
745	e2 = num_get_ivalue (b);	815	e2 = num_ivalue (b);
746	res = e1 % e2;	816	res = e1 % e2;
747		817
748	/* remainder should have same sign as second operand */	818	/* remainder should have same sign as second operand */
749	if (res > 0)	819	if (res > 0)
750	{	820	{
…		…
766	{	836	{
767	num ret;	837	num ret;
768	long e1, e2, res;	838	long e1, e2, res;
769		839
770	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	840	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
771	e1 = num_get_ivalue (a);	841	e1 = num_ivalue (a);
772	e2 = num_get_ivalue (b);	842	e2 = num_ivalue (b);
773	res = e1 % e2;	843	res = e1 % e2;
774		844
775	/* modulo should have same sign as second operand */	845	/* modulo should have same sign as second operand */
776	if (res * e2 < 0)	846	if (res * e2 < 0)
777	res += e2;	847	res += e2;
…		…
787	int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);	857	int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
788	int ret;	858	int ret;
789		859
790	if (is_fixnum)	860	if (is_fixnum)
791	{	861	{
792	IVALUE av = num_get_ivalue (a);	862	IVALUE av = num_ivalue (a);
793	IVALUE bv = num_get_ivalue (b);	863	IVALUE bv = num_ivalue (b);
794		864
795	ret = av == bv ? 0 : av < bv ? -1 : +1;	865	ret = av == bv ? 0 : av < bv ? -1 : +1;
796	}	866	}
797	else	867	else
798	{	868	{
799	RVALUE av = num_get_rvalue (a);	869	RVALUE av = num_rvalue (a);
800	RVALUE bv = num_get_rvalue (b);	870	RVALUE bv = num_rvalue (b);
801		871
802	ret = av == bv ? 0 : av < bv ? -1 : +1;	872	ret = av == bv ? 0 : av < bv ? -1 : +1;
803	}	873	}
804		874
805	return ret;	875	return ret;
…		…
868	return k;	938	return k;
869		939
870	i = ++SCHEME_V->last_cell_seg;	940	i = ++SCHEME_V->last_cell_seg;
871	SCHEME_V->alloc_seg[i] = cp;	941	SCHEME_V->alloc_seg[i] = cp;
872		942
873	/* insert new segment in address order */
874	newp = (pointer)cp;	943	newp = (pointer)cp;
875	SCHEME_V->cell_seg[i] = newp;	944	SCHEME_V->cell_seg[i] = newp;
876	SCHEME_V->cell_segsize[i] = segsize;	945	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;	946	SCHEME_V->fcells += segsize;
893	last = newp + segsize - 1;	947	last = newp + segsize - 1;
894		948
895	for (p = newp; p <= last; p++)	949	for (p = newp; p <= last; p++)
896	{	950	{
897	set_typeflag (p, T_FREE);	951	set_typeflag (p, T_PAIR);
898	set_car (p, NIL);	952	set_car (p, NIL);
899	set_cdr (p, p + 1);	953	set_cdr (p, p + 1);
900	}	954	}
901		955
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);	956	set_cdr (last, SCHEME_V->free_cell);
906	SCHEME_V->free_cell = newp;	957	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	}	958	}
919		959
920	return n;	960	return n;
921	}	961	}
922		962
…		…
1001	/* Record it as a vector so that gc understands it. */	1041	/* Record it as a vector so that gc understands it. */
1002	set_typeflag (v, T_VECTOR | T_ATOM);	1042	set_typeflag (v, T_VECTOR | T_ATOM);
1003		1043
1004	v->object.vector.vvalue = e;	1044	v->object.vector.vvalue = e;
1005	v->object.vector.length = len;	1045	v->object.vector.length = len;
1006	fill_vector (v, init);	1046	fill_vector (v, 0, init);
1007	push_recent_alloc (SCHEME_A_ v, NIL);	1047	push_recent_alloc (SCHEME_A_ v, NIL);
1008		1048
1009	return v;	1049	return v;
1010	}	1050	}
1011		1051
…		…
1054	set_cdr (x, b);	1094	set_cdr (x, b);
1055		1095
1056	return x;	1096	return x;
1057	}	1097	}
1058		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	set_typeflag (x, T_SYMBOL | T_ATOM);
		1105	return x;
		1106	}
		1107
1059	/* ========== oblist implementation ========== */	1108	/* ========== oblist implementation ========== */
1060		1109
1061	#ifndef USE_OBJECT_LIST	1110	#ifndef USE_OBJECT_LIST
1062		1111
		1112	static int
1063	static int hash_fn (const char *key, int table_size);	1113	hash_fn (const char *key, int table_size)
		1114	{
		1115	const unsigned char *p = key;
		1116	uint32_t hash = 2166136261;
		1117
		1118	while (*p)
		1119	hash = (hash ^ *p++) * 16777619;
		1120
		1121	return hash % table_size;
		1122	}
1064		1123
1065	static pointer	1124	static pointer
1066	oblist_initial_value (SCHEME_P)	1125	oblist_initial_value (SCHEME_P)
1067	{	1126	{
1068	return mk_vector (SCHEME_A_ 461); /* probably should be bigger */	1127	return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
…		…
1070		1129
1071	/* returns the new symbol */	1130	/* returns the new symbol */
1072	static pointer	1131	static pointer
1073	oblist_add_by_name (SCHEME_P_ const char *name)	1132	oblist_add_by_name (SCHEME_P_ const char *name)
1074	{	1133	{
1075	int location;	1134	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));	1135	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)));	1136	vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1083	return x;	1137	return x;
1084	}	1138	}
1085		1139
1086	ecb_inline pointer	1140	ecb_inline pointer
1087	oblist_find_by_name (SCHEME_P_ const char *name)	1141	oblist_find_by_name (SCHEME_P_ const char *name)
…		…
1090	pointer x;	1144	pointer x;
1091	char *s;	1145	char *s;
1092		1146
1093	location = hash_fn (name, veclength (SCHEME_V->oblist));	1147	location = hash_fn (name, veclength (SCHEME_V->oblist));
1094		1148
1095	for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x))	1149	for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1096	{	1150	{
1097	s = symname (car (x));	1151	s = symname (car (x));
1098		1152
1099	/* case-insensitive, per R5RS section 2 */	1153	/* case-insensitive, per R5RS section 2 */
1100	if (stricmp (name, s) == 0)	1154	if (stricmp (name, s) == 0)
…		…
1110	int i;	1164	int i;
1111	pointer x;	1165	pointer x;
1112	pointer ob_list = NIL;	1166	pointer ob_list = NIL;
1113		1167
1114	for (i = 0; i < veclength (SCHEME_V->oblist); i++)	1168	for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1115	for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x))	1169	for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1116	ob_list = cons (x, ob_list);	1170	ob_list = cons (x, ob_list);
1117		1171
1118	return ob_list;	1172	return ob_list;
1119	}	1173	}
1120		1174
…		…
1146		1200
1147	/* returns the new symbol */	1201	/* returns the new symbol */
1148	static pointer	1202	static pointer
1149	oblist_add_by_name (SCHEME_P_ const char *name)	1203	oblist_add_by_name (SCHEME_P_ const char *name)
1150	{	1204	{
1151	pointer x;	1205	pointer x = mk_string (SCHEME_A_ name);
1152
1153	x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1154	set_typeflag (x, T_SYMBOL);	1206	set_typeflag (x, T_SYMBOL);
1155	setimmutable (car (x));	1207	setimmutable (x);
1156	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);	1208	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1157	return x;	1209	return x;
1158	}	1210	}
1159		1211
1160	static pointer	1212	static pointer
…		…
1193	mk_character (SCHEME_P_ int c)	1245	mk_character (SCHEME_P_ int c)
1194	{	1246	{
1195	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1247	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196		1248
1197	set_typeflag (x, (T_CHARACTER | T_ATOM));	1249	set_typeflag (x, (T_CHARACTER | T_ATOM));
1198	ivalue_unchecked (x) = c & 0xff;	1250	set_ivalue (x, c & 0xff);
1199	set_num_integer (x);	1251
1200	return x;	1252	return x;
1201	}	1253	}
1202		1254
1203	/* get number atom (integer) */	1255	/* get number atom (integer) */
1204	INTERFACE pointer	1256	INTERFACE pointer
1205	mk_integer (SCHEME_P_ long num)	1257	mk_integer (SCHEME_P_ long n)
1206	{	1258	{
1207	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1259	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1208		1260
1209	set_typeflag (x, (T_NUMBER | T_ATOM));	1261	set_typeflag (x, (T_INTEGER | T_ATOM));
1210	ivalue_unchecked (x) = num;	1262	set_ivalue (x, n);
1211	set_num_integer (x);	1263
1212	return x;	1264	return x;
1213	}	1265	}
1214		1266
1215	INTERFACE pointer	1267	INTERFACE pointer
1216	mk_real (SCHEME_P_ RVALUE n)	1268	mk_real (SCHEME_P_ RVALUE n)
1217	{	1269	{
		1270	#if USE_REAL
1218	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1271	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1219		1272
1220	set_typeflag (x, (T_NUMBER | T_ATOM));	1273	set_typeflag (x, (T_REAL | T_ATOM));
1221	rvalue_unchecked (x) = n;	1274	set_rvalue (x, n);
1222	set_num_real (x);	1275
1223	return x;	1276	return x;
		1277	#else
		1278	return mk_integer (SCHEME_A_ n);
		1279	#endif
1224	}	1280	}
1225		1281
1226	static pointer	1282	static pointer
1227	mk_number (SCHEME_P_ const num n)	1283	mk_number (SCHEME_P_ const num n)
1228	{	1284	{
		1285	#if USE_REAL
1229	if (num_is_fixnum (n))	1286	return num_is_fixnum (n)
		1287	? mk_integer (SCHEME_A_ num_ivalue (n))
		1288	: mk_real (SCHEME_A_ num_rvalue (n));
		1289	#else
1230	return mk_integer (SCHEME_A_ num_get_ivalue (n));	1290	return mk_integer (SCHEME_A_ num_ivalue (n));
1231	else	1291	#endif
1232	return mk_real (SCHEME_A_ num_get_rvalue (n));
1233	}	1292	}
1234		1293
1235	/* allocate name to string area */	1294	/* allocate name to string area */
1236	static char *	1295	static char *
1237	store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)	1296	store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
…		…
1243	SCHEME_V->no_memory = 1;	1302	SCHEME_V->no_memory = 1;
1244	return SCHEME_V->strbuff;	1303	return SCHEME_V->strbuff;
1245	}	1304	}
1246		1305
1247	if (str)	1306	if (str)
1248	{	1307	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	1308	else
1258	{
1259	memset (q, fill, len_str);	1309	memset (q, fill, len_str);
		1310
1260	q[len_str] = 0;	1311	q[len_str] = 0;
1261	}
1262		1312
1263	return q;	1313	return q;
1264	}	1314	}
1265		1315
1266	INTERFACE pointer	1316	INTERFACE pointer
…		…
1280	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1330	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1281		1331
1282	set_typeflag (x, T_STRING | T_ATOM);	1332	set_typeflag (x, T_STRING | T_ATOM);
1283	strvalue (x) = store_string (SCHEME_A_ len, str, 0);	1333	strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1284	strlength (x) = len;	1334	strlength (x) = len;
		1335
1285	return x;	1336	return x;
1286	}	1337	}
1287		1338
1288	INTERFACE pointer	1339	INTERFACE pointer
1289	mk_string (SCHEME_P_ const char *str)	1340	mk_string (SCHEME_P_ const char *str)
…		…
1296	{	1347	{
1297	return get_vector_object (SCHEME_A_ len, NIL);	1348	return get_vector_object (SCHEME_A_ len, NIL);
1298	}	1349	}
1299		1350
1300	INTERFACE void	1351	INTERFACE void
1301	fill_vector (pointer vec, pointer obj)	1352	fill_vector (pointer vec, uint32_t start, pointer obj)
1302	{	1353	{
1303	int i;	1354	int i;
1304		1355
1305	for (i = 0; i < vec->object.vector.length; i++)	1356	for (i = start; i < veclength (vec); i++)
1306	vecvalue (vec)[i] = obj;	1357	vecvalue (vec)[i] = obj;
1307	}	1358	}
1308		1359
		1360	INTERFACE void
		1361	vector_resize (pointer vec, uint32_t newsize, pointer fill)
		1362	{
		1363	uint32_t oldsize = veclength (vec);
		1364	vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
		1365	veclength (vec) = newsize;
		1366	fill_vector (vec, oldsize, fill);
		1367	}
		1368
1309	INTERFACE pointer	1369	INTERFACE pointer
1310	vector_elem (pointer vec, uint32_t ielem)	1370	vector_get (pointer vec, uint32_t ielem)
1311	{	1371	{
1312	return vecvalue(vec)[ielem];	1372	return vecvalue(vec)[ielem];
1313	}	1373	}
1314		1374
1315	INTERFACE void	1375	INTERFACE void
1316	set_vector_elem (pointer vec, uint32_t ielem, pointer a)	1376	vector_set (pointer vec, uint32_t ielem, pointer a)
1317	{	1377	{
1318	vecvalue(vec)[ielem] = a;	1378	vecvalue(vec)[ielem] = a;
1319	}	1379	}
1320		1380
1321	/* get new symbol */	1381	/* get new symbol */
…		…
1333		1393
1334	INTERFACE pointer	1394	INTERFACE pointer
1335	gensym (SCHEME_P)	1395	gensym (SCHEME_P)
1336	{	1396	{
1337	pointer x;	1397	pointer x;
1338
1339	for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1340	{
1341	char name[40] = "gensym-";	1398	char name[40] = "gensym-";
1342	xnum (name + 7, SCHEME_V->gensym_cnt);	1399	xnum (name + 7, ++SCHEME_V->gensym_cnt);
1343		1400
1344	/* first check oblist */	1401	return generate_symbol (SCHEME_A_ name);
1345	x = oblist_find_by_name (SCHEME_A_ name);	1402	}
1346		1403
1347	if (x == NIL)	1404	static int
1348	{	1405	is_gensym (SCHEME_P_ pointer x)
1349	x = oblist_add_by_name (SCHEME_A_ name);	1406	{
1350	return x;	1407	return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1351	}
1352	}
1353
1354	return NIL;
1355	}	1408	}
1356		1409
1357	/* make symbol or number atom from string */	1410	/* make symbol or number atom from string */
1358	static pointer	1411	static pointer
1359	mk_atom (SCHEME_P_ char *q)	1412	mk_atom (SCHEME_P_ char *q)
…		…
1413	}	1466	}
1414	else if ((c == 'e') || (c == 'E'))	1467	else if ((c == 'e') || (c == 'E'))
1415	{	1468	{
1416	if (!has_fp_exp)	1469	if (!has_fp_exp)
1417	{	1470	{
1418	has_dec_point = 1; /* decimal point illegal	1471	has_dec_point = 1; /* decimal point illegal from now on */
1419	from now on */
1420	p++;	1472	p++;
1421		1473
1422	if ((*p == '-') || (*p == '+') || isdigit (*p))	1474	if ((*p == '-') || (*p == '+') || isdigit (*p))
1423	continue;	1475	continue;
1424	}	1476	}
…		…
1512		1564
1513	if (ecb_expect_false (is_vector (p)))	1565	if (ecb_expect_false (is_vector (p)))
1514	{	1566	{
1515	int i;	1567	int i;
1516		1568
1517	for (i = 0; i < p->object.vector.length; i++)	1569	for (i = 0; i < veclength (p); i++)
1518	mark (vecvalue (p)[i]);	1570	mark (vecvalue (p)[i]);
1519	}	1571	}
1520		1572
1521	if (is_atom (p))	1573	if (is_atom (p))
1522	goto E6;	1574	goto E6;
…		…
1604	/* garbage collect */	1656	/* garbage collect */
1605	clrmark (NIL);	1657	clrmark (NIL);
1606	SCHEME_V->fcells = 0;	1658	SCHEME_V->fcells = 0;
1607	SCHEME_V->free_cell = NIL;	1659	SCHEME_V->free_cell = NIL;
1608		1660
1609	/* free-list is kept sorted by address so as to maintain consecutive	1661	uint32_t total = 0;
1610	ranges, if possible, for use with vectors. Here we scan the cells	1662
1611	(which are also kept sorted by address) downwards to build the	1663	/* Here we scan the cells to build the free-list. */
1612	free-list in sorted order.
1613	*/
1614	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)	1664	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1615	{	1665	{
1616	p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];	1666	pointer end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
		1667	total += SCHEME_V->cell_segsize [i];
1617		1668
1618	while (--p >= SCHEME_V->cell_seg[i])	1669	for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1619	{	1670	{
1620	if (is_mark (p))	1671	if (is_mark (p))
1621	clrmark (p);	1672	clrmark (p);
1622	else	1673	else
1623	{	1674	{
1624	/* reclaim cell */	1675	/* reclaim cell */
1625	if (typeflag (p) != T_FREE)	1676	if (typeflag (p) != T_PAIR)
1626	{	1677	{
1627	finalize_cell (SCHEME_A_ p);	1678	finalize_cell (SCHEME_A_ p);
1628	set_typeflag (p, T_FREE);	1679	set_typeflag (p, T_PAIR);
1629	set_car (p, NIL);	1680	set_car (p, NIL);
1630	}	1681	}
1631		1682
1632	++SCHEME_V->fcells;	1683	++SCHEME_V->fcells;
1633	set_cdr (p, SCHEME_V->free_cell);	1684	set_cdr (p, SCHEME_V->free_cell);
…		…
1635	}	1686	}
1636	}	1687	}
1637	}	1688	}
1638		1689
1639	if (SCHEME_V->gc_verbose)	1690	if (SCHEME_V->gc_verbose)
		1691	{
1640	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");	1692	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");
		1693	}
1641	}	1694	}
1642		1695
1643	static void	1696	static void
1644	finalize_cell (SCHEME_P_ pointer a)	1697	finalize_cell (SCHEME_P_ pointer a)
1645	{	1698	{
1646	/* TODO, fast bitmap check? */	1699	/* TODO, fast bitmap check? */
1647	if (is_string (a))	1700	if (is_string (a) || is_symbol (a))
1648	free (strvalue (a));	1701	free (strvalue (a));
1649	else if (is_vector (a))	1702	else if (is_vector (a))
1650	free (vecvalue (a));	1703	free (vecvalue (a));
1651	#if USE_PORTS	1704	#if USE_PORTS
1652	else if (is_port (a))	1705	else if (is_port (a))
…		…
2074	#endif	2127	#endif
2075	}	2128	}
2076		2129
2077	/* read characters up to delimiter, but cater to character constants */	2130	/* read characters up to delimiter, but cater to character constants */
2078	static char *	2131	static char *
2079	readstr_upto (SCHEME_P_ char *delim)	2132	readstr_upto (SCHEME_P_ int skip, const char *delim)
2080	{	2133	{
2081	char *p = SCHEME_V->strbuff;	2134	char *p = SCHEME_V->strbuff + skip;
2082		2135
2083	while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));	2136	while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2084		2137
2085	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')	2138	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2086	*p = 0;	2139	*p = 0;
…		…
2093	return SCHEME_V->strbuff;	2146	return SCHEME_V->strbuff;
2094	}	2147	}
2095		2148
2096	/* read string expression "xxx...xxx" */	2149	/* read string expression "xxx...xxx" */
2097	static pointer	2150	static pointer
2098	readstrexp (SCHEME_P)	2151	readstrexp (SCHEME_P_ char delim)
2099	{	2152	{
2100	char *p = SCHEME_V->strbuff;	2153	char *p = SCHEME_V->strbuff;
2101	int c;	2154	int c;
2102	int c1 = 0;	2155	int c1 = 0;
2103	enum
2104	{ st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;	2156	enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2105		2157
2106	for (;;)	2158	for (;;)
2107	{	2159	{
2108	c = inchar (SCHEME_A);	2160	c = inchar (SCHEME_A);
2109		2161
…		…
2111	return S_F;	2163	return S_F;
2112		2164
2113	switch (state)	2165	switch (state)
2114	{	2166	{
2115	case st_ok:	2167	case st_ok:
2116	switch (c)	2168	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);	2169	return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2125		2170
2126	default:	2171	if (ecb_expect_false (c == '\\'))
		2172	state = st_bsl;
		2173	else
2127	*p++ = c;	2174	*p++ = c;
2128	break;
2129	}
2130		2175
2131	break;	2176	break;
2132		2177
2133	case st_bsl:	2178	case st_bsl:
2134	switch (c)	2179	switch (c)
…		…
2164	case 'r':	2209	case 'r':
2165	*p++ = '\r';	2210	*p++ = '\r';
2166	state = st_ok;	2211	state = st_ok;
2167	break;	2212	break;
2168		2213
2169	case '"':
2170	*p++ = '"';
2171	state = st_ok;
2172	break;
2173
2174	default:	2214	default:
2175	*p++ = c;	2215	*p++ = c;
2176	state = st_ok;	2216	state = st_ok;
2177	break;	2217	break;
2178	}	2218	}
2179		2219
2180	break;	2220	break;
2181		2221
2182	case st_x1:	2222	case st_x1:
2183	case st_x2:	2223	case st_x2:
2184	c = toupper (c);	2224	c = tolower (c);
2185		2225
2186	if (c >= '0' && c <= 'F')	2226	if (c >= '0' && c <= '9')
2187	{
2188	if (c <= '9')
2189	c1 = (c1 << 4) + c - '0';	2227	c1 = (c1 << 4) + c - '0';
2190	else	2228	else if (c >= 'a' && c <= 'f')
2191	c1 = (c1 << 4) + c - 'A' + 10;	2229	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	2230	else
2202	return S_F;	2231	return S_F;
		2232
		2233	if (state == st_x1)
		2234	state = st_x2;
		2235	else
		2236	{
		2237	*p++ = c1;
		2238	state = st_ok;
		2239	}
2203		2240
2204	break;	2241	break;
2205		2242
2206	case st_oct1:	2243	case st_oct1:
2207	case st_oct2:	2244	case st_oct2:
…		…
2211	backchar (SCHEME_A_ c);	2248	backchar (SCHEME_A_ c);
2212	state = st_ok;	2249	state = st_ok;
2213	}	2250	}
2214	else	2251	else
2215	{	2252	{
2216	if (state == st_oct2 && c1 >= 32)	2253	if (state == st_oct2 && c1 >= ' ')
2217	return S_F;	2254	return S_F;
2218		2255
2219	c1 = (c1 << 3) + (c - '0');	2256	c1 = (c1 << 3) + (c - '0');
2220		2257
2221	if (state == st_oct1)	2258	if (state == st_oct1)
…		…
2226	state = st_ok;	2263	state = st_ok;
2227	}	2264	}
2228	}	2265	}
2229		2266
2230	break;	2267	break;
2231
2232	}	2268	}
2233	}	2269	}
2234	}	2270	}
2235		2271
2236	/* check c is in chars */	2272	/* check c is in chars */
2237	ecb_inline int	2273	ecb_inline int
2238	is_one_of (char *s, int c)	2274	is_one_of (const char *s, int c)
2239	{	2275	{
2240	if (c == EOF)
2241	return 1;
2242
2243	return !!strchr (s, c);	2276	return c == EOF || !!strchr (s, c);
2244	}	2277	}
2245		2278
2246	/* skip white characters */	2279	/* skip white characters */
2247	ecb_inline int	2280	ecb_inline int
2248	skipspace (SCHEME_P)	2281	skipspace (SCHEME_P)
…		…
2250	int c, curr_line = 0;	2283	int c, curr_line = 0;
2251		2284
2252	do	2285	do
2253	{	2286	{
2254	c = inchar (SCHEME_A);	2287	c = inchar (SCHEME_A);
		2288
2255	#if SHOW_ERROR_LINE	2289	#if SHOW_ERROR_LINE
2256	if (c == '\n')	2290	if (ecb_expect_false (c == '\n'))
2257	curr_line++;	2291	curr_line++;
2258	#endif	2292	#endif
		2293
		2294	if (ecb_expect_false (c == EOF))
		2295	return c;
2259	}	2296	}
2260	while (c == ' ' || c == '\n' || c == '\r' || c == '\t');	2297	while (is_one_of (WHITESPACE, c));
2261		2298
2262	/* record it */	2299	/* record it */
2263	#if SHOW_ERROR_LINE	2300	#if SHOW_ERROR_LINE
2264	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)	2301	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2265	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;	2302	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2266	#endif	2303	#endif
2267		2304
2268	if (c != EOF)
2269	{
2270	backchar (SCHEME_A_ c);	2305	backchar (SCHEME_A_ c);
2271	return 1;	2306	return 1;
2272	}
2273	else
2274	return EOF;
2275	}	2307	}
2276		2308
2277	/* get token */	2309	/* get token */
2278	static int	2310	static int
2279	token (SCHEME_P)	2311	token (SCHEME_P)
…		…
2295	return TOK_RPAREN;	2327	return TOK_RPAREN;
2296		2328
2297	case '.':	2329	case '.':
2298	c = inchar (SCHEME_A);	2330	c = inchar (SCHEME_A);
2299		2331
2300	if (is_one_of (" \n\t", c))	2332	if (is_one_of (WHITESPACE, c))
2301	return TOK_DOT;	2333	return TOK_DOT;
2302	else	2334	else
2303	{	2335	{
2304	//TODO: ungetc twice in a row is not supported in C
2305	backchar (SCHEME_A_ c);	2336	backchar (SCHEME_A_ c);
2306	backchar (SCHEME_A_ '.');
2307	return TOK_ATOM;	2337	return TOK_DOTATOM;
2308	}	2338	}
		2339
		2340	case '|':
		2341	return TOK_STRATOM;
2309		2342
2310	case '\'':	2343	case '\'':
2311	return TOK_QUOTE;	2344	return TOK_QUOTE;
2312		2345
2313	case ';':	2346	case ';':
…		…
2445	}	2478	}
2446		2479
2447	putcharacter (SCHEME_A_ '"');	2480	putcharacter (SCHEME_A_ '"');
2448	}	2481	}
2449		2482
2450
2451	/* print atoms */	2483	/* print atoms */
2452	static void	2484	static void
2453	printatom (SCHEME_P_ pointer l, int f)	2485	printatom (SCHEME_P_ pointer l, int f)
2454	{	2486	{
2455	char *p;	2487	char *p;
2456	int len;	2488	int len;
2457		2489
2458	atom2str (SCHEME_A_ l, f, &p, &len);	2490	atom2str (SCHEME_A_ l, f, &p, &len);
2459	putchars (SCHEME_A_ p, len);	2491	putchars (SCHEME_A_ p, len);
2460	}	2492	}
2461
2462		2493
2463	/* Uses internal buffer unless string pointer is already available */	2494	/* Uses internal buffer unless string pointer is already available */
2464	static void	2495	static void
2465	atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)	2496	atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2466	{	2497	{
…		…
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));
…		…
2627	#endif	2658	#endif
2628	}	2659	}
2629	else if (is_continuation (l))	2660	else if (is_continuation (l))
2630	p = "#<CONTINUATION>";	2661	p = "#<CONTINUATION>";
2631	else	2662	else
		2663	{
		2664	#if USE_PRINTF
		2665	p = SCHEME_V->strbuff;
		2666	snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
		2667	#else
2632	p = "#<ERROR>";	2668	p = "#<ERROR>";
		2669	#endif
		2670	}
2633		2671
2634	*pp = p;	2672	*pp = p;
2635	*plen = strlen (p);	2673	*plen = strlen (p);
2636	}	2674	}
2637		2675
…		…
2745	return 0;	2783	return 0;
2746	}	2784	}
2747	else if (is_number (a))	2785	else if (is_number (a))
2748	{	2786	{
2749	if (is_number (b))	2787	if (is_number (b))
2750	if (num_is_integer (a) == num_is_integer (b))
2751	return num_cmp (nvalue (a), nvalue (b)) == 0;	2788	return num_cmp (nvalue (a), nvalue (b)) == 0;
2752		2789
2753	return 0;	2790	return 0;
2754	}	2791	}
2755	else if (is_character (a))	2792	else if (is_character (a))
2756	{	2793	{
…		…
2782	/* () is #t in R5RS */	2819	/* () is #t in R5RS */
2783	#define is_true(p) ((p) != S_F)	2820	#define is_true(p) ((p) != S_F)
2784	#define is_false(p) ((p) == S_F)	2821	#define is_false(p) ((p) == S_F)
2785		2822
2786	/* ========== Environment implementation ========== */	2823	/* ========== 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		2824
2803	#ifndef USE_ALIST_ENV	2825	#ifndef USE_ALIST_ENV
2804		2826
2805	/*	2827	/*
2806	* In this implementation, each frame of the environment may be	2828	* In this implementation, each frame of the environment may be
…		…
2823		2845
2824	SCHEME_V->envir = immutable_cons (new_frame, old_env);	2846	SCHEME_V->envir = immutable_cons (new_frame, old_env);
2825	setenvironment (SCHEME_V->envir);	2847	setenvironment (SCHEME_V->envir);
2826	}	2848	}
2827		2849
		2850	static uint32_t
		2851	sym_hash (pointer sym, uint32_t size)
		2852	{
		2853	uintptr_t ptr = (uintptr_t)sym;
		2854
		2855	#if 0
		2856	/* table size is prime, so why mix */
		2857	ptr += ptr >> 32;
		2858	ptr += ptr >> 16;
		2859	ptr += ptr >> 8;
		2860	#endif
		2861
		2862	return ptr % size;
		2863	}
		2864
2828	ecb_inline void	2865	ecb_inline void
2829	new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)	2866	new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2830	{	2867	{
2831	pointer slot = immutable_cons (variable, value);	2868	pointer slot = immutable_cons (variable, value);
2832		2869
2833	if (is_vector (car (env)))	2870	if (is_vector (car (env)))
2834	{	2871	{
2835	int location = hash_fn (symname (variable), veclength (car (env)));	2872	int location = sym_hash (variable, veclength (car (env)));
2836
2837	set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location)));	2873	vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2838	}	2874	}
2839	else	2875	else
2840	set_car (env, immutable_cons (slot, car (env)));	2876	set_car (env, immutable_cons (slot, car (env)));
2841	}	2877	}
2842		2878
2843	static pointer	2879	static pointer
2844	find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)	2880	find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2845	{	2881	{
2846	pointer x, y;	2882	pointer x, y;
2847	int location;
2848		2883
2849	for (x = env; x != NIL; x = cdr (x))	2884	for (x = env; x != NIL; x = cdr (x))
2850	{	2885	{
2851	if (is_vector (car (x)))	2886	if (is_vector (car (x)))
2852	{	2887	{
2853	location = hash_fn (symname (hdl), veclength (car (x)));	2888	int location = sym_hash (hdl, veclength (car (x)));
2854	y = vector_elem (car (x), location);	2889	y = vector_get (car (x), location);
2855	}	2890	}
2856	else	2891	else
2857	y = car (x);	2892	y = car (x);
2858		2893
2859	for (; y != NIL; y = cdr (y))	2894	for (; y != NIL; y = cdr (y))
2860	if (caar (y) == hdl)	2895	if (caar (y) == hdl)
2861	break;	2896	break;
2862		2897
2863	if (y != NIL)	2898	if (y != NIL)
		2899	return car (y);
		2900
		2901	if (!all)
2864	break;	2902	break;
2865
2866	if (!all)
2867	return NIL;
2868	}	2903	}
2869
2870	if (x != NIL)
2871	return car (y);
2872		2904
2873	return NIL;	2905	return NIL;
2874	}	2906	}
2875		2907
2876	#else /* USE_ALIST_ENV */	2908	#else /* USE_ALIST_ENV */
…		…
2898	for (y = car (x); y != NIL; y = cdr (y))	2930	for (y = car (x); y != NIL; y = cdr (y))
2899	if (caar (y) == hdl)	2931	if (caar (y) == hdl)
2900	break;	2932	break;
2901		2933
2902	if (y != NIL)	2934	if (y != NIL)
		2935	return car (y);
2903	break;	2936	break;
2904		2937
2905	if (!all)	2938	if (!all)
2906	return NIL;	2939	break;
2907	}	2940	}
2908
2909	if (x != NIL)
2910	return car (y);
2911		2941
2912	return NIL;	2942	return NIL;
2913	}	2943	}
2914		2944
2915	#endif /* USE_ALIST_ENV else */	2945	#endif /* USE_ALIST_ENV else */
2916		2946
2917	ecb_inline void	2947	ecb_inline void
2918	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)	2948	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2919	{	2949	{
		2950	assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2920	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);	2951	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2921	}	2952	}
2922		2953
2923	ecb_inline void	2954	ecb_inline void
2924	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)	2955	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
…		…
3132	int i = 0;	3163	int i = 0;
3133	struct dump_stack_frame *frame = SCHEME_V->dump_base;	3164	struct dump_stack_frame *frame = SCHEME_V->dump_base;
3134		3165
3135	while (cont != NIL)	3166	while (cont != NIL)
3136	{	3167	{
3137	frame->op = ivalue (car (cont)); cont = cdr (cont);	3168	frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3138	frame->args = car (cont) ; cont = cdr (cont);	3169	frame->args = car (cont) ; cont = cdr (cont);
3139	frame->envir = car (cont) ; cont = cdr (cont);	3170	frame->envir = car (cont) ; cont = cdr (cont);
3140	frame->code = car (cont) ; cont = cdr (cont);	3171	frame->code = car (cont) ; cont = cdr (cont);
3141		3172
3142	++frame;	3173	++frame;
3143	++i;	3174	++i;
3144	}	3175	}
3145		3176
…		…
3174	SCHEME_V->value = a;	3205	SCHEME_V->value = a;
3175		3206
3176	if (dump == NIL)	3207	if (dump == NIL)
3177	return -1;	3208	return -1;
3178		3209
3179	SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump);	3210	SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3180	SCHEME_V->args = car (dump) ; dump = cdr (dump);	3211	SCHEME_V->args = car (dump) ; dump = cdr (dump);
3181	SCHEME_V->envir = car (dump) ; dump = cdr (dump);	3212	SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3182	SCHEME_V->code = car (dump) ; dump = cdr (dump);	3213	SCHEME_V->code = car (dump) ; dump = cdr (dump);
3183		3214
3184	SCHEME_V->dump = dump;	3215	SCHEME_V->dump = dump;
3185		3216
3186	return 0;	3217	return 0;
3187	}	3218	}
…		…
3216		3247
3217	#endif	3248	#endif
3218		3249
3219	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)	3250	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3220		3251
		3252	#if EXPERIMENT
		3253	static int
		3254	debug (SCHEME_P_ int indent, pointer x)
		3255	{
		3256	int c;
		3257
		3258	if (is_syntax (x))
		3259	{
		3260	printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
		3261	return 8 + 8;
		3262	}
		3263
		3264	if (x == NIL)
		3265	{
		3266	printf ("%*sNIL\n", indent, "");
		3267	return 3;
		3268	}
		3269
		3270	switch (type (x))
		3271	{
		3272	case T_INTEGER:
		3273	printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
		3274	return 32+8;
		3275
		3276	case T_SYMBOL:
		3277	printf ("%*sS<%s>\n", indent, "", symname (x));
		3278	return 24+8;
		3279
		3280	case T_CLOSURE:
		3281	printf ("%*sS<%s>\n", indent, "", "closure");
		3282	debug (SCHEME_A_ indent + 3, cdr(x));
		3283	return 32 + debug (SCHEME_A_ indent + 3, car (x));
		3284
		3285	case T_PAIR:
		3286	printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
		3287	c = debug (SCHEME_A_ indent + 3, car (x));
		3288	c += debug (SCHEME_A_ indent + 3, cdr (x));
		3289	return c + 1;
		3290
		3291	case T_PORT:
		3292	printf ("%*sS<%s>\n", indent, "", "port");
		3293	return 24+8;
		3294
		3295	case T_VECTOR:
		3296	printf ("%*sS<%s>\n", indent, "", "vector");
		3297	return 24+8;
		3298
		3299	case T_ENVIRONMENT:
		3300	printf ("%*sS<%s>\n", indent, "", "environment");
		3301	return 0 + debug (SCHEME_A_ indent + 3, car (x));
		3302
		3303	default:
		3304	printf ("unhandled type %d\n", type (x));
		3305	break;
		3306	}
		3307	}
		3308	#endif
		3309
3221	static int	3310	static int
3222	opexe_0 (SCHEME_P_ enum scheme_opcodes op)	3311	opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3223	{	3312	{
3224	pointer args = SCHEME_V->args;	3313	pointer args = SCHEME_V->args;
3225	pointer x, y;	3314	pointer x, y;
3226		3315
3227	switch (op)	3316	switch (op)
3228	{	3317	{
		3318	#if EXPERIMENT //D
		3319	case OP_DEBUG:
		3320	printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
		3321	printf ("\n");
		3322	s_return (S_T);
		3323	#endif
3229	case OP_LOAD: /* load */	3324	case OP_LOAD: /* load */
3230	if (file_interactive (SCHEME_A))	3325	if (file_interactive (SCHEME_A))
3231	{	3326	{
3232	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");	3327	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3233	//D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));	3328	//D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
…		…
3356	}	3451	}
3357	else	3452	else
3358	s_return (SCHEME_V->code);	3453	s_return (SCHEME_V->code);
3359		3454
3360	case OP_E0ARGS: /* eval arguments */	3455	case OP_E0ARGS: /* eval arguments */
3361	if (is_macro (SCHEME_V->value)) /* macro expansion */	3456	if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3362	{	3457	{
3363	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);	3458	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3364	SCHEME_V->args = cons (SCHEME_V->code, NIL);	3459	SCHEME_V->args = cons (SCHEME_V->code, NIL);
3365	SCHEME_V->code = SCHEME_V->value;	3460	SCHEME_V->code = SCHEME_V->value;
3366	s_goto (OP_APPLY);	3461	s_goto (OP_APPLY);
…		…
3393		3488
3394	case OP_TRACING:	3489	case OP_TRACING:
3395	{	3490	{
3396	int tr = SCHEME_V->tracing;	3491	int tr = SCHEME_V->tracing;
3397		3492
3398	SCHEME_V->tracing = ivalue (car (args));	3493	SCHEME_V->tracing = ivalue_unchecked (car (args));
3399	s_return (mk_integer (SCHEME_A_ tr));	3494	s_return (mk_integer (SCHEME_A_ tr));
3400	}	3495	}
3401		3496
3402	#endif	3497	#endif
3403		3498
…		…
3922	{	4017	{
3923	pointer args = SCHEME_V->args;	4018	pointer args = SCHEME_V->args;
3924	pointer x = car (args);	4019	pointer x = car (args);
3925	num v;	4020	num v;
3926		4021
3927	#if USE_MATH
3928	RVALUE dd;
3929	#endif
3930
3931	switch (op)	4022	switch (op)
3932	{	4023	{
3933	#if USE_MATH	4024	#if USE_MATH
3934	case OP_INEX2EX: /* inexact->exact */	4025	case OP_INEX2EX: /* inexact->exact */
		4026	{
3935	if (num_is_integer (x))	4027	if (is_integer (x))
3936	s_return (x);	4028	s_return (x);
3937	else if (modf (rvalue_unchecked (x), &dd) == 0)	4029
		4030	RVALUE r = rvalue_unchecked (x);
		4031
		4032	if (r == (RVALUE)(IVALUE)r)
3938	s_return (mk_integer (SCHEME_A_ ivalue (x)));	4033	s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3939	else	4034	else
3940	Error_1 ("inexact->exact: not integral:", x);	4035	Error_1 ("inexact->exact: not integral:", x);
		4036	}
3941		4037
3942	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));	4038	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))));	4039	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))));	4040	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))));	4041	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
…		…
3963	{	4059	{
3964	RVALUE result;	4060	RVALUE result;
3965	int real_result = 1;	4061	int real_result = 1;
3966	pointer y = cadr (args);	4062	pointer y = cadr (args);
3967		4063
3968	if (num_is_integer (x) && num_is_integer (y))	4064	if (is_integer (x) && is_integer (y))
3969	real_result = 0;	4065	real_result = 0;
3970		4066
3971	/* This 'if' is an R5RS compatibility fix. */	4067	/* This 'if' is an R5RS compatibility fix. */
3972	/* NOTE: Remove this 'if' fix for R6RS. */	4068	/* NOTE: Remove this 'if' fix for R6RS. */
3973	if (rvalue (x) == 0 && rvalue (y) < 0)	4069	if (rvalue (x) == 0 && rvalue (y) < 0)
…		…
3979	/* If the test fails, result is too big for integer. */	4075	/* If the test fails, result is too big for integer. */
3980	if (!real_result)	4076	if (!real_result)
3981	{	4077	{
3982	long result_as_long = result;	4078	long result_as_long = result;
3983		4079
3984	if (result != (RVALUE) result_as_long)	4080	if (result != result_as_long)
3985	real_result = 1;	4081	real_result = 1;
3986	}	4082	}
3987		4083
3988	if (real_result)	4084	if (real_result)
3989	s_return (mk_real (SCHEME_A_ result));	4085	s_return (mk_real (SCHEME_A_ result));
…		…
3994	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));	4090	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))));	4091	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3996		4092
3997	case OP_TRUNCATE:	4093	case OP_TRUNCATE:
3998	{	4094	{
3999	RVALUE rvalue_of_x;	4095	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)));	4096	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	}	4097	}
4008		4098
4009	case OP_ROUND:	4099	case OP_ROUND:
4010	if (num_is_integer (x))	4100	if (is_integer (x))
4011	s_return (x);	4101	s_return (x);
4012		4102
4013	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));	4103	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4014	#endif	4104	#endif
4015		4105
…		…
4135	}	4225	}
4136	else	4226	else
4137	Error_0 ("set-cdr!: unable to alter immutable pair");	4227	Error_0 ("set-cdr!: unable to alter immutable pair");
4138		4228
4139	case OP_CHAR2INT: /* char->integer */	4229	case OP_CHAR2INT: /* char->integer */
4140	s_return (mk_integer (SCHEME_A_ ivalue (x)));	4230	s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4141		4231
4142	case OP_INT2CHAR: /* integer->char */	4232	case OP_INT2CHAR: /* integer->char */
4143	s_return (mk_character (SCHEME_A_ ivalue (x)));	4233	s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4144		4234
4145	case OP_CHARUPCASE:	4235	case OP_CHARUPCASE:
4146	{	4236	{
4147	unsigned char c = ivalue (x);	4237	unsigned char c = ivalue_unchecked (x);
4148	c = toupper (c);	4238	c = toupper (c);
4149	s_return (mk_character (SCHEME_A_ c));	4239	s_return (mk_character (SCHEME_A_ c));
4150	}	4240	}
4151		4241
4152	case OP_CHARDNCASE:	4242	case OP_CHARDNCASE:
4153	{	4243	{
4154	unsigned char c = ivalue (x);	4244	unsigned char c = ivalue_unchecked (x);
4155	c = tolower (c);	4245	c = tolower (c);
4156	s_return (mk_character (SCHEME_A_ c));	4246	s_return (mk_character (SCHEME_A_ c));
4157	}	4247	}
4158		4248
4159	case OP_STR2SYM: /* string->symbol */	4249	case OP_STR2SYM: /* string->symbol */
…		…
4236	Error_1 ("atom->string: not an atom:", x);	4326	Error_1 ("atom->string: not an atom:", x);
4237	}	4327	}
4238		4328
4239	case OP_MKSTRING: /* make-string */	4329	case OP_MKSTRING: /* make-string */
4240	{	4330	{
4241	int fill = ' ';	4331	int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4242	int len;
4243
4244	len = ivalue (x);	4332	int len = ivalue_unchecked (x);
4245
4246	if (cdr (args) != NIL)
4247	fill = charvalue (cadr (args));
4248		4333
4249	s_return (mk_empty_string (SCHEME_A_ len, fill));	4334	s_return (mk_empty_string (SCHEME_A_ len, fill));
4250	}	4335	}
4251		4336
4252	case OP_STRLEN: /* string-length */	4337	case OP_STRLEN: /* string-length */
4253	s_return (mk_integer (SCHEME_A_ strlength (x)));	4338	s_return (mk_integer (SCHEME_A_ strlength (x)));
4254		4339
4255	case OP_STRREF: /* string-ref */	4340	case OP_STRREF: /* string-ref */
4256	{	4341	{
4257	char *str;
4258	int index;
4259
4260	str = strvalue (x);	4342	char *str = strvalue (x);
4261
4262	index = ivalue (cadr (args));	4343	int index = ivalue_unchecked (cadr (args));
4263		4344
4264	if (index >= strlength (x))	4345	if (index >= strlength (x))
4265	Error_1 ("string-ref: out of bounds:", cadr (args));	4346	Error_1 ("string-ref: out of bounds:", cadr (args));
4266		4347
4267	s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));	4348	s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4268	}	4349	}
4269		4350
4270	case OP_STRSET: /* string-set! */	4351	case OP_STRSET: /* string-set! */
4271	{	4352	{
4272	char *str;	4353	char *str = strvalue (x);
4273	int index;	4354	int index = ivalue_unchecked (cadr (args));
4274	int c;	4355	int c;
4275		4356
4276	if (is_immutable (x))	4357	if (is_immutable (x))
4277	Error_1 ("string-set!: unable to alter immutable string:", x);	4358	Error_1 ("string-set!: unable to alter immutable string:", x);
4278
4279	str = strvalue (x);
4280
4281	index = ivalue (cadr (args));
4282		4359
4283	if (index >= strlength (x))	4360	if (index >= strlength (x))
4284	Error_1 ("string-set!: out of bounds:", cadr (args));	4361	Error_1 ("string-set!: out of bounds:", cadr (args));
4285		4362
4286	c = charvalue (caddr (args));	4363	c = charvalue (caddr (args));
…		…
4309	s_return (newstr);	4386	s_return (newstr);
4310	}	4387	}
4311		4388
4312	case OP_SUBSTR: /* substring */	4389	case OP_SUBSTR: /* substring */
4313	{	4390	{
4314	char *str;	4391	char *str = strvalue (x);
4315	int index0;	4392	int index0 = ivalue_unchecked (cadr (args));
4316	int index1;	4393	int index1;
4317	int len;	4394	int len;
4318		4395
4319	str = strvalue (x);
4320
4321	index0 = ivalue (cadr (args));
4322
4323	if (index0 > strlength (x))	4396	if (index0 > strlength (x))
4324	Error_1 ("substring: start out of bounds:", cadr (args));	4397	Error_1 ("substring: start out of bounds:", cadr (args));
4325		4398
4326	if (cddr (args) != NIL)	4399	if (cddr (args) != NIL)
4327	{	4400	{
4328	index1 = ivalue (caddr (args));	4401	index1 = ivalue_unchecked (caddr (args));
4329		4402
4330	if (index1 > strlength (x) || index1 < index0)	4403	if (index1 > strlength (x) || index1 < index0)
4331	Error_1 ("substring: end out of bounds:", caddr (args));	4404	Error_1 ("substring: end out of bounds:", caddr (args));
4332	}	4405	}
4333	else	4406	else
…		…
4356	if (SCHEME_V->no_memory)	4429	if (SCHEME_V->no_memory)
4357	s_return (S_SINK);	4430	s_return (S_SINK);
4358	#endif	4431	#endif
4359		4432
4360	for (x = args, i = 0; is_pair (x); x = cdr (x), i++)	4433	for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4361	set_vector_elem (vec, i, car (x));	4434	vector_set (vec, i, car (x));
4362		4435
4363	s_return (vec);	4436	s_return (vec);
4364	}	4437	}
4365		4438
4366	case OP_MKVECTOR: /* make-vector */	4439	case OP_MKVECTOR: /* make-vector */
4367	{	4440	{
4368	pointer fill = NIL;	4441	pointer fill = NIL;
4369	int len;
4370	pointer vec;	4442	pointer vec;
4371
4372	len = ivalue (x);	4443	int len = ivalue_unchecked (x);
4373		4444
4374	if (cdr (args) != NIL)	4445	if (cdr (args) != NIL)
4375	fill = cadr (args);	4446	fill = cadr (args);
4376		4447
4377	vec = mk_vector (SCHEME_A_ len);	4448	vec = mk_vector (SCHEME_A_ len);
…		…
4380	if (SCHEME_V->no_memory)	4451	if (SCHEME_V->no_memory)
4381	s_return (S_SINK);	4452	s_return (S_SINK);
4382	#endif	4453	#endif
4383		4454
4384	if (fill != NIL)	4455	if (fill != NIL)
4385	fill_vector (vec, fill);	4456	fill_vector (vec, 0, fill);
4386		4457
4387	s_return (vec);	4458	s_return (vec);
4388	}	4459	}
4389		4460
4390	case OP_VECLEN: /* vector-length */	4461	case OP_VECLEN: /* vector-length */
4391	s_return (mk_integer (SCHEME_A_ veclength (x)));	4462	s_return (mk_integer (SCHEME_A_ veclength (x)));
4392		4463
		4464	case OP_VECRESIZE:
		4465	vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
		4466	s_return (x);
		4467
4393	case OP_VECREF: /* vector-ref */	4468	case OP_VECREF: /* vector-ref */
4394	{	4469	{
4395	int index;
4396
4397	index = ivalue (cadr (args));	4470	int index = ivalue_unchecked (cadr (args));
4398		4471
4399	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)	4472	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4400	Error_1 ("vector-ref: out of bounds:", cadr (args));	4473	Error_1 ("vector-ref: out of bounds:", cadr (args));
4401		4474
4402	s_return (vector_elem (x, index));	4475	s_return (vector_get (x, index));
4403	}	4476	}
4404		4477
4405	case OP_VECSET: /* vector-set! */	4478	case OP_VECSET: /* vector-set! */
4406	{	4479	{
4407	int index;	4480	int index = ivalue_unchecked (cadr (args));
4408		4481
4409	if (is_immutable (x))	4482	if (is_immutable (x))
4410	Error_1 ("vector-set!: unable to alter immutable vector:", x);	4483	Error_1 ("vector-set!: unable to alter immutable vector:", x);
4411		4484
4412	index = ivalue (cadr (args));
4413
4414	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)	4485	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4415	Error_1 ("vector-set!: out of bounds:", cadr (args));	4486	Error_1 ("vector-set!: out of bounds:", cadr (args));
4416		4487
4417	set_vector_elem (x, index, caddr (args));	4488	vector_set (x, index, caddr (args));
4418	s_return (x);	4489	s_return (x);
4419	}	4490	}
4420	}	4491	}
4421		4492
4422	if (USE_ERROR_CHECKING) abort ();	4493	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	}	4494	}
4478		4495
4479	static int	4496	static int
4480	opexe_2 (SCHEME_P_ enum scheme_opcodes op)	4497	opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4481	{	4498	{
…		…
4515	pointer d = cdr (args);	4532	pointer d = cdr (args);
4516	int r;	4533	int r;
4517		4534
4518	switch (op)	4535	switch (op)
4519	{	4536	{
4520	case OP_NOT: /* not */ r = is_false (a) ; break;	4537	case OP_NOT: /* not */ r = is_false (a) ; break;
4521	case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;	4538	case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4522	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;	4539	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4523	case OP_NULLP: /* null? */ r = a == NIL ; break;	4540	case OP_NULLP: /* null? */ r = a == NIL ; break;
4524	case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;	4541	case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
		4542	case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4525	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;	4543	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4526	case OP_STRINGP: /* string? */ r = is_string (a) ; break;	4544	case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4527	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;	4545	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4528	case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */	4546	case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4529	case OP_CHARP: /* char? */ r = is_character (a) ; break;	4547	case OP_CHARP: /* char? */ r = is_character (a) ; break;
4530		4548
4531	#if USE_CHAR_CLASSIFIERS	4549	#if USE_CHAR_CLASSIFIERS
4532	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;	4550	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4533	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;	4551	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4534	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;	4552	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4535	case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;	4553	case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4536	case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;	4554	case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4537	#endif	4555	#endif
4538		4556
4539	#if USE_PORTS	4557	#if USE_PORTS
4540	case OP_PORTP: /* port? */ r = is_port (a) ; break;	4558	case OP_PORTP: /* port? */ r = is_port (a) ; break;
4541	case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;	4559	case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
…		…
4742		4760
4743	case OP_NEWSEGMENT: /* new-segment */	4761	case OP_NEWSEGMENT: /* new-segment */
4744	if (!is_pair (args) || !is_number (a))	4762	if (!is_pair (args) || !is_number (a))
4745	Error_0 ("new-segment: argument must be a number");	4763	Error_0 ("new-segment: argument must be a number");
4746		4764
4747	alloc_cellseg (SCHEME_A_ (int)ivalue (a));	4765	alloc_cellseg (SCHEME_A_ ivalue (a));
4748		4766
4749	s_return (S_T);	4767	s_return (S_T);
4750		4768
4751	case OP_OBLIST: /* oblist */	4769	case OP_OBLIST: /* oblist */
4752	s_return (oblist_all_symbols (SCHEME_A));	4770	s_return (oblist_all_symbols (SCHEME_A));
…		…
5010	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);	5028	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5011	SCHEME_V->tok = token (SCHEME_A);	5029	SCHEME_V->tok = token (SCHEME_A);
5012	s_goto (OP_RDSEXPR);	5030	s_goto (OP_RDSEXPR);
5013		5031
5014	case TOK_ATOM:	5032	case TOK_ATOM:
5015	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS)));	5033	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
		5034
		5035	case TOK_DOTATOM:
		5036	SCHEME_V->strbuff[0] = '.';
		5037	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
		5038
		5039	case TOK_STRATOM:
		5040	x = readstrexp (SCHEME_A_ '|');
		5041	//TODO: haven't checked whether the garbage collector could interfere
		5042	s_return (mk_atom (SCHEME_A_ strvalue (x)));
5016		5043
5017	case TOK_DQUOTE:	5044	case TOK_DQUOTE:
5018	x = readstrexp (SCHEME_A);	5045	x = readstrexp (SCHEME_A_ '"');
5019		5046
5020	if (x == S_F)	5047	if (x == S_F)
5021	Error_0 ("Error reading string");	5048	Error_0 ("Error reading string");
5022		5049
5023	setimmutable (x);	5050	setimmutable (x);
…		…
5035	s_goto (OP_EVAL);	5062	s_goto (OP_EVAL);
5036	}	5063	}
5037	}	5064	}
5038		5065
5039	case TOK_SHARP_CONST:	5066	case TOK_SHARP_CONST:
5040	if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL)	5067	if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5041	Error_0 ("undefined sharp expression");	5068	Error_0 ("undefined sharp expression");
5042	else	5069	else
5043	s_return (x);	5070	s_return (x);
5044		5071
5045	default:	5072	default:
…		…
5197	putstr (SCHEME_A_ ")");	5224	putstr (SCHEME_A_ ")");
5198	s_return (S_T);	5225	s_return (S_T);
5199	}	5226	}
5200	else	5227	else
5201	{	5228	{
5202	pointer elem = vector_elem (vec, i);	5229	pointer elem = vector_get (vec, i);
5203		5230
5204	ivalue_unchecked (cdr (args)) = i + 1;	5231	ivalue_unchecked (cdr (args)) = i + 1;
5205	s_save (SCHEME_A_ OP_PVECFROM, args, NIL);	5232	s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5206	SCHEME_V->args = elem;	5233	SCHEME_V->args = elem;
5207		5234
…		…
5267		5294
5268	case OP_CLOSUREP: /* closure? */	5295	case OP_CLOSUREP: /* closure? */
5269	/*	5296	/*
5270	* Note, macro object is also a closure.	5297	* Note, macro object is also a closure.
5271	* Therefore, (closure? <#MACRO>) ==> #t	5298	* Therefore, (closure? <#MACRO>) ==> #t
		5299	* (schmorp) well, obviously not, fix? TODO
5272	*/	5300	*/
5273	s_retbool (is_closure (a));	5301	s_retbool (is_closure (a));
5274		5302
5275	case OP_MACROP: /* macro? */	5303	case OP_MACROP: /* macro? */
5276	s_retbool (is_macro (a));	5304	s_retbool (is_macro (a));
…		…
5282	/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */	5310	/* 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);	5311	typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5284		5312
5285	typedef int (*test_predicate)(pointer);	5313	typedef int (*test_predicate)(pointer);
5286	static int	5314	static int
5287	is_any (pointer p)	5315	tst_any (pointer p)
5288	{	5316	{
5289	return 1;	5317	return 1;
5290	}	5318	}
5291		5319
5292	static int	5320	static int
5293	is_nonneg (pointer p)	5321	tst_inonneg (pointer p)
5294	{	5322	{
5295	return ivalue (p) >= 0 && is_integer (p);	5323	return is_integer (p) && ivalue_unchecked (p) >= 0;
5296	}	5324	}
5297		5325
5298	static int	5326	static int
5299	tst_is_list (pointer p)	5327	tst_is_list (SCHEME_P_ pointer p)
5300	{	5328	{
5301	return p == NIL || is_pair (p);	5329	return p == NIL || is_pair (p);
5302	}	5330	}
5303		5331
5304	/* Correspond carefully with following defines! */	5332	/* Correspond carefully with following defines! */
5305	static struct	5333	static struct
5306	{	5334	{
5307	test_predicate fct;	5335	test_predicate fct;
5308	const char *kind;	5336	const char *kind;
5309	} tests[] =	5337	} tests[] = {
5310	{
5311	{ is_any, 0 },	5338	{ tst_any , 0 },
5312	{ is_string, "string" },	5339	{ is_string , "string" },
5313	{ is_symbol, "symbol" },	5340	{ is_symbol , "symbol" },
5314	{ is_port, "port" },	5341	{ is_port , "port" },
5315	{ is_inport, "input port" },	5342	{ is_inport , "input port" },
5316	{ is_outport, "output port" },	5343	{ is_outport , "output port" },
5317	{ is_environment, "environment" },	5344	{ is_environment, "environment" },
5318	{ is_pair, "pair" },	5345	{ is_pair , "pair" },
5319	{ tst_is_list, "pair or '()" },	5346	{ 0 , "pair or '()" },
5320	{ is_character, "character" },	5347	{ is_character , "character" },
5321	{ is_vector, "vector" },	5348	{ is_vector , "vector" },
5322	{ is_number, "number" },	5349	{ is_number , "number" },
5323	{ is_integer, "integer" },	5350	{ is_integer , "integer" },
5324	{ is_nonneg, "non-negative integer" }	5351	{ tst_inonneg , "non-negative integer" }
5325	};	5352	};
5326		5353
5327	#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */	5354	#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5328	#define TST_ANY "\001"	5355	#define TST_ANY "\001"
5329	#define TST_STRING "\002"	5356	#define TST_STRING "\002"
…		…
5370	typedef struct	5397	typedef struct
5371	{	5398	{
5372	uint8_t func;	5399	uint8_t func;
5373	/*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */	5400	/*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5374	uint8_t builtin;	5401	uint8_t builtin;
		5402	#if USE_ERROR_CHECKING
5375	uint8_t min_arity;	5403	uint8_t min_arity;
5376	uint8_t max_arity;	5404	uint8_t max_arity;
5377	char arg_tests_encoding[3];	5405	char arg_tests_encoding[3];
		5406	#endif
5378	} op_code_info;	5407	} op_code_info;
5379		5408
5380	static const op_code_info dispatch_table[] = {	5409	static const op_code_info dispatch_table[] = {
		5410	#if USE_ERROR_CHECKING
5381	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },	5411	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
		5412	#else
		5413	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
		5414	#endif
5382	#include "opdefines.h"	5415	#include "opdefines.h"
5383	#undef OP_DEF	5416	#undef OP_DEF
5384	{0}	5417	{0}
5385	};	5418	};
5386		5419
…		…
5428	{	5461	{
5429	pointer arg = car (arglist);	5462	pointer arg = car (arglist);
5430		5463
5431	j = t[0];	5464	j = t[0];
5432		5465
		5466	/*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
		5467	if (j == TST_LIST[0])
		5468	{
		5469	if (!tst_is_list (SCHEME_A_ arg))
		5470	break;
		5471	}
		5472	else
		5473	{
5433	if (!tests[j - 1].fct (arg))	5474	if (!tests[j - 1].fct (arg))
5434	break;	5475	break;
		5476	}
5435		5477
5436	if (t[1]) /* last test is replicated as necessary */	5478	if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5437	t++;	5479	t++;
5438		5480
5439	arglist = cdr (arglist);	5481	arglist = cdr (arglist);
5440	i++;	5482	i++;
5441	}	5483	}
…		…
5496	mk_proc (SCHEME_P_ enum scheme_opcodes op)	5538	mk_proc (SCHEME_P_ enum scheme_opcodes op)
5497	{	5539	{
5498	pointer y = get_cell (SCHEME_A_ NIL, NIL);	5540	pointer y = get_cell (SCHEME_A_ NIL, NIL);
5499	set_typeflag (y, (T_PROC | T_ATOM));	5541	set_typeflag (y, (T_PROC | T_ATOM));
5500	ivalue_unchecked (y) = op;	5542	ivalue_unchecked (y) = op;
5501	set_num_integer (y);
5502	return y;	5543	return y;
5503	}	5544	}
5504		5545
5505	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */	5546	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5506	static int	5547	static int
5507	syntaxnum (pointer p)	5548	syntaxnum (pointer p)
5508	{	5549	{
5509	const char *s = strvalue (car (p));	5550	const char *s = strvalue (p);
5510		5551
5511	switch (strlength (car (p)))	5552	switch (strlength (p))
5512	{	5553	{
5513	case 2:	5554	case 2:
5514	if (s[0] == 'i')	5555	if (s[0] == 'i')
5515	return OP_IF0; /* if */	5556	return OP_IF0; /* if */
5516	else	5557	else
…		…
5952	# endif	5993	# endif
5953	int fin;	5994	int fin;
5954	char *file_name = InitFile;	5995	char *file_name = InitFile;
5955	int retcode;	5996	int retcode;
5956	int isfile = 1;	5997	int isfile = 1;
		5998	system ("ps v $PPID");//D
5957		5999
5958	if (argc == 2 && strcmp (argv[1], "-?") == 0)	6000	if (argc == 2 && strcmp (argv[1], "-?") == 0)
5959	{	6001	{
5960	xwrstr ("Usage: tinyscheme -?\n");	6002	xwrstr ("Usage: tinyscheme -?\n");
5961	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");	6003	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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