ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/cvsroot/microscheme/scheme.c

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.25 by root, Fri Nov 27 04:37:26 2015 UTC vs.
Revision 1.47 by root, Mon Nov 30 09:25:19 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);
…		…
236	}	280	}
237		281
238	#define strvalue(p) ((p)->object.string.svalue)	282	#define strvalue(p) ((p)->object.string.svalue)
239	#define strlength(p) ((p)->object.string.length)	283	#define strlength(p) ((p)->object.string.length)
240		284
241	INTERFACE int is_list (SCHEME_P_ pointer p);
242
243	INTERFACE int	285	INTERFACE int
244	is_vector (pointer p)	286	is_vector (pointer p)
245	{	287	{
246	return type (p) == T_VECTOR;	288	return type (p) == T_VECTOR;
247	}	289	}
248		290
249	#define vecvalue(p) ((p)->object.vector.vvalue)	291	#define vecvalue(p) ((p)->object.vector.vvalue)
250	#define veclength(p) ((p)->object.vector.length)	292	#define veclength(p) ((p)->object.vector.length)
251	INTERFACE void fill_vector (pointer vec, pointer obj);	293	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
252	INTERFACE uint32_t vector_length (pointer vec);
253	INTERFACE pointer vector_elem (pointer vec, uint32_t ielem);	294	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
254	INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a);	295	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
255		296
256	INTERFACE uint32_t	297	INTERFACE int
257	vector_length (pointer vec)	298	is_integer (pointer p)
258	{	299	{
259	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;
260	}	308	}
261		309
262	INTERFACE int	310	INTERFACE int
263	is_number (pointer p)	311	is_number (pointer p)
264	{	312	{
265	return type (p) == T_NUMBER;	313	return is_integer (p) || is_real (p);
266	}
267
268	INTERFACE int
269	is_integer (pointer p)
270	{
271	return is_number (p) && num_is_fixnum (p->object.number);
272	}
273
274	INTERFACE int
275	is_real (pointer p)
276	{
277	return is_number (p) && !num_is_fixnum (p->object.number);
278	}	314	}
279		315
280	INTERFACE int	316	INTERFACE int
281	is_character (pointer p)	317	is_character (pointer p)
282	{	318	{
…		…
287	string_value (pointer p)	323	string_value (pointer p)
288	{	324	{
289	return strvalue (p);	325	return strvalue (p);
290	}	326	}
291		327
292	ecb_inline num
293	nvalue (pointer p)
294	{
295	return (p)->object.number;
296	}
297
298	static IVALUE
299	num_get_ivalue (const num n)
300	{
301	return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
302	}
303
304	static RVALUE
305	num_get_rvalue (const num n)
306	{
307	return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
308	}
309
310	INTERFACE IVALUE
311	ivalue (pointer p)
312	{
313	return num_get_ivalue (p->object.number);
314	}
315
316	INTERFACE RVALUE
317	rvalue (pointer p)
318	{
319	return num_get_rvalue (p->object.number);
320	}
321
322	#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
323	#if USE_REAL	331	#if USE_REAL
324	# define rvalue_unchecked(p) ((p)->object.number.value.rvalue)	332	#define rvalue_unchecked(p) (p)->object.rvalue
325	# define set_num_integer(p) (p)->object.number.is_fixnum=1;	333	#define set_rvalue(p,v) (p)->object.rvalue = (v)
326	# define set_num_real(p) (p)->object.number.is_fixnum=0;
327	#else	334	#else
328	# define rvalue_unchecked(p) ((p)->object.number.value.ivalue)	335	#define rvalue_unchecked(p) (p)->object.ivalue
329	# define set_num_integer(p) 0	336	#define set_rvalue(p,v) (p)->object.ivalue = (v)
330	# define set_num_real(p) 0
331	#endif	337	#endif
332		338
333	INTERFACE long	339	INTERFACE long
334	charvalue (pointer p)	340	charvalue (pointer p)
335	{	341	{
…		…
403	}	409	}
404		410
405	INTERFACE char *	411	INTERFACE char *
406	symname (pointer p)	412	symname (pointer p)
407	{	413	{
408	return strvalue (car (p));	414	return strvalue (p);
409	}	415	}
410		416
411	#if USE_PLIST	417	#if USE_PLIST
		418	#error plists are broken because symbols are no longer pairs
		419	#define symprop(p) cdr(p)
412	SCHEME_EXPORT int	420	SCHEME_EXPORT int
413	hasprop (pointer p)	421	hasprop (pointer p)
414	{	422	{
415	return typeflag (p) & T_SYMBOL;	423	return typeflag (p) & T_SYMBOL;
416	}	424	}
417
418	# define symprop(p) cdr(p)
419	#endif	425	#endif
420		426
421	INTERFACE int	427	INTERFACE int
422	is_syntax (pointer p)	428	is_syntax (pointer p)
423	{	429	{
…		…
437	}	443	}
438		444
439	INTERFACE char *	445	INTERFACE char *
440	syntaxname (pointer p)	446	syntaxname (pointer p)
441	{	447	{
442	return strvalue (car (p));	448	return strvalue (p);
443	}	449	}
444		450
445	#define procnum(p) ivalue (p)	451	#define procnum(p) ivalue_unchecked (p)
446	static const char *procname (pointer x);	452	static const char *procname (pointer x);
447		453
448	INTERFACE int	454	INTERFACE int
449	is_closure (pointer p)	455	is_closure (pointer p)
450	{	456	{
…		…
511	setimmutable (pointer p)	517	setimmutable (pointer p)
512	{	518	{
513	#if USE_ERROR_CHECKING	519	#if USE_ERROR_CHECKING
514	set_typeflag (p, typeflag (p) | T_IMMUTABLE);	520	set_typeflag (p, typeflag (p) | T_IMMUTABLE);
515	#endif	521	#endif
		522	}
		523
		524	/* Result is:
		525	proper list: length
		526	circular list: -1
		527	not even a pair: -2
		528	dotted list: -2 minus length before dot
		529	*/
		530	INTERFACE int
		531	list_length (SCHEME_P_ pointer a)
		532	{
		533	int i = 0;
		534	pointer slow, fast;
		535
		536	slow = fast = a;
		537
		538	while (1)
		539	{
		540	if (fast == NIL)
		541	return i;
		542
		543	if (!is_pair (fast))
		544	return -2 - i;
		545
		546	fast = cdr (fast);
		547	++i;
		548
		549	if (fast == NIL)
		550	return i;
		551
		552	if (!is_pair (fast))
		553	return -2 - i;
		554
		555	++i;
		556	fast = cdr (fast);
		557
		558	/* Safe because we would have already returned if `fast'
		559	encountered a non-pair. */
		560	slow = cdr (slow);
		561
		562	if (fast == slow)
		563	{
		564	/* the fast pointer has looped back around and caught up
		565	with the slow pointer, hence the structure is circular,
		566	not of finite length, and therefore not a list */
		567	return -1;
		568	}
		569	}
		570	}
		571
		572	INTERFACE int
		573	is_list (SCHEME_P_ pointer a)
		574	{
		575	return list_length (SCHEME_A_ a) >= 0;
516	}	576	}
517		577
518	#if USE_CHAR_CLASSIFIERS	578	#if USE_CHAR_CLASSIFIERS
519	ecb_inline int	579	ecb_inline int
520	Cisalpha (int c)	580	Cisalpha (int c)
…		…
609	#endif	669	#endif
610		670
611	static int file_push (SCHEME_P_ const char *fname);	671	static int file_push (SCHEME_P_ const char *fname);
612	static void file_pop (SCHEME_P);	672	static void file_pop (SCHEME_P);
613	static int file_interactive (SCHEME_P);	673	static int file_interactive (SCHEME_P);
614	ecb_inline int is_one_of (char *s, int c);	674	ecb_inline int is_one_of (const char *s, int c);
615	static int alloc_cellseg (SCHEME_P_ int n);	675	static int alloc_cellseg (SCHEME_P_ int n);
616	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);	676	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
617	static void finalize_cell (SCHEME_P_ pointer a);	677	static void finalize_cell (SCHEME_P_ pointer a);
618	static int count_consecutive_cells (pointer x, int needed);	678	static int count_consecutive_cells (pointer x, int needed);
619	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);	679	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
…		…
636	static void mark (pointer a);	696	static void mark (pointer a);
637	static void gc (SCHEME_P_ pointer a, pointer b);	697	static void gc (SCHEME_P_ pointer a, pointer b);
638	static int basic_inchar (port *pt);	698	static int basic_inchar (port *pt);
639	static int inchar (SCHEME_P);	699	static int inchar (SCHEME_P);
640	static void backchar (SCHEME_P_ int c);	700	static void backchar (SCHEME_P_ int c);
641	static char *readstr_upto (SCHEME_P_ char *delim);	701	static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
642	static pointer readstrexp (SCHEME_P);	702	static pointer readstrexp (SCHEME_P_ char delim);
643	ecb_inline int skipspace (SCHEME_P);	703	ecb_inline int skipspace (SCHEME_P);
644	static int token (SCHEME_P);	704	static int token (SCHEME_P);
645	static void printslashstring (SCHEME_P_ char *s, int len);	705	static void printslashstring (SCHEME_P_ char *s, int len);
646	static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);	706	static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
647	static void printatom (SCHEME_P_ pointer l, int f);	707	static void printatom (SCHEME_P_ pointer l, int f);
…		…
664	static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);	724	static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
665	static void assign_syntax (SCHEME_P_ const char *name);	725	static void assign_syntax (SCHEME_P_ const char *name);
666	static int syntaxnum (pointer p);	726	static int syntaxnum (pointer p);
667	static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);	727	static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
668		728
		729	static IVALUE
		730	ivalue (pointer x)
		731	{
		732	return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
		733	}
		734
		735	static RVALUE
		736	rvalue (pointer x)
		737	{
		738	return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
		739	}
		740
		741	INTERFACE num
		742	nvalue (pointer x)
		743	{
		744	num n;
		745
		746	num_set_fixnum (n, is_integer (x));
		747
		748	if (num_is_fixnum (n))
		749	num_set_ivalue (n, ivalue_unchecked (x));
		750	else
		751	num_set_rvalue (n, rvalue_unchecked (x));
		752
		753	return n;
		754	}
		755
669	static num	756	static num
670	num_op (enum num_op op, num a, num b)	757	num_op (enum num_op op, num a, num b)
671	{	758	{
672	num ret;	759	num ret;
673		760
674	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	761	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
675		762
676	if (num_is_fixnum (ret))	763	if (num_is_fixnum (ret))
677	{	764	{
678	IVALUE av = num_get_ivalue (a);
679	IVALUE bv = num_get_ivalue (b);
680
681	switch (op)	765	switch (op)
682	{	766	{
683	case NUM_ADD: av += bv; break;	767	case NUM_ADD: a.ivalue += b.ivalue; break;
684	case NUM_SUB: av -= bv; break;	768	case NUM_SUB: a.ivalue -= b.ivalue; break;
685	case NUM_MUL: av *= bv; break;	769	case NUM_MUL: a.ivalue *= b.ivalue; break;
686	case NUM_INTDIV: av /= bv; break;	770	case NUM_INTDIV: a.ivalue /= b.ivalue; break;
687	}	771	}
688		772
689	num_set_ivalue (ret, av);	773	num_set_ivalue (ret, a.ivalue);
690	}	774	}
		775	#if USE_REAL
691	else	776	else
692	{	777	{
693	RVALUE av = num_get_rvalue (a);
694	RVALUE bv = num_get_rvalue (b);
695
696	switch (op)	778	switch (op)
697	{	779	{
698	case NUM_ADD: av += bv; break;	780	case NUM_ADD: a.rvalue += b.rvalue; break;
699	case NUM_SUB: av -= bv; break;	781	case NUM_SUB: a.rvalue -= b.rvalue; break;
700	case NUM_MUL: av *= bv; break;	782	case NUM_MUL: a.rvalue *= b.rvalue; break;
701	case NUM_INTDIV: av /= bv; break;	783	case NUM_INTDIV: a.rvalue /= b.rvalue; break;
702	}	784	}
703		785
704	num_set_rvalue (ret, av);	786	num_set_rvalue (ret, a.rvalue);
705	}	787	}
		788	#endif
706		789
707	return ret;	790	return ret;
708	}	791	}
709		792
710	static num	793	static num
711	num_div (num a, num b)	794	num_div (num a, num b)
712	{	795	{
713	num ret;	796	num ret;
714		797
715	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0);	798	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
716		799
717	if (num_is_fixnum (ret))	800	if (num_is_fixnum (ret))
718	num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));	801	num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
719	else	802	else
720	num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));	803	num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
721		804
722	return ret;	805	return ret;
723	}	806	}
724		807
725	static num	808	static num
…		…
727	{	810	{
728	num ret;	811	num ret;
729	long e1, e2, res;	812	long e1, e2, res;
730		813
731	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	814	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
732	e1 = num_get_ivalue (a);	815	e1 = num_ivalue (a);
733	e2 = num_get_ivalue (b);	816	e2 = num_ivalue (b);
734	res = e1 % e2;	817	res = e1 % e2;
735		818
736	/* remainder should have same sign as second operand */	819	/* remainder should have same sign as second operand */
737	if (res > 0)	820	if (res > 0)
738	{	821	{
…		…
754	{	837	{
755	num ret;	838	num ret;
756	long e1, e2, res;	839	long e1, e2, res;
757		840
758	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	841	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
759	e1 = num_get_ivalue (a);	842	e1 = num_ivalue (a);
760	e2 = num_get_ivalue (b);	843	e2 = num_ivalue (b);
761	res = e1 % e2;	844	res = e1 % e2;
762		845
763	/* modulo should have same sign as second operand */	846	/* modulo should have same sign as second operand */
764	if (res * e2 < 0)	847	if (res * e2 < 0)
765	res += e2;	848	res += e2;
…		…
775	int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);	858	int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
776	int ret;	859	int ret;
777		860
778	if (is_fixnum)	861	if (is_fixnum)
779	{	862	{
780	IVALUE av = num_get_ivalue (a);	863	IVALUE av = num_ivalue (a);
781	IVALUE bv = num_get_ivalue (b);	864	IVALUE bv = num_ivalue (b);
782		865
783	ret = av == bv ? 0 : av < bv ? -1 : +1;	866	ret = av == bv ? 0 : av < bv ? -1 : +1;
784	}	867	}
785	else	868	else
786	{	869	{
787	RVALUE av = num_get_rvalue (a);	870	RVALUE av = num_rvalue (a);
788	RVALUE bv = num_get_rvalue (b);	871	RVALUE bv = num_rvalue (b);
789		872
790	ret = av == bv ? 0 : av < bv ? -1 : +1;	873	ret = av == bv ? 0 : av < bv ? -1 : +1;
791	}	874	}
792		875
793	return ret;	876	return ret;
…		…
856	return k;	939	return k;
857		940
858	i = ++SCHEME_V->last_cell_seg;	941	i = ++SCHEME_V->last_cell_seg;
859	SCHEME_V->alloc_seg[i] = cp;	942	SCHEME_V->alloc_seg[i] = cp;
860		943
861	/* insert new segment in address order */
862	newp = (pointer)cp;	944	newp = (pointer)cp;
863	SCHEME_V->cell_seg[i] = newp;	945	SCHEME_V->cell_seg[i] = newp;
864	SCHEME_V->cell_segsize[i] = segsize;	946	SCHEME_V->cell_segsize[i] = segsize;
865
866	//TODO: insert, not swap
867	while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
868	{
869	p = SCHEME_V->cell_seg[i];
870	SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
871	SCHEME_V->cell_seg[i - 1] = p;
872
873	k = SCHEME_V->cell_segsize[i];
874	SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
875	SCHEME_V->cell_segsize[i - 1] = k;
876
877	--i;
878	}
879
880	SCHEME_V->fcells += segsize;	947	SCHEME_V->fcells += segsize;
881	last = newp + segsize - 1;	948	last = newp + segsize - 1;
882		949
883	for (p = newp; p <= last; p++)	950	for (p = newp; p <= last; p++)
884	{	951	{
885	set_typeflag (p, T_FREE);	952	set_typeflag (p, T_PAIR);
886	set_car (p, NIL);	953	set_car (p, NIL);
887	set_cdr (p, p + 1);	954	set_cdr (p, p + 1);
888	}	955	}
889		956
890	/* insert new cells in address order on free list */
891	if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
892	{
893	set_cdr (last, SCHEME_V->free_cell);	957	set_cdr (last, SCHEME_V->free_cell);
894	SCHEME_V->free_cell = newp;	958	SCHEME_V->free_cell = newp;
895	}
896	else
897	{
898	p = SCHEME_V->free_cell;
899
900	while (cdr (p) != NIL && newp > cdr (p))
901	p = cdr (p);
902
903	set_cdr (last, cdr (p));
904	set_cdr (p, newp);
905	}
906	}	959	}
907		960
908	return n;	961	return n;
909	}	962	}
910		963
…		…
917	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	970	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
918	return S_SINK;	971	return S_SINK;
919		972
920	if (SCHEME_V->free_cell == NIL)	973	if (SCHEME_V->free_cell == NIL)
921	{	974	{
922	const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8;	975	const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
923		976
924	gc (SCHEME_A_ a, b);	977	gc (SCHEME_A_ a, b);
925		978
926	if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)	979	if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
927	{	980	{
…		…
978	}	1031	}
979		1032
980	static pointer	1033	static pointer
981	get_vector_object (SCHEME_P_ uint32_t len, pointer init)	1034	get_vector_object (SCHEME_P_ uint32_t len, pointer init)
982	{	1035	{
983	pointer v = get_cell_x (SCHEME_A_ 0, 0);	1036	pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
984	pointer *e = malloc (len * sizeof (pointer));	1037	pointer *e = malloc (len * sizeof (pointer));
985		1038
986	if (!e && USE_ERROR_CHECKING)	1039	if (!e && USE_ERROR_CHECKING)
987	return S_SINK;	1040	return S_SINK;
988		1041
989	/* Record it as a vector so that gc understands it. */	1042	/* Record it as a vector so that gc understands it. */
990	set_typeflag (v, T_VECTOR | T_ATOM);	1043	set_typeflag (v, T_VECTOR | T_ATOM);
991		1044
992	v->object.vector.vvalue = e;	1045	v->object.vector.vvalue = e;
993	v->object.vector.length = len;	1046	v->object.vector.length = len;
994	fill_vector (v, init);	1047	fill_vector (v, 0, init);
995	push_recent_alloc (SCHEME_A_ v, NIL);	1048	push_recent_alloc (SCHEME_A_ v, NIL);
996		1049
997	return v;	1050	return v;
998	}	1051	}
999		1052
…		…
1042	set_cdr (x, b);	1095	set_cdr (x, b);
1043		1096
1044	return x;	1097	return x;
1045	}	1098	}
1046		1099
		1100	static pointer
		1101	generate_symbol (SCHEME_P_ const char *name)
		1102	{
		1103	pointer x = mk_string (SCHEME_A_ name);
		1104	setimmutable (x);
		1105	set_typeflag (x, T_SYMBOL | T_ATOM);
		1106	return x;
		1107	}
		1108
1047	/* ========== oblist implementation ========== */	1109	/* ========== oblist implementation ========== */
1048		1110
1049	#ifndef USE_OBJECT_LIST	1111	#ifndef USE_OBJECT_LIST
1050		1112
		1113	static int
1051	static int hash_fn (const char *key, int table_size);	1114	hash_fn (const char *key, int table_size)
		1115	{
		1116	const unsigned char *p = key;
		1117	uint32_t hash = 2166136261;
		1118
		1119	while (*p)
		1120	hash = (hash ^ *p++) * 16777619;
		1121
		1122	return hash % table_size;
		1123	}
1052		1124
1053	static pointer	1125	static pointer
1054	oblist_initial_value (SCHEME_P)	1126	oblist_initial_value (SCHEME_P)
1055	{	1127	{
1056	return mk_vector (SCHEME_A_ 461); /* probably should be bigger */	1128	return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
…		…
1058		1130
1059	/* returns the new symbol */	1131	/* returns the new symbol */
1060	static pointer	1132	static pointer
1061	oblist_add_by_name (SCHEME_P_ const char *name)	1133	oblist_add_by_name (SCHEME_P_ const char *name)
1062	{	1134	{
1063	int location;	1135	pointer x = generate_symbol (SCHEME_A_ name);
1064
1065	pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1066	set_typeflag (x, T_SYMBOL);
1067	setimmutable (car (x));
1068
1069	location = hash_fn (name, veclength (SCHEME_V->oblist));	1136	int location = hash_fn (name, veclength (SCHEME_V->oblist));
1070	set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location)));	1137	vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1071	return x;	1138	return x;
1072	}	1139	}
1073		1140
1074	ecb_inline pointer	1141	ecb_inline pointer
1075	oblist_find_by_name (SCHEME_P_ const char *name)	1142	oblist_find_by_name (SCHEME_P_ const char *name)
…		…
1078	pointer x;	1145	pointer x;
1079	char *s;	1146	char *s;
1080		1147
1081	location = hash_fn (name, veclength (SCHEME_V->oblist));	1148	location = hash_fn (name, veclength (SCHEME_V->oblist));
1082		1149
1083	for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x))	1150	for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1084	{	1151	{
1085	s = symname (car (x));	1152	s = symname (car (x));
1086		1153
1087	/* case-insensitive, per R5RS section 2 */	1154	/* case-insensitive, per R5RS section 2 */
1088	if (stricmp (name, s) == 0)	1155	if (stricmp (name, s) == 0)
…		…
1098	int i;	1165	int i;
1099	pointer x;	1166	pointer x;
1100	pointer ob_list = NIL;	1167	pointer ob_list = NIL;
1101		1168
1102	for (i = 0; i < veclength (SCHEME_V->oblist); i++)	1169	for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1103	for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x))	1170	for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1104	ob_list = cons (x, ob_list);	1171	ob_list = cons (x, ob_list);
1105		1172
1106	return ob_list;	1173	return ob_list;
1107	}	1174	}
1108		1175
…		…
1134		1201
1135	/* returns the new symbol */	1202	/* returns the new symbol */
1136	static pointer	1203	static pointer
1137	oblist_add_by_name (SCHEME_P_ const char *name)	1204	oblist_add_by_name (SCHEME_P_ const char *name)
1138	{	1205	{
1139	pointer x;	1206	pointer x = mk_string (SCHEME_A_ name);
1140
1141	x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1142	set_typeflag (x, T_SYMBOL);	1207	set_typeflag (x, T_SYMBOL);
1143	setimmutable (car (x));	1208	setimmutable (x);
1144	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);	1209	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1145	return x;	1210	return x;
1146	}	1211	}
1147		1212
1148	static pointer	1213	static pointer
…		…
1181	mk_character (SCHEME_P_ int c)	1246	mk_character (SCHEME_P_ int c)
1182	{	1247	{
1183	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1248	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1184		1249
1185	set_typeflag (x, (T_CHARACTER | T_ATOM));	1250	set_typeflag (x, (T_CHARACTER | T_ATOM));
1186	ivalue_unchecked (x) = c & 0xff;	1251	set_ivalue (x, c & 0xff);
1187	set_num_integer (x);	1252
1188	return x;	1253	return x;
1189	}	1254	}
1190		1255
1191	/* get number atom (integer) */	1256	/* get number atom (integer) */
1192	INTERFACE pointer	1257	INTERFACE pointer
1193	mk_integer (SCHEME_P_ long num)	1258	mk_integer (SCHEME_P_ long n)
1194	{	1259	{
1195	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1260	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196		1261
1197	set_typeflag (x, (T_NUMBER | T_ATOM));	1262	set_typeflag (x, (T_INTEGER | T_ATOM));
1198	ivalue_unchecked (x) = num;	1263	set_ivalue (x, n);
1199	set_num_integer (x);	1264
1200	return x;	1265	return x;
1201	}	1266	}
1202		1267
1203	INTERFACE pointer	1268	INTERFACE pointer
1204	mk_real (SCHEME_P_ RVALUE n)	1269	mk_real (SCHEME_P_ RVALUE n)
1205	{	1270	{
		1271	#if USE_REAL
1206	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1272	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1207		1273
1208	set_typeflag (x, (T_NUMBER | T_ATOM));	1274	set_typeflag (x, (T_REAL | T_ATOM));
1209	rvalue_unchecked (x) = n;	1275	set_rvalue (x, n);
1210	set_num_real (x);	1276
1211	return x;	1277	return x;
		1278	#else
		1279	return mk_integer (SCHEME_A_ n);
		1280	#endif
1212	}	1281	}
1213		1282
1214	static pointer	1283	static pointer
1215	mk_number (SCHEME_P_ const num n)	1284	mk_number (SCHEME_P_ const num n)
1216	{	1285	{
		1286	#if USE_REAL
1217	if (num_is_fixnum (n))	1287	return num_is_fixnum (n)
		1288	? mk_integer (SCHEME_A_ num_ivalue (n))
		1289	: mk_real (SCHEME_A_ num_rvalue (n));
		1290	#else
1218	return mk_integer (SCHEME_A_ num_get_ivalue (n));	1291	return mk_integer (SCHEME_A_ num_ivalue (n));
1219	else	1292	#endif
1220	return mk_real (SCHEME_A_ num_get_rvalue (n));
1221	}	1293	}
1222		1294
1223	/* allocate name to string area */	1295	/* allocate name to string area */
1224	static char *	1296	static char *
1225	store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)	1297	store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
…		…
1231	SCHEME_V->no_memory = 1;	1303	SCHEME_V->no_memory = 1;
1232	return SCHEME_V->strbuff;	1304	return SCHEME_V->strbuff;
1233	}	1305	}
1234		1306
1235	if (str)	1307	if (str)
1236	{	1308	memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1237	int l = strlen (str);
1238
1239	if (l > len_str)
1240	l = len_str;
1241
1242	memcpy (q, str, l);
1243	q[l] = 0;
1244	}
1245	else	1309	else
1246	{
1247	memset (q, fill, len_str);	1310	memset (q, fill, len_str);
		1311
1248	q[len_str] = 0;	1312	q[len_str] = 0;
1249	}
1250		1313
1251	return q;	1314	return q;
1252	}	1315	}
1253		1316
1254	INTERFACE pointer	1317	INTERFACE pointer
…		…
1268	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1331	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1269		1332
1270	set_typeflag (x, T_STRING | T_ATOM);	1333	set_typeflag (x, T_STRING | T_ATOM);
1271	strvalue (x) = store_string (SCHEME_A_ len, str, 0);	1334	strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1272	strlength (x) = len;	1335	strlength (x) = len;
		1336
1273	return x;	1337	return x;
1274	}	1338	}
1275		1339
1276	INTERFACE pointer	1340	INTERFACE pointer
1277	mk_string (SCHEME_P_ const char *str)	1341	mk_string (SCHEME_P_ const char *str)
…		…
1284	{	1348	{
1285	return get_vector_object (SCHEME_A_ len, NIL);	1349	return get_vector_object (SCHEME_A_ len, NIL);
1286	}	1350	}
1287		1351
1288	INTERFACE void	1352	INTERFACE void
1289	fill_vector (pointer vec, pointer obj)	1353	fill_vector (pointer vec, uint32_t start, pointer obj)
1290	{	1354	{
1291	int i;	1355	int i;
1292		1356
1293	for (i = 0; i < vec->object.vector.length; i++)	1357	for (i = start; i < veclength (vec); i++)
1294	vecvalue (vec)[i] = obj;	1358	vecvalue (vec)[i] = obj;
1295	}	1359	}
1296		1360
		1361	INTERFACE void
		1362	vector_resize (pointer vec, uint32_t newsize, pointer fill)
		1363	{
		1364	uint32_t oldsize = veclength (vec);
		1365	vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
		1366	veclength (vec) = newsize;
		1367	fill_vector (vec, oldsize, fill);
		1368	}
		1369
1297	INTERFACE pointer	1370	INTERFACE pointer
1298	vector_elem (pointer vec, uint32_t ielem)	1371	vector_get (pointer vec, uint32_t ielem)
1299	{	1372	{
1300	return vecvalue(vec)[ielem];	1373	return vecvalue(vec)[ielem];
1301	}	1374	}
1302		1375
1303	INTERFACE void	1376	INTERFACE void
1304	set_vector_elem (pointer vec, uint32_t ielem, pointer a)	1377	vector_set (pointer vec, uint32_t ielem, pointer a)
1305	{	1378	{
1306	vecvalue(vec)[ielem] = a;	1379	vecvalue(vec)[ielem] = a;
1307	}	1380	}
1308		1381
1309	/* get new symbol */	1382	/* get new symbol */
…		…
1321		1394
1322	INTERFACE pointer	1395	INTERFACE pointer
1323	gensym (SCHEME_P)	1396	gensym (SCHEME_P)
1324	{	1397	{
1325	pointer x;	1398	pointer x;
1326
1327	for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1328	{
1329	char name[40] = "gensym-";	1399	char name[40] = "gensym-";
1330	xnum (name + 7, SCHEME_V->gensym_cnt);	1400	xnum (name + 7, ++SCHEME_V->gensym_cnt);
1331		1401
1332	/* first check oblist */	1402	return generate_symbol (SCHEME_A_ name);
1333	x = oblist_find_by_name (SCHEME_A_ name);	1403	}
1334		1404
1335	if (x == NIL)	1405	static int
1336	{	1406	is_gensym (SCHEME_P_ pointer x)
1337	x = oblist_add_by_name (SCHEME_A_ name);	1407	{
1338	return x;	1408	return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1339	}
1340	}
1341
1342	return NIL;
1343	}	1409	}
1344		1410
1345	/* make symbol or number atom from string */	1411	/* make symbol or number atom from string */
1346	static pointer	1412	static pointer
1347	mk_atom (SCHEME_P_ char *q)	1413	mk_atom (SCHEME_P_ char *q)
…		…
1401	}	1467	}
1402	else if ((c == 'e') || (c == 'E'))	1468	else if ((c == 'e') || (c == 'E'))
1403	{	1469	{
1404	if (!has_fp_exp)	1470	if (!has_fp_exp)
1405	{	1471	{
1406	has_dec_point = 1; /* decimal point illegal	1472	has_dec_point = 1; /* decimal point illegal from now on */
1407	from now on */
1408	p++;	1473	p++;
1409		1474
1410	if ((*p == '-') || (*p == '+') || isdigit (*p))	1475	if ((*p == '-') || (*p == '+') || isdigit (*p))
1411	continue;	1476	continue;
1412	}	1477	}
…		…
1500		1565
1501	if (ecb_expect_false (is_vector (p)))	1566	if (ecb_expect_false (is_vector (p)))
1502	{	1567	{
1503	int i;	1568	int i;
1504		1569
1505	for (i = 0; i < p->object.vector.length; i++)	1570	for (i = 0; i < veclength (p); i++)
1506	mark (vecvalue (p)[i]);	1571	mark (vecvalue (p)[i]);
1507	}	1572	}
1508		1573
1509	if (is_atom (p))	1574	if (is_atom (p))
1510	goto E6;	1575	goto E6;
…		…
1592	/* garbage collect */	1657	/* garbage collect */
1593	clrmark (NIL);	1658	clrmark (NIL);
1594	SCHEME_V->fcells = 0;	1659	SCHEME_V->fcells = 0;
1595	SCHEME_V->free_cell = NIL;	1660	SCHEME_V->free_cell = NIL;
1596		1661
1597	/* free-list is kept sorted by address so as to maintain consecutive	1662	if (SCHEME_V->gc_verbose)
1598	ranges, if possible, for use with vectors. Here we scan the cells	1663	xwrstr ("freeing...");
1599	(which are also kept sorted by address) downwards to build the	1664
1600	free-list in sorted order.	1665	uint32_t total = 0;
1601	*/	1666
		1667	/* Here we scan the cells to build the free-list. */
1602	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)	1668	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1603	{	1669	{
1604	p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];	1670	pointer end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
		1671	total += SCHEME_V->cell_segsize [i];
1605		1672
1606	while (--p >= SCHEME_V->cell_seg[i])	1673	for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1607	{	1674	{
1608	if (is_mark (p))	1675	if (is_mark (p))
1609	clrmark (p);	1676	clrmark (p);
1610	else	1677	else
1611	{	1678	{
1612	/* reclaim cell */	1679	/* reclaim cell */
1613	if (typeflag (p) != T_FREE)	1680	if (typeflag (p) != T_PAIR)
1614	{	1681	{
1615	finalize_cell (SCHEME_A_ p);	1682	finalize_cell (SCHEME_A_ p);
1616	set_typeflag (p, T_FREE);	1683	set_typeflag (p, T_PAIR);
1617	set_car (p, NIL);	1684	set_car (p, NIL);
1618	}	1685	}
1619		1686
1620	++SCHEME_V->fcells;	1687	++SCHEME_V->fcells;
1621	set_cdr (p, SCHEME_V->free_cell);	1688	set_cdr (p, SCHEME_V->free_cell);
…		…
1623	}	1690	}
1624	}	1691	}
1625	}	1692	}
1626		1693
1627	if (SCHEME_V->gc_verbose)	1694	if (SCHEME_V->gc_verbose)
		1695	{
1628	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");	1696	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");
		1697	}
1629	}	1698	}
1630		1699
1631	static void	1700	static void
1632	finalize_cell (SCHEME_P_ pointer a)	1701	finalize_cell (SCHEME_P_ pointer a)
1633	{	1702	{
1634	/* TODO, fast bitmap check? */	1703	/* TODO, fast bitmap check? */
1635	if (is_string (a))	1704	if (is_string (a) || is_symbol (a))
1636	free (strvalue (a));	1705	free (strvalue (a));
1637	else if (is_vector (a))	1706	else if (is_vector (a))
1638	free (vecvalue (a));	1707	free (vecvalue (a));
1639	#if USE_PORTS	1708	#if USE_PORTS
1640	else if (is_port (a))	1709	else if (is_port (a))
…		…
2062	#endif	2131	#endif
2063	}	2132	}
2064		2133
2065	/* read characters up to delimiter, but cater to character constants */	2134	/* read characters up to delimiter, but cater to character constants */
2066	static char *	2135	static char *
2067	readstr_upto (SCHEME_P_ char *delim)	2136	readstr_upto (SCHEME_P_ int skip, const char *delim)
2068	{	2137	{
2069	char *p = SCHEME_V->strbuff;	2138	char *p = SCHEME_V->strbuff + skip;
2070		2139
2071	while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));	2140	while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2072		2141
2073	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')	2142	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2074	*p = 0;	2143	*p = 0;
…		…
2081	return SCHEME_V->strbuff;	2150	return SCHEME_V->strbuff;
2082	}	2151	}
2083		2152
2084	/* read string expression "xxx...xxx" */	2153	/* read string expression "xxx...xxx" */
2085	static pointer	2154	static pointer
2086	readstrexp (SCHEME_P)	2155	readstrexp (SCHEME_P_ char delim)
2087	{	2156	{
2088	char *p = SCHEME_V->strbuff;	2157	char *p = SCHEME_V->strbuff;
2089	int c;	2158	int c;
2090	int c1 = 0;	2159	int c1 = 0;
2091	enum
2092	{ st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;	2160	enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2093		2161
2094	for (;;)	2162	for (;;)
2095	{	2163	{
2096	c = inchar (SCHEME_A);	2164	c = inchar (SCHEME_A);
2097		2165
…		…
2099	return S_F;	2167	return S_F;
2100		2168
2101	switch (state)	2169	switch (state)
2102	{	2170	{
2103	case st_ok:	2171	case st_ok:
2104	switch (c)	2172	if (ecb_expect_false (c == delim))
2105	{
2106	case '\\':
2107	state = st_bsl;
2108	break;
2109
2110	case '"':
2111	*p = 0;
2112	return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);	2173	return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2113		2174
2114	default:	2175	if (ecb_expect_false (c == '\\'))
		2176	state = st_bsl;
		2177	else
2115	*p++ = c;	2178	*p++ = c;
2116	break;
2117	}
2118		2179
2119	break;	2180	break;
2120		2181
2121	case st_bsl:	2182	case st_bsl:
2122	switch (c)	2183	switch (c)
…		…
2152	case 'r':	2213	case 'r':
2153	*p++ = '\r';	2214	*p++ = '\r';
2154	state = st_ok;	2215	state = st_ok;
2155	break;	2216	break;
2156		2217
2157	case '"':
2158	*p++ = '"';
2159	state = st_ok;
2160	break;
2161
2162	default:	2218	default:
2163	*p++ = c;	2219	*p++ = c;
2164	state = st_ok;	2220	state = st_ok;
2165	break;	2221	break;
2166	}	2222	}
2167		2223
2168	break;	2224	break;
2169		2225
2170	case st_x1:	2226	case st_x1:
2171	case st_x2:	2227	case st_x2:
2172	c = toupper (c);	2228	c = tolower (c);
2173		2229
2174	if (c >= '0' && c <= 'F')	2230	if (c >= '0' && c <= '9')
2175	{
2176	if (c <= '9')
2177	c1 = (c1 << 4) + c - '0';	2231	c1 = (c1 << 4) + c - '0';
2178	else	2232	else if (c >= 'a' && c <= 'f')
2179	c1 = (c1 << 4) + c - 'A' + 10;	2233	c1 = (c1 << 4) + c - 'a' + 10;
2180
2181	if (state == st_x1)
2182	state = st_x2;
2183	else
2184	{
2185	*p++ = c1;
2186	state = st_ok;
2187	}
2188	}
2189	else	2234	else
2190	return S_F;	2235	return S_F;
		2236
		2237	if (state == st_x1)
		2238	state = st_x2;
		2239	else
		2240	{
		2241	*p++ = c1;
		2242	state = st_ok;
		2243	}
2191		2244
2192	break;	2245	break;
2193		2246
2194	case st_oct1:	2247	case st_oct1:
2195	case st_oct2:	2248	case st_oct2:
…		…
2199	backchar (SCHEME_A_ c);	2252	backchar (SCHEME_A_ c);
2200	state = st_ok;	2253	state = st_ok;
2201	}	2254	}
2202	else	2255	else
2203	{	2256	{
2204	if (state == st_oct2 && c1 >= 32)	2257	if (state == st_oct2 && c1 >= ' ')
2205	return S_F;	2258	return S_F;
2206		2259
2207	c1 = (c1 << 3) + (c - '0');	2260	c1 = (c1 << 3) + (c - '0');
2208		2261
2209	if (state == st_oct1)	2262	if (state == st_oct1)
…		…
2214	state = st_ok;	2267	state = st_ok;
2215	}	2268	}
2216	}	2269	}
2217		2270
2218	break;	2271	break;
2219
2220	}	2272	}
2221	}	2273	}
2222	}	2274	}
2223		2275
2224	/* check c is in chars */	2276	/* check c is in chars */
2225	ecb_inline int	2277	ecb_inline int
2226	is_one_of (char *s, int c)	2278	is_one_of (const char *s, int c)
2227	{	2279	{
2228	if (c == EOF)
2229	return 1;
2230
2231	return !!strchr (s, c);	2280	return c == EOF || !!strchr (s, c);
2232	}	2281	}
2233		2282
2234	/* skip white characters */	2283	/* skip white characters */
2235	ecb_inline int	2284	ecb_inline int
2236	skipspace (SCHEME_P)	2285	skipspace (SCHEME_P)
…		…
2238	int c, curr_line = 0;	2287	int c, curr_line = 0;
2239		2288
2240	do	2289	do
2241	{	2290	{
2242	c = inchar (SCHEME_A);	2291	c = inchar (SCHEME_A);
		2292
2243	#if SHOW_ERROR_LINE	2293	#if SHOW_ERROR_LINE
2244	if (c == '\n')	2294	if (ecb_expect_false (c == '\n'))
2245	curr_line++;	2295	curr_line++;
2246	#endif	2296	#endif
		2297
		2298	if (ecb_expect_false (c == EOF))
		2299	return c;
2247	}	2300	}
2248	while (c == ' ' || c == '\n' || c == '\r' || c == '\t');	2301	while (is_one_of (WHITESPACE, c));
2249		2302
2250	/* record it */	2303	/* record it */
2251	#if SHOW_ERROR_LINE	2304	#if SHOW_ERROR_LINE
2252	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)	2305	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2253	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;	2306	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2254	#endif	2307	#endif
2255		2308
2256	if (c != EOF)
2257	{
2258	backchar (SCHEME_A_ c);	2309	backchar (SCHEME_A_ c);
2259	return 1;	2310	return 1;
2260	}
2261	else
2262	return EOF;
2263	}	2311	}
2264		2312
2265	/* get token */	2313	/* get token */
2266	static int	2314	static int
2267	token (SCHEME_P)	2315	token (SCHEME_P)
…		…
2283	return TOK_RPAREN;	2331	return TOK_RPAREN;
2284		2332
2285	case '.':	2333	case '.':
2286	c = inchar (SCHEME_A);	2334	c = inchar (SCHEME_A);
2287		2335
2288	if (is_one_of (" \n\t", c))	2336	if (is_one_of (WHITESPACE, c))
2289	return TOK_DOT;	2337	return TOK_DOT;
2290	else	2338	else
2291	{	2339	{
2292	//TODO: ungetc twice in a row is not supported in C
2293	backchar (SCHEME_A_ c);	2340	backchar (SCHEME_A_ c);
2294	backchar (SCHEME_A_ '.');
2295	return TOK_ATOM;	2341	return TOK_DOTATOM;
2296	}	2342	}
		2343
		2344	case '|':
		2345	return TOK_STRATOM;
2297		2346
2298	case '\'':	2347	case '\'':
2299	return TOK_QUOTE;	2348	return TOK_QUOTE;
2300		2349
2301	case ';':	2350	case ';':
…		…
2433	}	2482	}
2434		2483
2435	putcharacter (SCHEME_A_ '"');	2484	putcharacter (SCHEME_A_ '"');
2436	}	2485	}
2437		2486
2438
2439	/* print atoms */	2487	/* print atoms */
2440	static void	2488	static void
2441	printatom (SCHEME_P_ pointer l, int f)	2489	printatom (SCHEME_P_ pointer l, int f)
2442	{	2490	{
2443	char *p;	2491	char *p;
2444	int len;	2492	int len;
2445		2493
2446	atom2str (SCHEME_A_ l, f, &p, &len);	2494	atom2str (SCHEME_A_ l, f, &p, &len);
2447	putchars (SCHEME_A_ p, len);	2495	putchars (SCHEME_A_ p, len);
2448	}	2496	}
2449
2450		2497
2451	/* Uses internal buffer unless string pointer is already available */	2498	/* Uses internal buffer unless string pointer is already available */
2452	static void	2499	static void
2453	atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)	2500	atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2454	{	2501	{
…		…
2615	#endif	2662	#endif
2616	}	2663	}
2617	else if (is_continuation (l))	2664	else if (is_continuation (l))
2618	p = "#<CONTINUATION>";	2665	p = "#<CONTINUATION>";
2619	else	2666	else
		2667	{
		2668	#if USE_PRINTF
		2669	p = SCHEME_V->strbuff;
		2670	snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
		2671	#else
2620	p = "#<ERROR>";	2672	p = "#<ERROR>";
		2673	#endif
		2674	}
2621		2675
2622	*pp = p;	2676	*pp = p;
2623	*plen = strlen (p);	2677	*plen = strlen (p);
2624	}	2678	}
2625		2679
…		…
2769	/* () is #t in R5RS */	2823	/* () is #t in R5RS */
2770	#define is_true(p) ((p) != S_F)	2824	#define is_true(p) ((p) != S_F)
2771	#define is_false(p) ((p) == S_F)	2825	#define is_false(p) ((p) == S_F)
2772		2826
2773	/* ========== Environment implementation ========== */	2827	/* ========== Environment implementation ========== */
2774
2775	#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2776
2777	static int
2778	hash_fn (const char *key, int table_size)
2779	{
2780	const unsigned char *p = key;
2781	uint32_t hash = 2166136261;
2782
2783	while (*p)
2784	hash = (hash ^ *p++) * 16777619;
2785
2786	return hash % table_size;
2787	}
2788	#endif
2789		2828
2790	#ifndef USE_ALIST_ENV	2829	#ifndef USE_ALIST_ENV
2791		2830
2792	/*	2831	/*
2793	* In this implementation, each frame of the environment may be	2832	* In this implementation, each frame of the environment may be
…		…
2810		2849
2811	SCHEME_V->envir = immutable_cons (new_frame, old_env);	2850	SCHEME_V->envir = immutable_cons (new_frame, old_env);
2812	setenvironment (SCHEME_V->envir);	2851	setenvironment (SCHEME_V->envir);
2813	}	2852	}
2814		2853
		2854	static uint32_t
		2855	sym_hash (pointer sym, uint32_t size)
		2856	{
		2857	uintptr_t ptr = (uintptr_t)sym;
		2858
		2859	#if 0
		2860	/* table size is prime, so why mix */
		2861	ptr += ptr >> 32;
		2862	ptr += ptr >> 16;
		2863	ptr += ptr >> 8;
		2864	#endif
		2865
		2866	return ptr % size;
		2867	}
		2868
2815	ecb_inline void	2869	ecb_inline void
2816	new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)	2870	new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2817	{	2871	{
2818	pointer slot = immutable_cons (variable, value);	2872	pointer slot = immutable_cons (variable, value);
2819		2873
2820	if (is_vector (car (env)))	2874	if (is_vector (car (env)))
2821	{	2875	{
2822	int location = hash_fn (symname (variable), veclength (car (env)));	2876	int location = sym_hash (variable, veclength (car (env)));
2823
2824	set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location)));	2877	vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2825	}	2878	}
2826	else	2879	else
2827	set_car (env, immutable_cons (slot, car (env)));	2880	set_car (env, immutable_cons (slot, car (env)));
2828	}	2881	}
2829		2882
2830	static pointer	2883	static pointer
2831	find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)	2884	find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2832	{	2885	{
2833	pointer x, y;	2886	pointer x, y;
2834	int location;
2835		2887
2836	for (x = env; x != NIL; x = cdr (x))	2888	for (x = env; x != NIL; x = cdr (x))
2837	{	2889	{
2838	if (is_vector (car (x)))	2890	if (is_vector (car (x)))
2839	{	2891	{
2840	location = hash_fn (symname (hdl), veclength (car (x)));	2892	int location = sym_hash (hdl, veclength (car (x)));
2841	y = vector_elem (car (x), location);	2893	y = vector_get (car (x), location);
2842	}	2894	}
2843	else	2895	else
2844	y = car (x);	2896	y = car (x);
2845		2897
2846	for (; y != NIL; y = cdr (y))	2898	for (; y != NIL; y = cdr (y))
2847	if (caar (y) == hdl)	2899	if (caar (y) == hdl)
2848	break;	2900	break;
2849		2901
2850	if (y != NIL)	2902	if (y != NIL)
		2903	return car (y);
		2904
		2905	if (!all)
2851	break;	2906	break;
2852
2853	if (!all)
2854	return NIL;
2855	}	2907	}
2856
2857	if (x != NIL)
2858	return car (y);
2859		2908
2860	return NIL;	2909	return NIL;
2861	}	2910	}
2862		2911
2863	#else /* USE_ALIST_ENV */	2912	#else /* USE_ALIST_ENV */
…		…
2885	for (y = car (x); y != NIL; y = cdr (y))	2934	for (y = car (x); y != NIL; y = cdr (y))
2886	if (caar (y) == hdl)	2935	if (caar (y) == hdl)
2887	break;	2936	break;
2888		2937
2889	if (y != NIL)	2938	if (y != NIL)
		2939	return car (y);
2890	break;	2940	break;
2891		2941
2892	if (!all)	2942	if (!all)
2893	return NIL;	2943	break;
2894	}	2944	}
2895
2896	if (x != NIL)
2897	return car (y);
2898		2945
2899	return NIL;	2946	return NIL;
2900	}	2947	}
2901		2948
2902	#endif /* USE_ALIST_ENV else */	2949	#endif /* USE_ALIST_ENV else */
2903		2950
2904	ecb_inline void	2951	ecb_inline void
2905	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)	2952	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2906	{	2953	{
		2954	assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2907	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);	2955	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2908	}	2956	}
2909		2957
2910	ecb_inline void	2958	ecb_inline void
2911	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)	2959	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
…		…
3119	int i = 0;	3167	int i = 0;
3120	struct dump_stack_frame *frame = SCHEME_V->dump_base;	3168	struct dump_stack_frame *frame = SCHEME_V->dump_base;
3121		3169
3122	while (cont != NIL)	3170	while (cont != NIL)
3123	{	3171	{
3124	frame->op = ivalue (car (cont)); cont = cdr (cont);	3172	frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3125	frame->args = car (cont) ; cont = cdr (cont);	3173	frame->args = car (cont) ; cont = cdr (cont);
3126	frame->envir = car (cont) ; cont = cdr (cont);	3174	frame->envir = car (cont) ; cont = cdr (cont);
3127	frame->code = car (cont) ; cont = cdr (cont);	3175	frame->code = car (cont) ; cont = cdr (cont);
3128		3176
3129	++frame;	3177	++frame;
3130	++i;	3178	++i;
3131	}	3179	}
3132		3180
…		…
3161	SCHEME_V->value = a;	3209	SCHEME_V->value = a;
3162		3210
3163	if (dump == NIL)	3211	if (dump == NIL)
3164	return -1;	3212	return -1;
3165		3213
3166	SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump);	3214	SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3167	SCHEME_V->args = car (dump) ; dump = cdr (dump);	3215	SCHEME_V->args = car (dump) ; dump = cdr (dump);
3168	SCHEME_V->envir = car (dump) ; dump = cdr (dump);	3216	SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3169	SCHEME_V->code = car (dump) ; dump = cdr (dump);	3217	SCHEME_V->code = car (dump) ; dump = cdr (dump);
3170		3218
3171	SCHEME_V->dump = dump;	3219	SCHEME_V->dump = dump;
3172		3220
3173	return 0;	3221	return 0;
3174	}	3222	}
…		…
3203		3251
3204	#endif	3252	#endif
3205		3253
3206	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)	3254	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3207		3255
		3256	#if EXPERIMENT
		3257	static int
		3258	debug (SCHEME_P_ int indent, pointer x)
		3259	{
		3260	int c;
		3261
		3262	if (is_syntax (x))
		3263	{
		3264	printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
		3265	return 8 + 8;
		3266	}
		3267
		3268	if (x == NIL)
		3269	{
		3270	printf ("%*sNIL\n", indent, "");
		3271	return 3;
		3272	}
		3273
		3274	switch (type (x))
		3275	{
		3276	case T_INTEGER:
		3277	printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
		3278	return 32+8;
		3279
		3280	case T_SYMBOL:
		3281	printf ("%*sS<%s>\n", indent, "", symname (x));
		3282	return 24+8;
		3283
		3284	case T_CLOSURE:
		3285	printf ("%*sS<%s>\n", indent, "", "closure");
		3286	debug (SCHEME_A_ indent + 3, cdr(x));
		3287	return 32 + debug (SCHEME_A_ indent + 3, car (x));
		3288
		3289	case T_PAIR:
		3290	printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
		3291	c = debug (SCHEME_A_ indent + 3, car (x));
		3292	c += debug (SCHEME_A_ indent + 3, cdr (x));
		3293	return c + 1;
		3294
		3295	case T_PORT:
		3296	printf ("%*sS<%s>\n", indent, "", "port");
		3297	return 24+8;
		3298
		3299	case T_VECTOR:
		3300	printf ("%*sS<%s>\n", indent, "", "vector");
		3301	return 24+8;
		3302
		3303	case T_ENVIRONMENT:
		3304	printf ("%*sS<%s>\n", indent, "", "environment");
		3305	return 0 + debug (SCHEME_A_ indent + 3, car (x));
		3306
		3307	default:
		3308	printf ("unhandled type %d\n", type (x));
		3309	break;
		3310	}
		3311	}
		3312	#endif
		3313
3208	static int	3314	static int
3209	opexe_0 (SCHEME_P_ enum scheme_opcodes op)	3315	opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3210	{	3316	{
3211	pointer args = SCHEME_V->args;	3317	pointer args = SCHEME_V->args;
3212	pointer x, y;	3318	pointer x, y;
3213		3319
3214	switch (op)	3320	switch (op)
3215	{	3321	{
		3322	#if EXPERIMENT //D
		3323	case OP_DEBUG:
		3324	printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
		3325	printf ("\n");
		3326	s_return (S_T);
		3327	#endif
3216	case OP_LOAD: /* load */	3328	case OP_LOAD: /* load */
3217	if (file_interactive (SCHEME_A))	3329	if (file_interactive (SCHEME_A))
3218	{	3330	{
3219	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");	3331	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3220	//D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));	3332	//D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
…		…
3343	}	3455	}
3344	else	3456	else
3345	s_return (SCHEME_V->code);	3457	s_return (SCHEME_V->code);
3346		3458
3347	case OP_E0ARGS: /* eval arguments */	3459	case OP_E0ARGS: /* eval arguments */
3348	if (is_macro (SCHEME_V->value)) /* macro expansion */	3460	if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3349	{	3461	{
3350	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);	3462	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3351	SCHEME_V->args = cons (SCHEME_V->code, NIL);	3463	SCHEME_V->args = cons (SCHEME_V->code, NIL);
3352	SCHEME_V->code = SCHEME_V->value;	3464	SCHEME_V->code = SCHEME_V->value;
3353	s_goto (OP_APPLY);	3465	s_goto (OP_APPLY);
…		…
3380		3492
3381	case OP_TRACING:	3493	case OP_TRACING:
3382	{	3494	{
3383	int tr = SCHEME_V->tracing;	3495	int tr = SCHEME_V->tracing;
3384		3496
3385	SCHEME_V->tracing = ivalue (car (args));	3497	SCHEME_V->tracing = ivalue_unchecked (car (args));
3386	s_return (mk_integer (SCHEME_A_ tr));	3498	s_return (mk_integer (SCHEME_A_ tr));
3387	}	3499	}
3388		3500
3389	#endif	3501	#endif
3390		3502
…		…
3909	{	4021	{
3910	pointer args = SCHEME_V->args;	4022	pointer args = SCHEME_V->args;
3911	pointer x = car (args);	4023	pointer x = car (args);
3912	num v;	4024	num v;
3913		4025
3914	#if USE_MATH
3915	RVALUE dd;
3916	#endif
3917
3918	switch (op)	4026	switch (op)
3919	{	4027	{
3920	#if USE_MATH	4028	#if USE_MATH
3921	case OP_INEX2EX: /* inexact->exact */	4029	case OP_INEX2EX: /* inexact->exact */
		4030	{
3922	if (is_integer (x))	4031	if (is_integer (x))
3923	s_return (x);	4032	s_return (x);
3924	else if (modf (rvalue_unchecked (x), &dd) == 0)	4033
		4034	RVALUE r = rvalue_unchecked (x);
		4035
		4036	if (r == (RVALUE)(IVALUE)r)
3925	s_return (mk_integer (SCHEME_A_ ivalue (x)));	4037	s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3926	else	4038	else
3927	Error_1 ("inexact->exact: not integral:", x);	4039	Error_1 ("inexact->exact: not integral:", x);
		4040	}
3928		4041
3929	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));	4042	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3930	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));	4043	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3931	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));	4044	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3932	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));	4045	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
…		…
3966	/* If the test fails, result is too big for integer. */	4079	/* If the test fails, result is too big for integer. */
3967	if (!real_result)	4080	if (!real_result)
3968	{	4081	{
3969	long result_as_long = result;	4082	long result_as_long = result;
3970		4083
3971	if (result != (RVALUE) result_as_long)	4084	if (result != result_as_long)
3972	real_result = 1;	4085	real_result = 1;
3973	}	4086	}
3974		4087
3975	if (real_result)	4088	if (real_result)
3976	s_return (mk_real (SCHEME_A_ result));	4089	s_return (mk_real (SCHEME_A_ result));
…		…
3981	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));	4094	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
3982	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));	4095	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3983		4096
3984	case OP_TRUNCATE:	4097	case OP_TRUNCATE:
3985	{	4098	{
3986	RVALUE rvalue_of_x;	4099	RVALUE n = rvalue (x);
3987
3988	rvalue_of_x = rvalue (x);
3989
3990	if (rvalue_of_x > 0)
3991	s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));	4100	s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
3992	else
3993	s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
3994	}	4101	}
3995		4102
3996	case OP_ROUND:	4103	case OP_ROUND:
3997	if (num_is_integer (x))	4104	if (is_integer (x))
3998	s_return (x);	4105	s_return (x);
3999		4106
4000	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));	4107	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4001	#endif	4108	#endif
4002		4109
…		…
4093	else	4200	else
4094	Error_0 ("modulo: division by zero");	4201	Error_0 ("modulo: division by zero");
4095		4202
4096	s_return (mk_number (SCHEME_A_ v));	4203	s_return (mk_number (SCHEME_A_ v));
4097		4204
4098	case OP_CAR: /* car */	4205	/* the compiler will optimize this mess... */
4099	s_return (caar (args));	4206	case OP_CAR: op_car: s_return (car (x));
4100		4207	case OP_CDR: op_cdr: s_return (cdr (x));
4101	case OP_CDR: /* cdr */	4208	case OP_CAAR: op_caar: x = car (x); goto op_car;
4102	s_return (cdar (args));	4209	case OP_CADR: op_cadr: x = cdr (x); goto op_car;
		4210	case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
		4211	case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
		4212	case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
		4213	case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
		4214	case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
		4215	case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
		4216	case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
		4217	case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
		4218	case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
		4219	case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
		4220	case OP_CAAAAR: x = car (x); goto op_caaar;
		4221	case OP_CAAADR: x = cdr (x); goto op_caaar;
		4222	case OP_CAADAR: x = car (x); goto op_caadr;
		4223	case OP_CAADDR: x = cdr (x); goto op_caadr;
		4224	case OP_CADAAR: x = car (x); goto op_cadar;
		4225	case OP_CADADR: x = cdr (x); goto op_cadar;
		4226	case OP_CADDAR: x = car (x); goto op_caddr;
		4227	case OP_CADDDR: x = cdr (x); goto op_caddr;
		4228	case OP_CDAAAR: x = car (x); goto op_cdaar;
		4229	case OP_CDAADR: x = cdr (x); goto op_cdaar;
		4230	case OP_CDADAR: x = car (x); goto op_cdadr;
		4231	case OP_CDADDR: x = cdr (x); goto op_cdadr;
		4232	case OP_CDDAAR: x = car (x); goto op_cddar;
		4233	case OP_CDDADR: x = cdr (x); goto op_cddar;
		4234	case OP_CDDDAR: x = car (x); goto op_cdddr;
		4235	case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4103		4236
4104	case OP_CONS: /* cons */	4237	case OP_CONS: /* cons */
4105	set_cdr (args, cadr (args));	4238	set_cdr (args, cadr (args));
4106	s_return (args);	4239	s_return (args);
4107		4240
…		…
4122	}	4255	}
4123	else	4256	else
4124	Error_0 ("set-cdr!: unable to alter immutable pair");	4257	Error_0 ("set-cdr!: unable to alter immutable pair");
4125		4258
4126	case OP_CHAR2INT: /* char->integer */	4259	case OP_CHAR2INT: /* char->integer */
4127	s_return (mk_integer (SCHEME_A_ ivalue (x)));	4260	s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4128		4261
4129	case OP_INT2CHAR: /* integer->char */	4262	case OP_INT2CHAR: /* integer->char */
4130	s_return (mk_character (SCHEME_A_ ivalue (x)));	4263	s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4131		4264
4132	case OP_CHARUPCASE:	4265	case OP_CHARUPCASE:
4133	{	4266	{
4134	unsigned char c = ivalue (x);	4267	unsigned char c = ivalue_unchecked (x);
4135	c = toupper (c);	4268	c = toupper (c);
4136	s_return (mk_character (SCHEME_A_ c));	4269	s_return (mk_character (SCHEME_A_ c));
4137	}	4270	}
4138		4271
4139	case OP_CHARDNCASE:	4272	case OP_CHARDNCASE:
4140	{	4273	{
4141	unsigned char c = ivalue (x);	4274	unsigned char c = ivalue_unchecked (x);
4142	c = tolower (c);	4275	c = tolower (c);
4143	s_return (mk_character (SCHEME_A_ c));	4276	s_return (mk_character (SCHEME_A_ c));
4144	}	4277	}
4145		4278
4146	case OP_STR2SYM: /* string->symbol */	4279	case OP_STR2SYM: /* string->symbol */
…		…
4223	Error_1 ("atom->string: not an atom:", x);	4356	Error_1 ("atom->string: not an atom:", x);
4224	}	4357	}
4225		4358
4226	case OP_MKSTRING: /* make-string */	4359	case OP_MKSTRING: /* make-string */
4227	{	4360	{
4228	int fill = ' ';	4361	int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4229	int len;
4230
4231	len = ivalue (x);	4362	int len = ivalue_unchecked (x);
4232
4233	if (cdr (args) != NIL)
4234	fill = charvalue (cadr (args));
4235		4363
4236	s_return (mk_empty_string (SCHEME_A_ len, fill));	4364	s_return (mk_empty_string (SCHEME_A_ len, fill));
4237	}	4365	}
4238		4366
4239	case OP_STRLEN: /* string-length */	4367	case OP_STRLEN: /* string-length */
4240	s_return (mk_integer (SCHEME_A_ strlength (x)));	4368	s_return (mk_integer (SCHEME_A_ strlength (x)));
4241		4369
4242	case OP_STRREF: /* string-ref */	4370	case OP_STRREF: /* string-ref */
4243	{	4371	{
4244	char *str;
4245	int index;
4246
4247	str = strvalue (x);	4372	char *str = strvalue (x);
4248
4249	index = ivalue (cadr (args));	4373	int index = ivalue_unchecked (cadr (args));
4250		4374
4251	if (index >= strlength (x))	4375	if (index >= strlength (x))
4252	Error_1 ("string-ref: out of bounds:", cadr (args));	4376	Error_1 ("string-ref: out of bounds:", cadr (args));
4253		4377
4254	s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));	4378	s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4255	}	4379	}
4256		4380
4257	case OP_STRSET: /* string-set! */	4381	case OP_STRSET: /* string-set! */
4258	{	4382	{
4259	char *str;	4383	char *str = strvalue (x);
4260	int index;	4384	int index = ivalue_unchecked (cadr (args));
4261	int c;	4385	int c;
4262		4386
4263	if (is_immutable (x))	4387	if (is_immutable (x))
4264	Error_1 ("string-set!: unable to alter immutable string:", x);	4388	Error_1 ("string-set!: unable to alter immutable string:", x);
4265
4266	str = strvalue (x);
4267
4268	index = ivalue (cadr (args));
4269		4389
4270	if (index >= strlength (x))	4390	if (index >= strlength (x))
4271	Error_1 ("string-set!: out of bounds:", cadr (args));	4391	Error_1 ("string-set!: out of bounds:", cadr (args));
4272		4392
4273	c = charvalue (caddr (args));	4393	c = charvalue (caddr (args));
…		…
4296	s_return (newstr);	4416	s_return (newstr);
4297	}	4417	}
4298		4418
4299	case OP_SUBSTR: /* substring */	4419	case OP_SUBSTR: /* substring */
4300	{	4420	{
4301	char *str;	4421	char *str = strvalue (x);
4302	int index0;	4422	int index0 = ivalue_unchecked (cadr (args));
4303	int index1;	4423	int index1;
4304	int len;	4424	int len;
4305		4425
4306	str = strvalue (x);
4307
4308	index0 = ivalue (cadr (args));
4309
4310	if (index0 > strlength (x))	4426	if (index0 > strlength (x))
4311	Error_1 ("substring: start out of bounds:", cadr (args));	4427	Error_1 ("substring: start out of bounds:", cadr (args));
4312		4428
4313	if (cddr (args) != NIL)	4429	if (cddr (args) != NIL)
4314	{	4430	{
4315	index1 = ivalue (caddr (args));	4431	index1 = ivalue_unchecked (caddr (args));
4316		4432
4317	if (index1 > strlength (x) || index1 < index0)	4433	if (index1 > strlength (x) || index1 < index0)
4318	Error_1 ("substring: end out of bounds:", caddr (args));	4434	Error_1 ("substring: end out of bounds:", caddr (args));
4319	}	4435	}
4320	else	4436	else
…		…
4343	if (SCHEME_V->no_memory)	4459	if (SCHEME_V->no_memory)
4344	s_return (S_SINK);	4460	s_return (S_SINK);
4345	#endif	4461	#endif
4346		4462
4347	for (x = args, i = 0; is_pair (x); x = cdr (x), i++)	4463	for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4348	set_vector_elem (vec, i, car (x));	4464	vector_set (vec, i, car (x));
4349		4465
4350	s_return (vec);	4466	s_return (vec);
4351	}	4467	}
4352		4468
4353	case OP_MKVECTOR: /* make-vector */	4469	case OP_MKVECTOR: /* make-vector */
4354	{	4470	{
4355	pointer fill = NIL;	4471	pointer fill = NIL;
4356	int len;
4357	pointer vec;	4472	pointer vec;
4358
4359	len = ivalue (x);	4473	int len = ivalue_unchecked (x);
4360		4474
4361	if (cdr (args) != NIL)	4475	if (cdr (args) != NIL)
4362	fill = cadr (args);	4476	fill = cadr (args);
4363		4477
4364	vec = mk_vector (SCHEME_A_ len);	4478	vec = mk_vector (SCHEME_A_ len);
…		…
4367	if (SCHEME_V->no_memory)	4481	if (SCHEME_V->no_memory)
4368	s_return (S_SINK);	4482	s_return (S_SINK);
4369	#endif	4483	#endif
4370		4484
4371	if (fill != NIL)	4485	if (fill != NIL)
4372	fill_vector (vec, fill);	4486	fill_vector (vec, 0, fill);
4373		4487
4374	s_return (vec);	4488	s_return (vec);
4375	}	4489	}
4376		4490
4377	case OP_VECLEN: /* vector-length */	4491	case OP_VECLEN: /* vector-length */
4378	s_return (mk_integer (SCHEME_A_ veclength (x)));	4492	s_return (mk_integer (SCHEME_A_ veclength (x)));
4379		4493
		4494	case OP_VECRESIZE:
		4495	vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
		4496	s_return (x);
		4497
4380	case OP_VECREF: /* vector-ref */	4498	case OP_VECREF: /* vector-ref */
4381	{	4499	{
4382	int index;
4383
4384	index = ivalue (cadr (args));	4500	int index = ivalue_unchecked (cadr (args));
4385		4501
4386	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)	4502	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4387	Error_1 ("vector-ref: out of bounds:", cadr (args));	4503	Error_1 ("vector-ref: out of bounds:", cadr (args));
4388		4504
4389	s_return (vector_elem (x, index));	4505	s_return (vector_get (x, index));
4390	}	4506	}
4391		4507
4392	case OP_VECSET: /* vector-set! */	4508	case OP_VECSET: /* vector-set! */
4393	{	4509	{
4394	int index;	4510	int index = ivalue_unchecked (cadr (args));
4395		4511
4396	if (is_immutable (x))	4512	if (is_immutable (x))
4397	Error_1 ("vector-set!: unable to alter immutable vector:", x);	4513	Error_1 ("vector-set!: unable to alter immutable vector:", x);
4398		4514
4399	index = ivalue (cadr (args));
4400
4401	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)	4515	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4402	Error_1 ("vector-set!: out of bounds:", cadr (args));	4516	Error_1 ("vector-set!: out of bounds:", cadr (args));
4403		4517
4404	set_vector_elem (x, index, caddr (args));	4518	vector_set (x, index, caddr (args));
4405	s_return (x);	4519	s_return (x);
4406	}	4520	}
4407	}	4521	}
4408		4522
4409	if (USE_ERROR_CHECKING) abort ();	4523	if (USE_ERROR_CHECKING) abort ();
4410	}
4411
4412	INTERFACE int
4413	is_list (SCHEME_P_ pointer a)
4414	{
4415	return list_length (SCHEME_A_ a) >= 0;
4416	}
4417
4418	/* Result is:
4419	proper list: length
4420	circular list: -1
4421	not even a pair: -2
4422	dotted list: -2 minus length before dot
4423	*/
4424	INTERFACE int
4425	list_length (SCHEME_P_ pointer a)
4426	{
4427	int i = 0;
4428	pointer slow, fast;
4429
4430	slow = fast = a;
4431
4432	while (1)
4433	{
4434	if (fast == NIL)
4435	return i;
4436
4437	if (!is_pair (fast))
4438	return -2 - i;
4439
4440	fast = cdr (fast);
4441	++i;
4442
4443	if (fast == NIL)
4444	return i;
4445
4446	if (!is_pair (fast))
4447	return -2 - i;
4448
4449	++i;
4450	fast = cdr (fast);
4451
4452	/* Safe because we would have already returned if `fast'
4453	encountered a non-pair. */
4454	slow = cdr (slow);
4455
4456	if (fast == slow)
4457	{
4458	/* the fast pointer has looped back around and caught up
4459	with the slow pointer, hence the structure is circular,
4460	not of finite length, and therefore not a list */
4461	return -1;
4462	}
4463	}
4464	}	4524	}
4465		4525
4466	static int	4526	static int
4467	opexe_2 (SCHEME_P_ enum scheme_opcodes op)	4527	opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4468	{	4528	{
…		…
4502	pointer d = cdr (args);	4562	pointer d = cdr (args);
4503	int r;	4563	int r;
4504		4564
4505	switch (op)	4565	switch (op)
4506	{	4566	{
4507	case OP_NOT: /* not */ r = is_false (a) ; break;	4567	case OP_NOT: /* not */ r = is_false (a) ; break;
4508	case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;	4568	case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4509	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;	4569	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4510	case OP_NULLP: /* null? */ r = a == NIL ; break;	4570	case OP_NULLP: /* null? */ r = a == NIL ; break;
4511	case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;	4571	case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
		4572	case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4512	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;	4573	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4513	case OP_STRINGP: /* string? */ r = is_string (a) ; break;	4574	case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4514	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;	4575	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4515	case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */	4576	case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4516	case OP_CHARP: /* char? */ r = is_character (a) ; break;	4577	case OP_CHARP: /* char? */ r = is_character (a) ; break;
4517		4578
4518	#if USE_CHAR_CLASSIFIERS	4579	#if USE_CHAR_CLASSIFIERS
4519	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;	4580	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4520	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;	4581	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4521	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;	4582	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4522	case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;	4583	case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4523	case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;	4584	case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4524	#endif	4585	#endif
4525		4586
4526	#if USE_PORTS	4587	#if USE_PORTS
4527	case OP_PORTP: /* port? */ r = is_port (a) ; break;	4588	case OP_PORTP: /* port? */ r = is_port (a) ; break;
4528	case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;	4589	case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
…		…
4729		4790
4730	case OP_NEWSEGMENT: /* new-segment */	4791	case OP_NEWSEGMENT: /* new-segment */
4731	if (!is_pair (args) || !is_number (a))	4792	if (!is_pair (args) || !is_number (a))
4732	Error_0 ("new-segment: argument must be a number");	4793	Error_0 ("new-segment: argument must be a number");
4733		4794
4734	alloc_cellseg (SCHEME_A_ (int)ivalue (a));	4795	alloc_cellseg (SCHEME_A_ ivalue (a));
4735		4796
4736	s_return (S_T);	4797	s_return (S_T);
4737		4798
4738	case OP_OBLIST: /* oblist */	4799	case OP_OBLIST: /* oblist */
4739	s_return (oblist_all_symbols (SCHEME_A));	4800	s_return (oblist_all_symbols (SCHEME_A));
…		…
4997	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);	5058	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4998	SCHEME_V->tok = token (SCHEME_A);	5059	SCHEME_V->tok = token (SCHEME_A);
4999	s_goto (OP_RDSEXPR);	5060	s_goto (OP_RDSEXPR);
5000		5061
5001	case TOK_ATOM:	5062	case TOK_ATOM:
5002	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS)));	5063	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
		5064
		5065	case TOK_DOTATOM:
		5066	SCHEME_V->strbuff[0] = '.';
		5067	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
		5068
		5069	case TOK_STRATOM:
		5070	x = readstrexp (SCHEME_A_ '|');
		5071	//TODO: haven't checked whether the garbage collector could interfere
		5072	s_return (mk_atom (SCHEME_A_ strvalue (x)));
5003		5073
5004	case TOK_DQUOTE:	5074	case TOK_DQUOTE:
5005	x = readstrexp (SCHEME_A);	5075	x = readstrexp (SCHEME_A_ '"');
5006		5076
5007	if (x == S_F)	5077	if (x == S_F)
5008	Error_0 ("Error reading string");	5078	Error_0 ("Error reading string");
5009		5079
5010	setimmutable (x);	5080	setimmutable (x);
…		…
5022	s_goto (OP_EVAL);	5092	s_goto (OP_EVAL);
5023	}	5093	}
5024	}	5094	}
5025		5095
5026	case TOK_SHARP_CONST:	5096	case TOK_SHARP_CONST:
5027	if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL)	5097	if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5028	Error_0 ("undefined sharp expression");	5098	Error_0 ("undefined sharp expression");
5029	else	5099	else
5030	s_return (x);	5100	s_return (x);
5031		5101
5032	default:	5102	default:
…		…
5184	putstr (SCHEME_A_ ")");	5254	putstr (SCHEME_A_ ")");
5185	s_return (S_T);	5255	s_return (S_T);
5186	}	5256	}
5187	else	5257	else
5188	{	5258	{
5189	pointer elem = vector_elem (vec, i);	5259	pointer elem = vector_get (vec, i);
5190		5260
5191	ivalue_unchecked (cdr (args)) = i + 1;	5261	ivalue_unchecked (cdr (args)) = i + 1;
5192	s_save (SCHEME_A_ OP_PVECFROM, args, NIL);	5262	s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5193	SCHEME_V->args = elem;	5263	SCHEME_V->args = elem;
5194		5264
…		…
5254		5324
5255	case OP_CLOSUREP: /* closure? */	5325	case OP_CLOSUREP: /* closure? */
5256	/*	5326	/*
5257	* Note, macro object is also a closure.	5327	* Note, macro object is also a closure.
5258	* Therefore, (closure? <#MACRO>) ==> #t	5328	* Therefore, (closure? <#MACRO>) ==> #t
		5329	* (schmorp) well, obviously not, fix? TODO
5259	*/	5330	*/
5260	s_retbool (is_closure (a));	5331	s_retbool (is_closure (a));
5261		5332
5262	case OP_MACROP: /* macro? */	5333	case OP_MACROP: /* macro? */
5263	s_retbool (is_macro (a));	5334	s_retbool (is_macro (a));
…		…
5269	/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */	5340	/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5270	typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);	5341	typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5271		5342
5272	typedef int (*test_predicate)(pointer);	5343	typedef int (*test_predicate)(pointer);
5273	static int	5344	static int
5274	is_any (pointer p)	5345	tst_any (pointer p)
5275	{	5346	{
5276	return 1;	5347	return 1;
5277	}	5348	}
5278		5349
5279	static int	5350	static int
5280	is_nonneg (pointer p)	5351	tst_inonneg (pointer p)
5281	{	5352	{
5282	return ivalue (p) >= 0 && is_integer (p);	5353	return is_integer (p) && ivalue_unchecked (p) >= 0;
5283	}	5354	}
5284		5355
5285	static int	5356	static int
5286	tst_is_list (pointer p)	5357	tst_is_list (SCHEME_P_ pointer p)
5287	{	5358	{
5288	return p == NIL || is_pair (p);	5359	return p == NIL || is_pair (p);
5289	}	5360	}
5290		5361
5291	/* Correspond carefully with following defines! */	5362	/* Correspond carefully with following defines! */
5292	static struct	5363	static struct
5293	{	5364	{
5294	test_predicate fct;	5365	test_predicate fct;
5295	const char *kind;	5366	const char *kind;
5296	} tests[] =	5367	} tests[] = {
5297	{
5298	{ is_any, 0 },	5368	{ tst_any , 0 },
5299	{ is_string, "string" },	5369	{ is_string , "string" },
5300	{ is_symbol, "symbol" },	5370	{ is_symbol , "symbol" },
5301	{ is_port, "port" },	5371	{ is_port , "port" },
5302	{ is_inport, "input port" },	5372	{ is_inport , "input port" },
5303	{ is_outport, "output port" },	5373	{ is_outport , "output port" },
5304	{ is_environment, "environment" },	5374	{ is_environment, "environment" },
5305	{ is_pair, "pair" },	5375	{ is_pair , "pair" },
5306	{ tst_is_list, "pair or '()" },	5376	{ 0 , "pair or '()" },
5307	{ is_character, "character" },	5377	{ is_character , "character" },
5308	{ is_vector, "vector" },	5378	{ is_vector , "vector" },
5309	{ is_number, "number" },	5379	{ is_number , "number" },
5310	{ is_integer, "integer" },	5380	{ is_integer , "integer" },
5311	{ is_nonneg, "non-negative integer" }	5381	{ tst_inonneg , "non-negative integer" }
5312	};	5382	};
5313		5383
5314	#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */	5384	#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5315	#define TST_ANY "\001"	5385	#define TST_ANY "\001"
5316	#define TST_STRING "\002"	5386	#define TST_STRING "\002"
…		…
5357	typedef struct	5427	typedef struct
5358	{	5428	{
5359	uint8_t func;	5429	uint8_t func;
5360	/*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */	5430	/*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5361	uint8_t builtin;	5431	uint8_t builtin;
		5432	#if USE_ERROR_CHECKING
5362	uint8_t min_arity;	5433	uint8_t min_arity;
5363	uint8_t max_arity;	5434	uint8_t max_arity;
5364	char arg_tests_encoding[3];	5435	char arg_tests_encoding[3];
		5436	#endif
5365	} op_code_info;	5437	} op_code_info;
5366		5438
5367	static const op_code_info dispatch_table[] = {	5439	static const op_code_info dispatch_table[] = {
		5440	#if USE_ERROR_CHECKING
5368	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },	5441	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
		5442	#else
		5443	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
		5444	#endif
5369	#include "opdefines.h"	5445	#include "opdefines.h"
5370	#undef OP_DEF	5446	#undef OP_DEF
5371	{0}	5447	{0}
5372	};	5448	};
5373		5449
…		…
5415	{	5491	{
5416	pointer arg = car (arglist);	5492	pointer arg = car (arglist);
5417		5493
5418	j = t[0];	5494	j = t[0];
5419		5495
		5496	/*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
		5497	if (j == TST_LIST[0])
		5498	{
		5499	if (!tst_is_list (SCHEME_A_ arg))
		5500	break;
		5501	}
		5502	else
		5503	{
5420	if (!tests[j - 1].fct (arg))	5504	if (!tests[j - 1].fct (arg))
5421	break;	5505	break;
		5506	}
5422		5507
5423	if (t[1]) /* last test is replicated as necessary */	5508	if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5424	t++;	5509	t++;
5425		5510
5426	arglist = cdr (arglist);	5511	arglist = cdr (arglist);
5427	i++;	5512	i++;
5428	}	5513	}
…		…
5483	mk_proc (SCHEME_P_ enum scheme_opcodes op)	5568	mk_proc (SCHEME_P_ enum scheme_opcodes op)
5484	{	5569	{
5485	pointer y = get_cell (SCHEME_A_ NIL, NIL);	5570	pointer y = get_cell (SCHEME_A_ NIL, NIL);
5486	set_typeflag (y, (T_PROC | T_ATOM));	5571	set_typeflag (y, (T_PROC | T_ATOM));
5487	ivalue_unchecked (y) = op;	5572	ivalue_unchecked (y) = op;
5488	set_num_integer (y);
5489	return y;	5573	return y;
5490	}	5574	}
5491		5575
5492	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */	5576	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5493	static int	5577	static int
5494	syntaxnum (pointer p)	5578	syntaxnum (pointer p)
5495	{	5579	{
5496	const char *s = strvalue (car (p));	5580	const char *s = strvalue (p);
5497		5581
5498	switch (strlength (car (p)))	5582	switch (strlength (p))
5499	{	5583	{
5500	case 2:	5584	case 2:
5501	if (s[0] == 'i')	5585	if (s[0] == 'i')
5502	return OP_IF0; /* if */	5586	return OP_IF0; /* if */
5503	else	5587	else
…		…
5939	# endif	6023	# endif
5940	int fin;	6024	int fin;
5941	char *file_name = InitFile;	6025	char *file_name = InitFile;
5942	int retcode;	6026	int retcode;
5943	int isfile = 1;	6027	int isfile = 1;
		6028	system ("ps v $PPID");//D
5944		6029
5945	if (argc == 2 && strcmp (argv[1], "-?") == 0)	6030	if (argc == 2 && strcmp (argv[1], "-?") == 0)
5946	{	6031	{
5947	xwrstr ("Usage: tinyscheme -?\n");	6032	xwrstr ("Usage: tinyscheme -?\n");
5948	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");	6033	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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